Updated British English translation

author: Bruce Cowan <bruce@bcowan.me.uk> 2012-09-04 18:33:07 +0800
committer: Bruce Cowan <bruce@bcowan.me.uk> 2012-09-04 18:33:07 +0800
commit: 6cdedbe194cbea84d30ba58d5b637b309fa55d77 (patch)
tree: 3cbfd1197cb766f0c57946a3130a16c08cd72a47 /po
parent: 55dc92d4c578a7a842f7c6b2a9a37404e0839dca (diff)
download: gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.gz
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.bz2
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.lz
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.xz
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.zst
gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.zip
1 files changed, 7194 insertions, 6898 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index e75c18ee2b..d653cb0f1e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 # Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2010.
-#: ../shell/main.c:570
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-06 15:38+0000\n"
-"PO-Revision-Date: 2012-03-06 15:47+0100\n"
+"POT-Creation-Date: 2012-09-04 11:21+0100\n"
+"PO-Revision-Date: 2012-09-04 11:32+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -86,27 +86,44 @@ msgid "This address book will be removed permanently."
 msgstr "This address book will be removed permanently."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "Do _Not Delete"
 
 #: ../addressbook/addressbook.error.xml.h:14
+msgid "Delete remote address book &quot;{0}&quot;?"
+msgstr "Delete remote address book &quot;{0}&quot;?"
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+msgstr ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:68
+msgid "_Delete From Server"
+msgstr "_Delete From Server"
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Unable to open address book"
 msgstr "Unable to open address book"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -114,15 +131,15 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -130,48 +147,48 @@ msgstr ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "The image you have selected is large. Do you want to resize and store it?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../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:30
+#: ../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:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "Address '{0}' already exists."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -179,16 +196,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:33
-#: ../mail/em-vfolder-editor-rule.c:339 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:36
+#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Some addresses already exist in this contact list."
 msgstr "Some addresses already exist in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -196,19 +213,19 @@ msgstr ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "Skip duplicates"
 msgstr "Skip duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "Add with duplicates"
 msgstr "Add with duplicates"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "List '{0}' is already in this contact list."
 msgstr "List '{0}' is already in this contact list."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -216,49 +233,21 @@ msgstr ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "Some features may not work properly with your current server"
-msgstr "Some features may not work properly with your current server"
-
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-
-#: ../addressbook/addressbook.error.xml.h:42
-msgid "GroupWise Address book creation:"
-msgstr "GroupWise Address book creation:"
-
 #: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:44
 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:46
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "Cannot add new contact"
 msgstr "Cannot add new contact"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../addressbook/addressbook.error.xml.h:47
 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."
@@ -267,9 +256,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:628
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: ../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
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -306,12 +295,11 @@ msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/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:811
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-mail"
 
@@ -324,7 +312,7 @@ msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:990
+#: ../addressbook/importers/evolution-vcard-importer.c:1002
 msgid "Contact"
 msgstr "Contact"
 
@@ -333,9 +321,9 @@ msgid "_Home Page:"
 msgstr "_Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
+#: ../modules/itip-formatter/itip-view.c:1842
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -352,6 +340,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
 msgid "Calendar:"
 msgstr "Calendar:"
 
@@ -426,8 +415,8 @@ msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2131
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
+#: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -437,9 +426,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-display.c:728
-#: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -477,27 +465,27 @@ msgid "_Address:"
 msgstr "_Address:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
-#: ../widgets/misc/e-contact-map.c:296
+#: ../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
 msgid "Home"
 msgstr "Home"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
-#: ../widgets/misc/e-contact-map.c:304
+#: ../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
 msgid "Work"
 msgstr "Work"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../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
 msgid "Other"
 msgstr "Other"
 
@@ -509,74 +497,79 @@ msgstr "Mailing Address"
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:497
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -584,28 +577,28 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' cannot be a future date"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -617,15 +610,15 @@ msgstr "Contact Quick-Add"
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
@@ -695,7 +688,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:768
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -716,27 +709,38 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Hide addresses when sending mail to this list"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-#: ../mail/mail-config.ui.h:156
+msgid "Add an email to the List"
+msgstr "Add an email to the List"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+msgid "Remove an email address from the List"
+msgstr "Remove an email address from the List"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+msgid "Insert email addresses from Address Book"
+msgstr "Insert email addresses from Address Book"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "_Select..."
 msgstr "_Select…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -763,7 +767,7 @@ msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
 msgstr "_Merge"
 
@@ -783,195 +787,179 @@ msgstr "Original Contact:"
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Name contains"
 msgstr "Name contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 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:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../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
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../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/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
 msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../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/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../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/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../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/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:333
+#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "Open map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
 msgid "List Members:"
 msgstr "List Members:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nickname"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Company"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
 msgid "Department"
 msgstr "Department"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Manager"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistant"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
-#: ../calendar/gui/dialogs/calendar-setup.c:469
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:528
-#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../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"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../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/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 msgid "Phone"
 msgstr "Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
 msgid "Address"
 msgstr "Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../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/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Spouse"
 
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:132
-#: ../modules/calendar/e-memo-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Personal"
 msgstr "Personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Note"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "List Members"
 msgstr "List Members"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
 msgid "Home page"
 msgstr "Home page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../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 "
@@ -981,7 +969,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -990,7 +978,7 @@ msgstr ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../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."
@@ -998,7 +986,7 @@ msgstr ""
 "This version of Evolution does not have LDAP support compiled into it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../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."
@@ -1006,11 +994,11 @@ msgstr ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../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"
@@ -1022,7 +1010,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../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"
@@ -1035,69 +1023,69 @@ msgstr ""
 "preferences for this address book."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../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:236
+#: ../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
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "This query did not complete successfully. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:270
+#: ../addressbook/gui/widgets/eab-gui-util.c:264
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:390
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:577
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:582
+#: ../addressbook/gui/widgets/eab-gui-util.c:593
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../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:363
+#: ../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:752
+#: ../addressbook/gui/widgets/e-addressbook-model.c:805
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
@@ -1105,55 +1093,55 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../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:646
+#: ../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:652
+#: ../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:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../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:664
+#: ../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:1306
+#: ../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:1310
+#: ../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:1314
+#: ../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:1320
+#: ../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:1324
+#: ../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:1328
+#: ../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:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1168,11 +1156,11 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
@@ -1287,7 +1275,7 @@ msgid "Title"
 msgstr "Title"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-list-view.c:657
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Role"
@@ -1339,20 +1327,20 @@ msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "current address book folder %s has %d card"
 msgstr[1] "current address book folder %s has %d cards"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:94
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:795
+#: ../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:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1362,7 +1350,7 @@ msgstr ""
 "\n"
 "Searching for the Contacts…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1376,7 +1364,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1390,7 +1378,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1400,7 +1388,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1414,87 +1402,87 @@ msgstr ""
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:415
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../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
 msgid "Importing..."
 msgstr "Importing…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1075
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1076
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1102
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution Contacts CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1103
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:657
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:668
 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:723
+#: ../addressbook/printing/e-contact-print.c:717
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:69
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
+#: ../addressbook/tools/evolution-addressbook-export.c:72
 msgid "Export in asynchronous mode"
 msgstr "Export in asynchronous mode"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:74
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1502,67 +1490,50 @@ msgstr ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:76
+#: ../addressbook/tools/evolution-addressbook-export.c:77
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:149
 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:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
+#: ../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:170
+#: ../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:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../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:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Couldn't get list of address books: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
-#: ../plugins/caldav/caldav-browse-server.c:221
-#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Failed to open client '%s': %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
@@ -1571,14 +1542,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:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
 msgid "Start time"
 msgstr "Start time"
 
@@ -1587,88 +1558,89 @@ msgid "Appointments"
 msgstr "Appointments"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Dismiss _All"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1460
+#: ../modules/itip-formatter/itip-view.c:1569
+msgid "Location:"
+msgstr "Location:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "location of appointment"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../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
 #: ../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:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
+#: ../widgets/misc/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:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../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-notify.ui.h:8
-msgid "location of appointment"
-msgstr "location of appointment"
-
-#. Location
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1758
-#: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
-msgid "Location:"
-msgstr "Location:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "Dismiss _All"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "You have %d reminder"
 msgstr[1] "You have %d reminders"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1872
-#: ../calendar/alarm-notify/alarm-queue.c:1907
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1876
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1680,7 +1652,7 @@ msgstr ""
 "configured to send an e-mail.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1913
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1697,17 +1669,17 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1928
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "invalid time"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1715,8 +1687,8 @@ msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1726,8 +1698,8 @@ msgstr[1] "%d minutes"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1966,6 +1938,7 @@ msgstr ""
 "loss of these attachments."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "_Save"
 
@@ -2050,10 +2023,46 @@ 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:67
+msgid ""
+"This will permanently remove the calendar &quot;{0}&quot; 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?"
+
+#: ../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:70
+msgid ""
+"This will permanently remove the task list &quot;{0}&quot; 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?"
+
+#: ../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:72
+msgid ""
+"This will permanently remove the memo list &quot;{0}&quot; 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?"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Are you sure you want to save the appointment without a summary?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:74
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2061,11 +2070,11 @@ msgstr ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:75
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Are you sure you want to save the task without a summary?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2073,24 +2082,24 @@ msgstr ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:77
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Are you sure you want to save the memo without a summary?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:78
 msgid "Error loading calendar"
 msgstr "Error loading calendar"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:79
 msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../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:75
+#: ../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."
@@ -2098,12 +2107,12 @@ 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:76
+#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "Cannot save event"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:85
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2111,52 +2120,46 @@ 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:79
+#: ../calendar/calendar.error.xml.h:86
 msgid "Cannot save task"
 msgstr "Cannot save task"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:88
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
 "'{0}' does not support assigned tasks, please select a different task list."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:89
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:90
 msgid "The task list is not marked for offline usage."
 msgstr "The task list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:91
 msgid "Error loading memo list"
 msgstr "Error loading memo list"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:92
 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:88
+#: ../calendar/calendar.error.xml.h:95
 msgid "Error on {0}: {1}"
 msgstr "Error on {0}: {1}"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Some features may not work properly with your current server."
-msgstr "Some features may not work properly with your current server."
+#: ../calendar/calendar.error.xml.h:96
+msgid "Could not perform this operation."
+msgstr "Could not perform this operation."
 
-#: ../calendar/calendar.error.xml.h:90
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+#: ../calendar/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"
@@ -2178,7 +2181,7 @@ 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:383
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "Summary"
 
@@ -2219,20 +2222,20 @@ msgstr "is"
 msgid "is not"
 msgstr "is not"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#: ../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
 msgid "Public"
 msgstr "Public"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/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/memotypes.xml.h:11
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../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
 msgid "Confidential"
 msgstr "Confidential"
@@ -2250,9 +2253,9 @@ 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:861
+#: ../plugins/publish-calendar/publish-calendar.c:870
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Location"
 
@@ -2262,7 +2265,9 @@ msgid "Category"
 msgstr "Category"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../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
 msgid "Attachments"
 msgstr "Attachments"
 
@@ -2314,22 +2319,22 @@ msgid "Edit Reminder"
 msgstr "Edit Reminder"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:413
+#: ../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/e-alarm-list.c:409
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Run a program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Send an e-mail"
 
@@ -2383,7 +2388,7 @@ msgstr "_Repeat the reminder"
 msgid "extra times every"
 msgstr "extra times every"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
 msgid "Options"
 msgstr "Options"
 
@@ -2419,7 +2424,7 @@ msgstr "_Arguments:"
 msgid "Send To:"
 msgstr "Send To:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -2433,88 +2438,6 @@ msgstr "Reminders"
 msgid "A_dd"
 msgstr "A_dd"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "Type:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:529
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
-msgid "_Name:"
-msgstr "_Name:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Cop_y calendar contents locally for offline operation"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Cop_y task list contents locally for offline operation"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:320
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Cop_y memo list contents locally for offline operation"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-msgid "Sh_ow reminder notifications"
-msgstr "Sh_ow reminder notifications"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "Colou_r:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:468
-#: ../calendar/gui/dialogs/calendar-setup.c:480
-#: ../calendar/gui/dialogs/calendar-setup.c:491
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
-#: ../modules/addressbook/addressbook-config.c:1114
-#: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "General"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:492
-msgid "Memo List"
-msgstr "Memo List"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "New Calendar"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "New Task List"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "Memo List Properties"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "New Memo List"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
@@ -2559,238 +2482,249 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:778
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:801
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:912
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "Close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
+#: ../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:459 ../widgets/misc/e-web-view.c:1306
+#: ../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
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
+#: ../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:1300
+#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
-#: ../shell/e-shell-window-actions.c:1481
+#: ../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
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "View help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
+#: ../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:1312
+#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1586
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+#: ../widgets/misc/e-mail-signature-editor.c:294
+msgid "Save and Close"
+msgstr "Save and Close"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1220
+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
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../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:172
+#: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/misc/e-signature-editor.c:225
+#: ../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:299
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
+#: ../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
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Attachment…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1267
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1308
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2393
-#: ../calendar/gui/dialogs/comp-editor.c:2556
-#: ../calendar/gui/dialogs/comp-editor.c:3548
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2650
+#: ../calendar/gui/dialogs/comp-editor.c:3654
 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:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:3618
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3580
+#: ../calendar/gui/dialogs/comp-editor.c:3686
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#: ../calendar/gui/dialogs/comp-editor-page.c:439
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
@@ -2945,13 +2879,13 @@ msgstr "_Free/Busy"
 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:3327
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3391
 msgid "Appointment"
 msgstr "Appointment"
 
 #: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:166
 msgid "Attendees"
 msgstr "Attendees"
 
@@ -2959,118 +2893,105 @@ msgstr "Attendees"
 msgid "Print this event"
 msgstr "Print this event"
 
-#: ../calendar/gui/dialogs/event-page.c:566
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "Event's start time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:643
+#: ../calendar/gui/dialogs/event-page.c:647
 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:647
+#: ../calendar/gui/dialogs/event-page.c:651
 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:659
-#: ../calendar/gui/dialogs/event-page.c:3101
+#: ../calendar/gui/dialogs/event-page.c:663
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "This event has reminders"
 
-#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.c:730
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:1285
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1288
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
-#: ../calendar/gui/dialogs/memo-page.c:723
-#: ../calendar/gui/dialogs/task-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1664
-#: ../calendar/gui/dialogs/memo-page.c:762
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1680
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1698
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1714
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1905
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:1907
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../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"
 
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * on behalf of some other user
-#. Translators: This string is used when we are creating a Task
-#. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3019
-#: ../calendar/gui/dialogs/memo-page.c:1025
-#: ../calendar/gui/dialogs/task-page.c:1858
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr "You are acting on behalf of %s"
-
-#: ../calendar/gui/dialogs/event-page.c:3361
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, 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:3367
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, 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:3373
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, 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:3392
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3398
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "None"
@@ -3106,7 +3027,6 @@ msgid "1 day before appointment"
 msgstr "1 day before appointment"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Location:"
 
@@ -3201,11 +3121,11 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3395
 msgid "Memo"
 msgstr "Memo"
 
@@ -3213,38 +3133,53 @@ msgstr "Memo"
 msgid "Print this memo"
 msgstr "Print this memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:423
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo's start date is in the past"
 msgstr "Memo's start date is in the past"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../calendar/gui/dialogs/memo-page.c:465
 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:464
+#: ../calendar/gui/dialogs/memo-page.c:469
 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:949
+#: ../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:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
-#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../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:720 ../mail/e-mail-reader.c:1727
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
+#: ../modules/itip-formatter/itip-view.c:4875 ../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
 msgid "To"
 msgstr "To"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:346
 #: ../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:350
+#: ../calendar/gui/dialogs/task-page.c:354
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
@@ -3299,21 +3234,21 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:576
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "on"
 msgstr "on"
 
@@ -3321,7 +3256,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:1098
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "first"
 msgstr "first"
 
@@ -3330,7 +3265,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:1104
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "second"
 msgstr "second"
 
@@ -3338,7 +3273,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:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 msgid "third"
 msgstr "third"
 
@@ -3346,7 +3281,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:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "fourth"
 msgstr "fourth"
 
@@ -3354,7 +3289,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:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
 msgid "fifth"
 msgstr "fifth"
 
@@ -3362,13 +3297,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:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
 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:1148
+#: ../calendar/gui/dialogs/recurrence-page.c:1156
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -3376,7 +3311,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:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1162
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -3384,7 +3319,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:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1168
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -3392,41 +3327,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:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1174
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1203
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Sunday"
@@ -3434,31 +3369,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:1322
+#: ../calendar/gui/dialogs/recurrence-page.c:1330
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1501
+#: ../calendar/gui/dialogs/recurrence-page.c:1509
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2225
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2258
+#: ../calendar/gui/dialogs/recurrence-page.c:2266
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2264
+#: ../calendar/gui/dialogs/recurrence-page.c:2272
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2308
+#: ../calendar/gui/dialogs/recurrence-page.c:2316
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2447
+#: ../calendar/gui/dialogs/recurrence-page.c:2455
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -3516,7 +3451,7 @@ msgstr "Every"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "Preview"
 
@@ -3539,79 +3474,77 @@ 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:326
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../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
 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:328
-#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../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
 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:330
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../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
 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:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Undefined"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:490
-#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+#: ../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
 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:301
-#: ../calendar/gui/e-cal-model-tasks.c:492
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
-#: ../calendar/gui/print.c:3411
+#: ../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
 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:304
-#: ../calendar/gui/e-cal-model-tasks.c:494
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
-#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/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/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "Completed"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../calendar/gui/e-cal-model-tasks.c:496
-#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
-#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../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
 msgid "Canceled"
 msgstr "Cancelled"
 
@@ -3619,8 +3552,8 @@ 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:3522
-#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-cal-model.c:3624
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:1
@@ -3660,36 +3593,36 @@ msgstr "Click to change or view the status details of the task"
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3393
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "Print this task"
 
-#: ../calendar/gui/dialogs/task-page.c:254
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "Task's start date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:293
 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:293
+#: ../calendar/gui/dialogs/task-page.c:297
 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:297
+#: ../calendar/gui/dialogs/task-page.c:301
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3697,11 +3630,11 @@ msgstr ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1777
+#: ../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"
@@ -3805,14 +3738,14 @@ msgstr "calendar view for one or more days"
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:1118
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3822,30 +3755,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:204 ../calendar/gui/e-day-view.c:1850
-#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../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:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1098
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1129
+#: ../modules/calendar/e-cal-shell-view-private.c:1136
+#: ../modules/calendar/e-cal-shell-view-private.c:1139
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3854,10 +3787,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:234 ../calendar/gui/e-day-view.c:1866
-#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../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:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3870,7 +3803,7 @@ msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:359
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3878,69 +3811,69 @@ msgstr[0] "%d day"
 msgstr[1] "%d days"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:365
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: ../calendar/gui/e-alarm-list.c:427
+#: ../calendar/gui/e-alarm-list.c:426
 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:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, 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:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, 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:453
+#: ../calendar/gui/e-alarm-list.c:452
 #, 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:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, 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:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, 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:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, 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:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, 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:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
@@ -3963,42 +3896,47 @@ msgstr "calendar view for a month"
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:751
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:276
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:295
+msgid "End Date:"
+msgstr "End Date:"
+
+#: ../calendar/gui/e-cal-component-preview.c:306
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../modules/itip-formatter/itip-view.c:1463
+#: ../modules/itip-formatter/itip-view.c:1578
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:343
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:397
 msgid "Web Page:"
 msgstr "Web Page:"
 
@@ -4011,10 +3949,10 @@ msgid "Start date"
 msgstr "Start date"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
 #: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "Type"
@@ -4023,7 +3961,7 @@ msgstr "Type"
 msgid "Completion date"
 msgstr "Completion date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
 msgid "Complete"
 msgstr "Complete"
 
@@ -4038,14 +3976,14 @@ msgstr "% Complete"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:383
 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:388
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "Created"
 
@@ -4071,21 +4009,21 @@ msgstr "Paste events from the clipboard"
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
-#: ../calendar/gui/e-task-table.c:286
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:283
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
+#: ../calendar/gui/e-task-table.c:1158
 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:1973 ../calendar/gui/e-memo-table.c:555
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:824
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
@@ -4093,20 +4031,20 @@ 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:1977 ../calendar/gui/e-memo-table.c:560
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:828
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3427
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2024
+#: ../calendar/gui/e-calendar-view.c:2043
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -4120,86 +4058,86 @@ msgstr "Start Date"
 msgid "End Date"
 msgstr "End Date"
 
-#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../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:3462
+#: ../modules/itip-formatter/itip-view.c:5962
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1625
+#: ../calendar/gui/e-cal-model.c:1657
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1627
+#: ../calendar/gui/e-cal-model.c:1659
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:1062
+#: ../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
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../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
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:3021
+#: ../calendar/gui/e-cal-model.c:3114
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: ../calendar/gui/e-cal-model.c:3466
-#: ../calendar/gui/e-meeting-list-view.c:218
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../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:5950
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-cal-model.c:3467
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../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:5956
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-cal-model.c:3468
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-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
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-cal-model.c:3469
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../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:5959
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-cal-model.c:3470
+#: ../calendar/gui/e-cal-model.c:3569
 msgid "Needs action"
 msgstr "Needs action"
 
 #: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/e-task-table.c:633
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:720
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4210,22 +4148,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:772
 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:163
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 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:166
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 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:174
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4235,16 +4173,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
-#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
-#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+#: ../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
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
-#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
-#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+#: ../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
 msgid "pm"
 msgstr "pm"
 
@@ -4254,13 +4192,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:1833 ../calendar/gui/e-day-view-top-item.c:833
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+#: ../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
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2650
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -4271,129 +4209,127 @@ 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:791
+#: ../calendar/gui/e-day-view-time-item.c:790
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:815
 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:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
+#: ../calendar/gui/e-day-view-time-item.c:832
+#: ../modules/calendar/e-calendar-preferences.c:185
+#: ../modules/calendar/e-calendar-preferences.c:237
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-day-view-time-item.c:866
 #: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:268
 msgid "Select..."
 msgstr "Select…"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
+#: ../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
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
+#: ../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
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:1160
+#: ../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
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1161
+#: ../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
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1175
+#: ../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
 msgid "Chair"
 msgstr "Chair"
 
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
+#: ../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
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/print.c:1177
+#: ../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
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/print.c:1178
+#: ../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
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-store.c:1069
+#: ../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
 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:615
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-list-view.c:671
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "In Process"
 
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1906
 #, 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:1897
+#: ../calendar/gui/e-meeting-store.c:1916
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Failure reason: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1902
-#: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:453
-#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../calendar/gui/e-meeting-store.c:1921
+#: ../plugins/publish-calendar/publish-calendar.c:335
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Enter password"
@@ -4482,47 +4418,46 @@ msgstr "Common Name"
 msgid "Language"
 msgstr "Language"
 
-#: ../calendar/gui/e-memo-table.c:436
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:459
+#: ../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
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:745
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:763
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -4534,41 +4469,40 @@ 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:611
+#: ../calendar/gui/e-task-table.c:608
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1048
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2353
+#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:457
+#: ../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-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1028
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1034
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1040
+#: ../modules/calendar/e-task-shell-view-actions.c:735
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -4579,40 +4513,40 @@ 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:1963
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:2025
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2253
+#: ../calendar/gui/gnome-cal.c:2315
 msgid "Purging"
 msgstr "Purging"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:819
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -4620,7 +4554,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:819
+#: ../calendar/gui/itip-utils.c:955
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -4629,7 +4563,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:826
+#: ../calendar/gui/itip-utils.c:962
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -4641,7 +4575,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:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -4650,7 +4584,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:840
+#: ../calendar/gui/itip-utils.c:976
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -4658,7 +4592,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:853
+#: ../calendar/gui/itip-utils.c:989
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -4666,7 +4600,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:860
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -4674,7 +4608,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:867
+#: ../calendar/gui/itip-utils.c:1003
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -4682,252 +4616,252 @@ 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:874
+#: ../calendar/gui/itip-utils.c:1010
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:1088
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:960
+#: ../calendar/gui/itip-utils.c:1096
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:1123
 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:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../calendar/gui/itip-utils.c:1306
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:652
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:652
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:652
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:652
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:652
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:653
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:653
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:653
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:653
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:653
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:654
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:654
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:654
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:654
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:654
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:655
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:655
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:655
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:655
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:655
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:656
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:656
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:656
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:656
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:656
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:657
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:657
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:657
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:657
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:657
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:658
 msgid "31st"
 msgstr "31st"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:715
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:715
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:715
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:715
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:716
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:716
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:716
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3220
 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:3166
+#: ../calendar/gui/print.c:3230
 msgid " (Completed "
 msgstr " (Completed "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3236
 msgid "Completed "
 msgstr "Completed "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3246
 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:3189
+#: ../calendar/gui/print.c:3253
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3418
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3445
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3503
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3521
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3532
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3545
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3556
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -4952,185 +4886,185 @@ msgstr "is greater than"
 msgid "is less than"
 msgstr "is less than"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:437
-#: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../calendar/importers/icalendar-importer.c:468
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:585
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:676
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:760
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar files (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:761
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:1041
+#: ../calendar/importers/icalendar-importer.c:1075
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:1085
+#: ../calendar/importers/icalendar-importer.c:1119
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Meeting"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Event"
 
-#: ../calendar/importers/icalendar-importer.c:1156
-#: ../calendar/importers/icalendar-importer.c:1472
+#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1473
+#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/importers/icalendar-importer.c:1168
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "has recurrences"
 
-#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1207
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "is an instance"
 
-#: ../calendar/importers/icalendar-importer.c:1178
+#: ../calendar/importers/icalendar-importer.c:1212
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "has reminders"
 
-#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "has attachments"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Private"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidential"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1211
-#: ../calendar/importers/icalendar-importer.c:1512
+#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1546
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Summary"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1251
 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:1225
-#: ../calendar/importers/icalendar-importer.c:1508
+#: ../calendar/importers/icalendar-importer.c:1259
+#: ../calendar/importers/icalendar-importer.c:1542
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Due"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1248
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "End"
 msgstr "End"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1292
 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:1282
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completed"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1290
+#: ../calendar/importers/icalendar-importer.c:1324
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1301
-#: ../calendar/importers/icalendar-importer.c:1304
+#: ../calendar/importers/icalendar-importer.c:1335
+#: ../calendar/importers/icalendar-importer.c:1338
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organiser"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1324
-#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1375
 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:1504
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -6683,319 +6617,12 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "ID of the socket to embed in"
-
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "socket"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "Please enter your full name."
-
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "Please enter your e-mail address."
-
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "The e-mail address you have entered is invalid."
-
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "Please enter your password."
-
-#: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5436 ../plugins/caldav/caldav-source.c:68
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:376
-#: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5307 ../mail/em-account-editor.c:5364
-#: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
-msgid "Google"
-msgstr "Google"
-
-#: ../capplet/settings/mail-account-view.c:497
-#: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4840 ../mail/em-account-editor.c:4875
-msgid "Always (SSL)"
-msgstr "Always (SSL)"
-
-#: ../capplet/settings/mail-account-view.c:500
-#: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4843 ../mail/em-account-editor.c:4878
-msgid "When possible (TLS)"
-msgstr "When possible (TLS)"
-
-#: ../capplet/settings/mail-account-view.c:503
-#: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4846
-#: ../mail/em-account-editor.c:4881
-msgid "Never"
-msgstr "Never"
-
-#: ../capplet/settings/mail-account-view.c:511
-msgid "Personal details:"
-msgstr "Personal details:"
-
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
-msgid "Name:"
-msgstr "Name:"
-
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
-msgid "Email address:"
-msgstr "E-mail address:"
-
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
-msgid "Details:"
-msgstr "Details:"
-
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
-msgid "Receiving"
-msgstr "Receiving"
-
-#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
-msgid "Server type:"
-msgstr "Server type:"
-
-#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
-msgid "Server address:"
-msgstr "Server address:"
-
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
-msgid "Username:"
-msgstr "Username:"
-
-#: ../capplet/settings/mail-account-view.c:579
-msgid "Use encryption:"
-msgstr "Use encryption:"
-
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
-msgid "Sending"
-msgstr "Sending"
-
-#: ../capplet/settings/mail-account-view.c:655
-msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"To use the e-mail application you'll need to set up an account. Put your e-"
-"mail address and password in below and we'll try and work out all the "
-"settings. If we can't do it automatically you'll need your server details as "
-"well."
-
-#: ../capplet/settings/mail-account-view.c:657
-msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-msgstr ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
-
-#: ../capplet/settings/mail-account-view.c:659
-msgid "You can specify more options to configure the account."
-msgstr "You can specify more options to configure the account."
-
-#: ../capplet/settings/mail-account-view.c:661
-msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-msgstr ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
-
-#: ../capplet/settings/mail-account-view.c:662
-msgid "You can specify your default settings for your account."
-msgstr "You can specify your default settings for your account."
-
-#: ../capplet/settings/mail-account-view.c:663
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-
-#: ../capplet/settings/mail-account-view.c:678
-#: ../mail/em-account-editor.c:2955 ../mail/em-account-editor.c:3094
-msgid "Identity"
-msgstr "Identity"
-
-#: ../capplet/settings/mail-account-view.c:678
-msgid "Next - Receiving mail"
-msgstr "Next — Receiving mail"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Receiving mail"
-msgstr "Receiving mail"
-
-#: ../capplet/settings/mail-account-view.c:679
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Next - Sending mail"
-msgstr "Next — Sending mail"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Back - Identity"
-msgstr "Back — Identity"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Next - Receiving options"
-msgstr "Next — Receiving options"
-
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Receiving options"
-msgstr "Receiving options"
-
-#: ../capplet/settings/mail-account-view.c:680
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving mail"
-msgstr "Back — Receiving mail"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Sending mail"
-msgstr "Sending mail"
-
-#: ../capplet/settings/mail-account-view.c:682
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Next - Review account"
-msgstr "Next — Review account"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Next - Defaults"
-msgstr "Next — Defaults"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving options"
-msgstr "Back — Receiving options"
-
-#: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4107
-msgid "Defaults"
-msgstr "Defaults"
-
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Back - Sending mail"
-msgstr "Back — Sending mail"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Review account"
-msgstr "Review account"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Finish"
-msgstr "Finish"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Back - Sending"
-msgstr "Back — Sending"
-
-#: ../capplet/settings/mail-account-view.c:855
-msgid "Setup Google contacts with Evolution"
-msgstr "Set up Google Contacts with Evolution"
-
-#: ../capplet/settings/mail-account-view.c:856
-msgid "Setup Google calendar with Evolution"
-msgstr "Set up Google Calendar with Evolution"
-
-#: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4935
-msgid "You may need to enable IMAP access."
-msgstr "You may need to enable IMAP access."
-
-#: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4912
-msgid "Google account settings:"
-msgstr "Google account settings:"
-
-#: ../capplet/settings/mail-account-view.c:895
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "Setup Yahoo calendar with Evolution"
-
-#: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4982
-msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-msgstr ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
-
-#: ../capplet/settings/mail-account-view.c:908
-#: ../mail/em-account-editor.c:4967
-msgid "Yahoo account settings:"
-msgstr "Yahoo account settings:"
-
-#: ../capplet/settings/mail-account-view.c:922
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo Calendar name:"
-
-#: ../capplet/settings/mail-account-view.c:1119
-msgid "Password:"
-msgstr "Password:"
-
-#: ../capplet/settings/mail-account-view.c:1173
-#: ../capplet/settings/mail-settings-view.c:262
-msgid "Close Tab"
-msgstr "Close Tab"
-
-#: ../capplet/settings/mail-account-view.c:1185
-msgid "Account Wizard"
-msgstr "Account Wizard"
-
-#: ../capplet/settings/mail-capplet-shell.c:212
-msgid "Evolution account assistant"
-msgstr "Evolution account assistant"
-
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:536
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "On This Computer"
-
-#: ../capplet/settings/mail-settings-view.c:152
-#, c-format
-msgid "Modify %s..."
-msgstr "Modify %s…"
-
-#: ../capplet/settings/mail-settings-view.c:154
-msgid "Add a new account"
-msgstr "Add a new account"
-
-#: ../capplet/settings/mail-settings-view.c:194
-msgid "Account management"
-msgstr "Account management"
-
-#: ../capplet/settings/mail-settings-view.c:274
-msgid "Settings"
-msgstr "Settings"
-
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Save as…"
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:211
+#: ../widgets/misc/e-mail-signature-editor.c:285
 msgid "_Close"
 msgstr "_Close"
 
@@ -7011,7 +6638,7 @@ msgstr "New _Message"
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
@@ -7047,7 +6674,7 @@ msgstr "Save as _Draft"
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:327
 msgid "S_end"
 msgstr "S_end"
 
@@ -7139,15 +6766,15 @@ msgstr "Toggles whether the Reply-To field is displayed"
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:45
 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:47
+#: ../composer/e-composer-header-table.c:48
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7155,74 +6782,59 @@ 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:779
+#: ../composer/e-composer-header-table.c:849
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:856
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:792
+#: ../composer/e-composer-header-table.c:861
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:797
+#: ../composer/e-composer-header-table.c:867
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:802
+#: ../composer/e-composer-header-table.c:873
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:807
+#: ../composer/e-composer-header-table.c:878
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:882
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:820
+#: ../composer/e-composer-header-table.c:890
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:215
-msgid "Undo the last action"
-msgstr "Undo the last action"
-
-#: ../composer/e-composer-private.c:219
-msgid "Redo the last undone action"
-msgstr "Redo the last undone action"
-
-#: ../composer/e-composer-private.c:223
-msgid "Search for text"
-msgstr "Search for text"
-
-#: ../composer/e-composer-private.c:227
-msgid "Search for and replace text"
-msgstr "Search for and replace text"
-
-#: ../composer/e-composer-private.c:337
+#: ../composer/e-composer-private.c:347
 msgid "Save draft"
 msgstr "Save draft"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:856
 #, 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:822
+#: ../composer/e-msg-composer.c:865
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7231,15 +6843,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4199
 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:4867
+#: ../composer/e-msg-composer.c:4876
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
@@ -7371,7 +6983,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "An error occurred while sending. How do you want to proceed?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "The reported error was &quot;{0}&quot;."
 
@@ -7409,13 +7021,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:941
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -7436,7 +7048,6 @@ msgid "Configure email accounts"
 msgstr "Configure e-mail accounts"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Enable address formatting"
 msgstr "Enable address formatting"
 
@@ -7449,12 +7060,10 @@ msgstr ""
 "destination country"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Autocomplete length"
 msgstr "Autocomplete length"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -7463,12 +7072,10 @@ msgstr ""
 "autocomplete."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "Show autocompleted name with an address"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -7477,22 +7084,18 @@ msgstr ""
 "autocompleted contact in the entry."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for the folder last used in the select names dialogue."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "Contact layout style"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -7505,27 +7108,22 @@ msgstr ""
 "contact list."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
 msgstr "Contact preview pane position (horizontal)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "Position of the contact preview pane when oriented horizontally."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
 msgstr "Contact preview pane position (vertical)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "Position of the contact preview pane when oriented vertically."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 msgid "Show maps"
 msgstr "Show maps"
 
@@ -7534,7 +7132,6 @@ msgid "Whether to show maps in preview pane"
 msgstr "Whether to show maps in preview pane"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Primary address book"
 msgstr "Primary address book"
 
@@ -7547,22 +7144,18 @@ msgstr ""
 "\"Contacts\" view"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "Show preview pane"
 msgstr "Show preview pane"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Whether to show the preview pane."
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Convert mail messages to Unicode"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -7571,17 +7164,14 @@ msgstr ""
 "different character sets."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Save directory for reminder audio"
 msgstr "Save directory for reminder audio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Directory for saving reminder audio files"
 msgstr "Directory for saving reminder audio files"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Birthday and anniversary reminder value"
 msgstr "Birthday and anniversary reminder value"
 
@@ -7590,7 +7180,6 @@ msgid "Number of units for determining a birthday or anniversary reminder"
 msgstr "Number of units for determining a birthday or anniversary reminder"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Birthday and anniversary reminder units"
 
@@ -7599,10 +7188,10 @@ msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\""
 msgstr ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Compress weekends in month view"
 msgstr "Compress weekends in month view"
 
@@ -7615,7 +7204,6 @@ msgstr ""
 "Sunday in the space of one weekday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "Ask for confirmation when deleting items"
 msgstr "Ask for confirmation when deleting items"
 
@@ -7624,7 +7212,6 @@ msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "Whether to ask for confirmation when deleting an appointment or task"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "Confirm expunge"
 
@@ -7633,7 +7220,6 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "Whether to ask for confirmation when expunging appointments and tasks"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Month view vertical pane position"
 msgstr "Month view vertical pane position"
 
@@ -7646,7 +7232,6 @@ msgstr ""
 "navigator calendar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Workday end hour"
 msgstr "Workday end hour"
 
@@ -7655,37 +7240,30 @@ msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Workday end minute"
 msgstr "Workday end minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute the workday ends on, 0 to 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Workday start hour"
 msgstr "Workday start hour"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Workday start minute"
 msgstr "Workday start minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute the workday starts on, 0 to 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "The second timezone for a Day View"
 
@@ -7698,7 +7276,6 @@ msgstr ""
 "used in a 'timezone' key"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "Recently used second time zones in a Day View"
 
@@ -7719,7 +7296,6 @@ msgstr ""
 "zones' list"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid "Default reminder value"
 msgstr "Default reminder value"
 
@@ -7728,7 +7304,6 @@ msgid "Number of units for determining a default reminder"
 msgstr "Number of units for determining a default reminder"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid "Default reminder units"
 msgstr "Default reminder units"
 
@@ -7737,67 +7312,54 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Show categories field in the event/meeting/task editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Whether to show categories field in the event/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Show Role field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Whether to show role field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Show RSVP field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Whether to show RSVP field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Whether to show status field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Show timezone field in the event/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Whether to show timezone field in the event/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Show type field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Whether to show type field in the event/task/meeting editor"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Hide completed tasks"
 msgstr "Hide completed tasks"
 
@@ -7806,17 +7368,16 @@ msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Whether to hide completed tasks in the tasks view"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid "Hide task units"
 msgstr "Hide task units"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgstr ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid "Hide task value"
 msgstr "Hide task value"
 
@@ -7825,7 +7386,6 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "Number of units for determining when to hide tasks"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Horizontal pane position"
 msgstr "Horizontal pane position"
 
@@ -7838,7 +7398,6 @@ msgstr ""
 "task list when not in the month view, in pixels"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Last reminder time"
 msgstr "Last reminder time"
 
@@ -7847,7 +7406,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "Time the last reminder ran, in time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains Line Colour — Day View"
 
@@ -7856,7 +7414,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Colour to draw the Marcus Bains line in the Day View"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains Line Colour — Time bar"
 
@@ -7866,7 +7423,6 @@ msgstr ""
 "Colour to draw the Marcus Bains Line in the Time bar (empty for default)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line"
 
@@ -7877,7 +7433,6 @@ msgstr ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
 msgstr "Memo preview pane position (horizontal)"
 
@@ -7886,7 +7441,6 @@ msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Position of the task preview pane when oriented horizontally"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "Memo layout style"
 
@@ -7901,7 +7455,6 @@ msgstr ""
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
 msgstr "Memo preview pane position (vertical)"
 
@@ -7910,7 +7463,6 @@ msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Position of the memo preview pane when oriented vertically"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Month view horizontal pane position"
 
@@ -7931,7 +7483,6 @@ msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Whether to scroll a Month View by a week, not by a month"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Reminder programs"
 msgstr "Reminder programs"
 
@@ -7940,7 +7491,6 @@ msgid "Programs that are allowed to be run by reminders"
 msgstr "Programs that are allowed to be run by reminders"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Show display reminders in notification tray"
 msgstr "Show display reminders in notification tray"
 
@@ -7957,7 +7507,6 @@ msgid "Name of the preferred New toolbar button item"
 msgstr "Name of the preferred New toolbar button item"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "Primary calendar"
 
@@ -7970,7 +7519,6 @@ msgstr ""
 "\"Calendar\" view"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "Primary memo list"
 
@@ -7983,7 +7531,6 @@ msgstr ""
 "\"Memos\" view"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "Primary task list"
 
@@ -7996,7 +7543,6 @@ msgstr ""
 "\"Tasks\" view"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "Free/busy template URL"
 
@@ -8010,7 +7556,6 @@ msgstr ""
 "user part of the mail address and %d is replaced by the domain"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "Recurrent Events in Italic"
 
@@ -8019,86 +7564,71 @@ msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "Show days with recurrent events in italic font in bottom left calendar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "List of selected calendars"
-msgstr "List of selected calendars"
+msgid "Search range for time-based searching in years"
+msgstr "Search range for time-based searching in years"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid "List of calendars to load"
-msgstr "List of calendars to load"
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "List of selected memo lists"
-msgstr "List of selected memo lists"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "List of memo lists to load"
-msgstr "List of memo lists to load"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "List of selected task lists"
-msgstr "List of selected task lists"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "List of task lists to load"
-msgstr "List of task lists to load"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Show appointment end times in week and month views"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "Whether to display the end time of events in the week and month views"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
 msgstr "Show the memo preview pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "If \"true\", show the memo preview pane in the main window"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Show the task preview pane"
 msgstr "Show the task preview pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "If \"true\", show the task preview pane in the main window"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Whether to show week numbers in various places in the Calendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Vertical position for the tag pane"
 msgstr "Vertical position for the tag pane"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
 msgstr "Highlight tasks due today"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Whether highlight tasks due today with a special colour (task-due-today-"
 "color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Tasks due today color"
 msgstr "Tasks due today colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8106,17 +7636,15 @@ msgstr ""
 "Background colour of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
 msgstr "Task preview pane position (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Task layout style"
 msgstr "Task layout style"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8126,31 +7654,29 @@ msgstr ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
 msgstr "Task preview pane position (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Position of the task preview pane when oriented vertically"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
 msgstr "Highlight overdue tasks"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Whether highlight overdue tasks with a special colour (task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8158,21 +7684,19 @@ msgstr ""
 "Background colour of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
 msgstr "Time divisions"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervals shown in Day and Work Week views, in minutes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8180,113 +7704,94 @@ msgstr ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
 msgstr "Twenty four hour time format"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr ""
+"Whether to show times in twenty four hour format instead of using am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Birthday and anniversary reminder"
 msgstr "Birthday and anniversary reminder"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Whether to set a reminder for birthdays and anniversaries"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether to set a default reminder for appointments"
 msgstr "Whether to set a default reminder for appointments"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Use system timezone"
 msgstr "Use system timezone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Use the system timezone instead of the timezone selected in Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Week start"
 msgstr "Week start"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Work days"
 msgstr "Work days"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "Days on which the start and end of work hours should be indicated"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Configuration version"
-msgstr "Configuration version"
+msgid "Previous Evolution version"
+msgstr "Previous Evolution version"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+"The most recently used version of Evolution, expressed as \"major.minor.micro"
+"\". This is used for data and settings migration from older to newer "
+"versions."
 msgstr ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+"The most recently used version of Evolution, expressed as "
+"\"major.minor.micro\". This is used for data and settings migration from older "
+"to newer versions."
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Last upgraded configuration version"
-msgstr "Last upgraded configuration version"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "List of disabled plugins"
 msgstr "List of disabled plugins"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
 msgstr "The list of disabled plugins in Evolution"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
 msgstr "The window's X coordinate"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The window's Y coordinate"
 msgstr "The window's Y coordinate"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
 msgid "The window's width in pixels"
 msgstr "The window's width in pixels"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
 msgid "The window's height in pixels"
 msgstr "The window's height in pixels"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
 msgstr "Whether the window is maximised"
 
@@ -8307,28 +7812,23 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Whether tasks from Gnome Calendar have been imported or not"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Check whether Evolution is the default mailer"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "Every time Evolution starts, check whether it is the default mailer."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Path where picture gallery should search for its content"
 msgstr "Path where picture gallery should search for its content"
 
@@ -8343,32 +7843,26 @@ msgstr ""
 "set path is not pointing to the existent folder"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognise emoticons in text and replace them with images."
 
@@ -8409,12 +7903,10 @@ msgstr ""
 "that the original message follows"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Group Reply replies to list"
 msgstr "Group Reply replies to list"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8427,12 +7919,10 @@ msgstr ""
 "replying."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "Put the cursor at the bottom of replies"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8443,52 +7933,42 @@ msgstr ""
 "message or the bottom."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline colour for misspelt words when using inline spelling."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Show \"Bcc\" field when sending a mail message"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8497,12 +7977,10 @@ msgstr ""
 "the View menu when a mail account is chosen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Show \"Cc\" field when sending a mail message"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8511,12 +7989,10 @@ msgstr ""
 "the View menu when a mail account is chosen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Show \"Reply To\" field when sending a mail message"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8525,12 +8001,10 @@ msgstr ""
 "from the View menu when a mail account is chosen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Show \"From\" field when posting to a newsgroup"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8539,12 +8013,10 @@ msgstr ""
 "the View menu when a news account is chosen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Show \"Reply To\" field when posting to a newsgroup"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8557,7 +8029,6 @@ msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitally sign replies when the original message is signed"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8566,12 +8037,10 @@ msgstr ""
 "which is also PGP or S/MIME signed."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Encode filenames in an Outlook/GMail way"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8584,12 +8053,10 @@ msgstr ""
 "standard."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8600,12 +8067,10 @@ msgstr ""
 "the message or the bottom."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "Do not add signature delimiter"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8614,12 +8079,10 @@ msgstr ""
 "signature when composing a mail."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "Ignore list Reply-To:"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8648,16 +8111,34 @@ msgid ""
 "prefix. An example is 'SV,AV'."
 msgstr ""
 "Comma-separated list of localised 'Re' abbreviations to skip in a subject "
-"text when replying to a message, as an addition to the standard \"Re\" prefix. "
-"An example is 'SV,AV'."
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr "Save file format for drag-and-drop operation"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr "Can be either 'mbox' or 'pdf'."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Save name format for drag-and-drop operation"
+msgstr "Save name format for drag-and-drop operation"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+msgstr ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8665,13 +8146,11 @@ msgstr ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8679,24 +8158,20 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Disable or enable ellipsizing of folder names in side bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Whether to disable ellipsizing feature of folder names in the side bar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8704,63 +8179,51 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Enable use of a similar message list view settings for all folders"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Enable use of a similar message list view settings for all folders."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Load images for HTML messages over HTTP"
 msgstr "Load images for HTML messages over HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -8770,33 +8233,27 @@ msgstr ""
 "Never load images off the net. \"1\" — Load images in messages from "
 "contacts. \"2\" — Always load images off the net."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -8808,33 +8265,27 @@ msgstr ""
 "header enabled&gt; — set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Search for the sender photo in local address books"
 msgstr "Search for the sender photo in local address books"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../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 "
@@ -8845,33 +8296,27 @@ msgstr ""
 "component viewer in GNOME's MIME type database may be used for displaying "
 "content."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../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:86
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Timeout for marking messages as seen"
 msgstr "Timeout for marking messages as seen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 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:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -8879,16 +8324,15 @@ 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:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" lines "
-"in the \"Messages\" column in vertical view"
+"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:92
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8896,42 +8340,31 @@ 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:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 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:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 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:95
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid "Enable local folders"
-msgstr "Enable local folders"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid "Whether to show local folders (On This Computer) in a folder tree"
-msgstr "Whether to show local folders (On This Computer) in a folder tree"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Enable search folders"
-msgstr "Enable search folders"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid "Enable Unmatched search folder"
+msgstr "Enable Unmatched search folder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Enable search folders on startup."
-msgstr "Enable search folders on startup."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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."
@@ -8939,22 +8372,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:101
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "State of message headers in paned view"
 msgstr "State of message headers in paned view"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
@@ -8962,23 +8392,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:105
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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 "
@@ -8990,43 +8416,35 @@ msgstr ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9034,43 +8452,11 @@ msgstr ""
 "Compress display of addresses in To/Cc/Bcc to the number specified in "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "Display only message texts not exceeding certain size"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"Enable display only of message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "Message text limit for display"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"This decides the maximum size of the message text that will be displayed "
-"under Evolution, specified in terms of KB. The default is 4096 (4MB). This "
-"value is used only when the 'force_message_limit' key is activated."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in To/Cc/Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9078,13 +8464,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:123
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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:124
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9092,12 +8476,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:125
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../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 in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9105,13 +8488,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:127
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 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:128
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 "
@@ -9121,12 +8502,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:129
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 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:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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 "
@@ -9138,33 +8518,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:131
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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:133
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "Flush Outbox after filtering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -9174,53 +8548,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:137
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when emptying the trash"
 msgstr "Prompt when emptying the wastebasket"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 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:143
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 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:146
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9228,23 +8590,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:147
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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:149
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:150
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9252,13 +8610,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:151
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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:152
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9266,23 +8622,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:153
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 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:155
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:156
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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 "
@@ -9292,13 +8644,43 @@ 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
+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
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+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
-#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:158
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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."
@@ -9306,13 +8688,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:159
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:160
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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 "
@@ -9322,13 +8702,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:161
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9336,8 +8714,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:163
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -9345,7 +8722,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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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."
@@ -9353,53 +8730,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:165
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:167
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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:168
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:169
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:171
-#: ../mail/evolution-mail.schemas.in.h:181
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:172
-#: ../mail/evolution-mail.schemas.in.h:182
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:173
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9407,13 +8773,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:174
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "Show original \"Date\" header value."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9423,13 +8787,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:176
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 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:177
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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."
@@ -9437,55 +8799,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:178
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:182
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:183
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:184
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:186
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -9495,13 +8847,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:188
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:189
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9513,8 +8863,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:190
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9522,8 +8871,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:191
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9533,13 +8881,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:192
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:193
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9549,13 +8895,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:194
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:195
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9563,35 +8907,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:196
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:201
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages on start"
 msgstr "Check for new messages on start"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9599,12 +8939,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:203
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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 "
@@ -9614,13 +8953,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:205
-#: ../mail/evolution-mail.schemas.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-#: ../mail/evolution-mail.schemas.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9628,8 +8965,14 @@ msgstr ""
 "Controls how frequently local changes are synchronised with the remote mail "
 "server. The interval must be at least 30 seconds."
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -9637,7 +8980,7 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -9650,16 +8993,16 @@ msgid "Address book source"
 msgstr "Address book source"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
-msgstr "Address book to use for storing automatically synced contacts"
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "Address book to use for storing automatically synced contacts."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "Auto sync GAIM contacts"
+msgid "Auto sync Pidgin contacts"
+msgstr "Auto sync Pidgin contacts"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Whether GAIM contacts should be automatically synced"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Whether Pidgin contacts should be automatically synced."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
@@ -9667,41 +9010,49 @@ msgstr "Enable autocontacts"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
+"Whether contacts should be automatically added to the user's address book."
 msgstr ""
-"Whether contacts should be automatically added to the user's addressbook"
+"Whether contacts should be automatically added to the user's address book."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "GAIM address book source"
+msgid "Pidgin address book source"
+msgstr "Pidgin address book source"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr "Address book to use for storing automatically synced contacts from GAIM"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr ""
+"Address book to use for storing automatically synced contacts from Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "GAIM check interval"
+msgid "Pidgin check interval"
+msgstr "Pidgin check interval"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Check interval for GAIM syncing of contacts"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Check interval for Pidgin syncing of contacts."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "GAIM last sync MD5"
+msgid "Pidgin last sync MD5"
+msgstr "Pidgin last sync MD5"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "GAIM last sync time"
+msgid "Pidgin last sync MD5."
+msgstr "Pidgin last sync MD5."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Pidgin last sync time"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Pidgin last sync time."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "List of Custom Headers"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9712,17 +9063,14 @@ msgstr ""
 "custom header followed by \"=\" and the values separated by \";\""
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "Default External Editor"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr "The default command that must be used as the editor."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 #: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
@@ -9732,12 +9080,10 @@ msgid "Automatically launch editor when key is pressed in the mail composer."
 msgstr "Automatically launch editor when key is pressed in the mail composer."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Insert Face picture by default"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -9754,12 +9100,10 @@ msgid "Whether to delete processed iTip objects"
 msgstr "Whether to delete processed iTip objects"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Notify new messages for Inbox only."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Whether to notify new messages in Inbox folder only."
 
@@ -9772,12 +9116,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Generates a D-Bus message when new mail messages arrive."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Enable icon in notification area."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Show new mail icon in notification area when new messages arrive."
 
@@ -9790,50 +9132,56 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "Whether show message over the icon when new messages arrive."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Play sound when new messages arrive."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Enable audible notifications when new messages arrive."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "Whether play sound or beep when new messages arrive."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
+msgstr ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" and "
+"\"notify-sound-use-theme\" keys are disregarded."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "Beep or play sound file."
+msgid "Whether to emit a beep."
+msgstr "Whether to emit a beep."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Whether to emit a beep when new messages arrive."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound filename to be played."
 msgstr "Sound filename to be played."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "Sound file to be played when new messages arrive, if not in beep mode."
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
+msgstr ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-"
+"file\" is \"true\"."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "FIXME"
-msgstr "FIXME"
+msgid "Whether to play a sound file."
+msgstr "Whether to play a sound file."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "Use sound theme"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "Play themed sound when new messages arrive, if not in beep mode."
 
@@ -9855,8 +9203,19 @@ msgstr ""
 msgid "Whether to show suppressed HTML output"
 msgstr "Whether to show suppressed HTML output"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "List of Destinations for publishing"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
@@ -9865,24 +9224,20 @@ msgstr ""
 "message body."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialogue in development versions of Evolution is skipped."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Initial attachment view"
 msgstr "Initial attachment view"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -9898,13 +9253,11 @@ 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/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
@@ -9920,32 +9273,26 @@ msgstr ""
 "List of paths for the folders to be synchronised to disk for offline usage."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "Enable express mode"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "Flag that enables a much simplified user interface."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Window button style"
 msgstr "Window button style"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9956,57 +9303,46 @@ msgstr ""
 "by the GNOME toolbar setting."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
@@ -10015,12 +9351,10 @@ msgid "Socket path for SpamAssassin"
 msgstr "Socket path for SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
@@ -10032,102 +9366,377 @@ msgstr "SpamAssassin client binary"
 msgid "SpamAssassin daemon binary"
 msgstr "SpamAssassin daemon binary"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../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 "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Attachment"
+msgstr[1] "Attachments"
+
+#: ../em-format/e-mail-formatter-attachment.c:369
+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
 msgid "From"
 msgstr "From"
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
-#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
+#: ../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
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
-#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
+#: ../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
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../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:75
-#: ../smime/lib/e-cert.c:1126
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Subject"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../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
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1474
+#. 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
 #, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
+msgid "From: %s"
+msgstr "From: %s"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
+#: ../em-format/e-mail-formatter-headers.c:134
+#: ../em-format/e-mail-formatter-headers.c:139
+msgid "(no subject)"
+msgstr "(no subject)"
 
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
+#: ../em-format/e-mail-formatter-headers.c:340
+#, 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/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
+#: ../em-format/e-mail-formatter-image.c:152
+msgid "Regular Image"
+msgstr "Regular Image"
 
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "Could not parse PGP/MIME message"
+#: ../em-format/e-mail-formatter-image.c:158
+msgid "Display part as an image"
+msgstr "Display part as an image"
 
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Could not parse PGP/MIME message: Unknown error"
+#: ../em-format/e-mail-formatter-message-rfc822.c:237
+msgid "RFC822 message"
+msgstr "RFC822 message"
 
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
+#: ../em-format/e-mail-formatter-message-rfc822.c:243
+msgid "Format part as an RFC822 message"
+msgstr "Format part as an RFC822 message"
 
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../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
+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
+msgid "Size"
+msgstr "Size"
+
+#. Add encryption/signature header
+#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../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
+msgid "Security"
+msgstr "Security"
+
+#: ../em-format/e-mail-formatter-print-headers.c:147
+msgid "GPG signed"
+msgstr "GPG signed"
+
+#: ../em-format/e-mail-formatter-print-headers.c:152
+msgid "GPG encrpyted"
+msgstr "GPG encrypted"
 
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
+#: ../em-format/e-mail-formatter-print-headers.c:158
+msgid "S/MIME signed"
+msgstr "S/MIME signed"
 
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "Could not parse PGP message: "
+#: ../em-format/e-mail-formatter-print-headers.c:164
+msgid "S/MIME encrpyted"
+msgstr "S/MIME encrypted"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../em-format/e-mail-formatter-quote-headers.c:176
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1121
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
+#: ../em-format/e-mail-formatter-text-enriched.c:115
+msgid "Richtext"
+msgstr "Richtext"
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
+#: ../em-format/e-mail-formatter-text-enriched.c:121
+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
+msgid "HTML"
+msgstr "HTML"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:110
+#: ../em-format/e-mail-formatter-text-html.c:346
+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:182
+msgid "Plain Text"
+msgstr "Plain Text"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:129
+#: ../em-format/e-mail-formatter-text-plain.c:188
+msgid "Format part as plain text"
+msgstr "Format part as plain text"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid "Valid signature, but cannot verify sender"
+msgstr "Valid signature, but cannot verify sender"
+
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid "Signature exists, but need public key"
+msgstr "Signature exists, but need public key"
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+
+#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_View Certificate"
+msgstr "_View Certificate"
+
+#: ../em-format/e-mail-formatter-secure-button.c:205
+msgid "This certificate is not viewable"
+msgstr "This certificate is not viewable"
+
+#: ../em-format/e-mail-formatter-source.c:139
+msgid "Source"
+msgstr "Source"
+
+#: ../em-format/e-mail-formatter-source.c:145
+msgid "Display source of a MIME part"
+msgstr "Display source of a MIME part"
+
+#: ../em-format/e-mail-parser-application-mbox.c:108
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr "Error parsing MBOX part: %s"
+
+#: ../em-format/e-mail-parser-application-smime.c:104
+#, 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
+#, 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
+#, c-format
+msgid "Error verifying signature: %s"
+msgstr "Error verifying signature: %s"
+
+#: ../em-format/e-mail-parser-message-external.c:86
+msgid "Malformed external-body part"
+msgstr "Malformed external-body part"
+
+#: ../em-format/e-mail-parser-message-external.c:118
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:129
+#, 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
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:150
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: ../em-format/e-mail-parser-message-external.c:167
+#, 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
+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
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#, 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
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: ../em-format/e-mail-part-utils.c:493
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
@@ -10243,14 +9852,14 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../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"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
@@ -10340,12 +9949,6 @@ msgstr "Writing \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "Writing \"%s\" to %s"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:392
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "weeks"
-
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
@@ -10386,11 +9989,27 @@ msgstr "Because \"{1}\"."
 msgid "Cannot open file \"{0}\"."
 msgstr "Cannot open file \"{0}\"."
 
-#: ../e-util/e-util.c:245
+#: ../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:292
+#: ../e-util/e-util.c:296
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
@@ -10508,7 +10127,7 @@ msgstr "now"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:289
+#: ../filter/e-filter-datespec.c:291
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -10516,72 +10135,75 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../filter/e-filter-rule.c:686
+#: ../filter/e-filter-rule.c:744
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/e-filter-rule.c:718
-msgid "Find items that meet the following conditions"
-msgstr "Find items that meet the following conditions"
+#: ../filter/e-filter-rule.c:794
+msgid "all the following conditions"
+msgstr "all the following conditions"
 
-#: ../filter/e-filter-rule.c:743
-msgid "If all conditions are met"
-msgstr "If all conditions are met"
+#: ../filter/e-filter-rule.c:795
+msgid "any of the following conditions"
+msgstr "any of the following conditions"
 
-#: ../filter/e-filter-rule.c:744
-msgid "If any conditions are met"
-msgstr "If any conditions are met"
+#: ../filter/e-filter-rule.c:801
+msgid "_Find items which match:"
+msgstr "_Find items which match:"
 
-#: ../filter/e-filter-rule.c:747
-msgid "_Find items:"
-msgstr "_Find items:"
+#: ../filter/e-filter-rule.c:824
+msgid "Find items that meet the following conditions"
+msgstr "Find items that meet the following conditions"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+#: ../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:616
+#: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "None"
 
-#: ../filter/e-filter-rule.c:777
+#: ../filter/e-filter-rule.c:840
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:841 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:842
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/e-filter-rule.c:780
+#: ../filter/e-filter-rule.c:843
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/e-filter-rule.c:783
+#: ../filter/e-filter-rule.c:846
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../filter/e-filter-rule.c:808
+#: ../filter/e-filter-rule.c:923
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../filter/e-filter-rule.c:1240 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1240 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../filter/e-rule-editor.c:273
+#: ../filter/e-rule-editor.c:288
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../filter/e-rule-editor.c:366
+#: ../filter/e-rule-editor.c:395
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
@@ -10613,7 +10235,7 @@ msgstr "Bad regular expression &quot;{0}&quot;."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Could not compile regular expression &quot;{1}&quot;."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -10641,10 +10263,14 @@ msgstr "the time you specify"
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/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
+msgid "weeks"
+msgstr "weeks"
+
 #: ../filter/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
@@ -10666,7 +10292,7 @@ msgstr "in the future"
 msgid "Show filters for mail:"
 msgstr "Show filters for mail:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
@@ -10698,154 +10324,144 @@ msgstr ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../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:112
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Saving message to folder '%s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:378
-#: ../libemail-engine/e-mail-folder-utils.c:627
+#: ../libemail-engine/e-mail-folder-utils.c:675
+#: ../libemail-engine/e-mail-folder-utils.c:926
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:472
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "Scanning messages for duplicates"
 
-#: ../libemail-engine/e-mail-folder-utils.c:875
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1009
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "File \"%s\" has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1013
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "File has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1072
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1234
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Invalid folder URI '%s'"
 
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../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:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
+#: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "Templates"
 
-#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
-msgid "Search Folders"
-msgstr "Search Folders"
-
-#: ../libemail-engine/e-mail-session.c:975
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Enter Passphrase for %s"
+msgid "User cancelled operation"
+msgstr "User cancelled operation"
 
-#: ../libemail-engine/e-mail-session.c:979
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
-
-#: ../libemail-engine/e-mail-session.c:983
+#: ../libemail-engine/e-mail-session.c:1489
 #, c-format
-msgid "Enter Password for %s"
-msgstr "Enter Password for %s"
-
-#: ../libemail-engine/e-mail-session.c:987
-msgid "Enter Password"
-msgstr "Enter Password"
+msgid "%s authentication failed"
+msgstr "%s authentication failed"
 
-#: ../libemail-engine/e-mail-session.c:1038
+#: ../libemail-engine/e-mail-session.c:1534
 #, c-format
-msgid "User canceled operation."
-msgstr "User cancelled operation."
+msgid "No data source found for UID '%s'"
+msgstr "No data source found for UID '%s'"
 
-#: ../libemail-engine/e-mail-session.c:1157
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr ""
-"No destination address provided; forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 
-#: ../libemail-engine/e-mail-session.c:1166
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "No account found to use; forward of the message has been cancelled."
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr "No identity found to use, forwarding of the message has been cancelled."
 
-#: ../libemail-engine/e-mail-session.c:1320
+#: ../libemail-engine/e-mail-session-utils.c:540
 #, c-format
-msgid "%s authentication failed"
-msgstr "%s authentication failed"
-
-#: ../libemail-engine/e-mail-session.c:1394
-#, c-format
-msgid "No password was provided"
-msgstr "No password was provided"
+msgid "No mail service found with UID '%s'"
+msgstr "No mail service found with UID '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:416
+#: ../libemail-engine/e-mail-session-utils.c:549
 #, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "Cannot get transport for account '%s'"
+msgid "UID '%s' is not a mail transport"
+msgstr "UID '%s' is not a mail transport"
 
-#: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/e-mail-session-utils.c:641
+#: ../libemail-engine/mail-ops.c:698
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:531
-#: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/e-mail-session-utils.c:670
+#: ../libemail-engine/e-mail-session-utils.c:704
+#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10854,143 +10470,120 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:724
+#: ../libemail-engine/mail-ops.c:773
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Failed to append to local 'Sent' folder: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:954
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Unsubscribing from folder '%s'"
-
-#: ../libemail-engine/e-mail-store-utils.c:169
+#: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Disconnecting from '%s'"
 
-#: ../libemail-engine/e-mail-store-utils.c:260
+#: ../libemail-engine/e-mail-store-utils.c:263
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnecting to '%s'"
 
-#: ../libemail-engine/e-mail-store-utils.c:335
+#: ../libemail-engine/e-mail-store-utils.c:340
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:876
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#. Translators: The string is distinguished by total
-#. * count of messages to be sent.  Failed messages is
-#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Failed to send a message"
 msgstr[1] "Failed to send %d of %d messages"
 
-#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "Complete."
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moving messages to '%s'"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copying messages to '%s'"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1207
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1281
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1282
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../libemail-engine/mail-ops.c:1257
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Refreshing folder '%s'"
-
-#: ../libemail-engine/mail-ops.c:1475
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "Expunging folder '%s'"
-
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1356
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../libemail-engine/mail-ops.c:1664
-#, c-format
-msgid "Disconnecting %s"
-msgstr "Disconnecting %s"
-
 #: ../libemail-engine/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Could not create spool directory '%s': %s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message — %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:130
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../libemail-engine/mail-vfolder.c:214
+#: ../libemail-engine/mail-vfolder.c:283
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Updating Search Folders for '%s' - %s"
@@ -11000,7 +10593,7 @@ msgstr "Updating Search Folders for '%s' - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:554
+#: ../libemail-engine/mail-vfolder.c:648
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11019,91 +10612,87 @@ msgstr[1] ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#: ../mail/e-mail-account-manager.c:460
+msgid "_Restore Default"
+msgstr "_Restore Default"
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "None"
+#: ../mail/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-account-editor.c:1753
-msgid "Always"
-msgstr "Always"
+#: ../mail/e-mail-account-manager.c:518
+msgid "De_fault"
+msgstr "De_fault"
 
-#: ../mail/em-account-editor.c:1754
-msgid "Ask for each message"
-msgstr "Ask for each message"
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:505
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:864
+msgid "Enabled"
+msgstr "Enabled"
 
-#: ../mail/em-account-editor.c:2912 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "_Path:"
+#: ../mail/e-mail-account-tree-view.c:109
+msgid "Account Name"
+msgstr "Account Name"
 
-#: ../mail/em-account-editor.c:2915
-msgid "Fil_e:"
-msgstr "Fil_e:"
+#: ../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:3655
+#: ../mail/mail-config.ui.h:44
+msgid "Default"
+msgstr "Default"
 
-#: ../mail/em-account-editor.c:2952
-msgid "Mail Configuration"
-msgstr "Mail Configuration"
+#: ../mail/e-mail-autoconfig.c:194
+#, c-format
+msgid "No mail exchanger record for '%s'"
+msgstr "No mail exchanger record for '%s'"
 
-#: ../mail/em-account-editor.c:2953
-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."
+#: ../mail/e-mail-autoconfig.c:201
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "Temporarily unable to resolve '%s'"
 
-#: ../mail/em-account-editor.c:2956
-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/e-mail-autoconfig.c:208
+#, c-format
+msgid "Error resolving '%s'"
+msgstr "Error resolving '%s'"
 
-#: ../mail/em-account-editor.c:2958 ../mail/em-account-editor.c:3167
-msgid "Receiving Email"
-msgstr "Receiving E-mail"
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr "No authoritative name server for '%s'"
 
-#: ../mail/em-account-editor.c:2959
-msgid "Please configure the following account settings."
-msgstr "Please configure the following account settings."
+#: ../mail/e-mail-autoconfig.c:661
+msgid "No email address provided"
+msgstr "No e-mail address provided"
 
-#: ../mail/em-account-editor.c:2961 ../mail/em-account-editor.c:3786
-msgid "Sending Email"
-msgstr "Sending E-mail"
+#: ../mail/e-mail-autoconfig.c:670
+msgid "Missing domain in email address"
+msgstr "Missing domain in e-mail address"
 
-#: ../mail/em-account-editor.c:2962
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+#: ../mail/e-mail-backend.c:744
+msgid "Unknown background operation"
+msgstr "Unknown background operation"
 
-#: ../mail/em-account-editor.c:2964
-msgid "Account Summary"
-msgstr "Account Summary"
+#: ../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"
 
-#: ../mail/em-account-editor.c:2965
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"This is a summary of the settings which will be used to access your mail."
+#: ../mail/e-mail-browser.c:284
+msgid "(No Subject)"
+msgstr "(No Subject)"
 
-#: ../mail/em-account-editor.c:2969
-msgid "Done"
-msgstr "Done"
+#: ../mail/e-mail-config-assistant.c:501
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
+
+#: ../mail/e-mail-config-auth-check.c:348
+msgid "Check for Supported Types"
+msgstr "Check for Supported Types"
 
-#: ../mail/em-account-editor.c:2970
+#: ../mail/e-mail-config-confirm-page.c:157
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11117,133 +10706,377 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: ../mail/em-account-editor.c:3533
-msgid "Check for _new messages every"
-msgstr "Check for _new messages every"
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Done"
 
-#: ../mail/em-account-editor.c:3541
-msgid "minu_tes"
-msgstr "minu_tes"
+#: ../mail/e-mail-config-defaults-page.c:539
+msgid "Special Folders"
+msgstr "Special Folders"
 
-#: ../mail/em-account-editor.c:4259 ../mail/mail-config.ui.h:166
-msgid "Security"
-msgstr "Security"
+#: ../mail/e-mail-config-defaults-page.c:548
+msgid "Draft Messages _Folder:"
+msgstr "Draft Messages _Folder:"
+
+#: ../mail/e-mail-config-defaults-page.c:558
+msgid "Choose a folder for saving draft messages."
+msgstr "Choose a folder for saving draft messages."
+
+#: ../mail/e-mail-config-defaults-page.c:572
+msgid "Sent _Messages Folder:"
+msgstr "Sent _Messages Folder:"
+
+#: ../mail/e-mail-config-defaults-page.c:582
+msgid "Choose a folder for saving sent messages."
+msgstr "Choose a folder for saving sent messages."
+
+#: ../mail/e-mail-config-defaults-page.c:596
+msgid "_Restore Defaults"
+msgstr "_Restore Defaults"
+
+#: ../mail/e-mail-config-defaults-page.c:610
+msgid "Use a Real Folder for _Trash:"
+msgstr "Use a Real Folder for _Wastebasket:"
 
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4314 ../mail/em-account-editor.c:4416
+#: ../mail/e-mail-config-defaults-page.c:611
+msgid "Choose a folder for deleted messages."
+msgstr "Choose a folder for deleted messages."
+
+#: ../mail/e-mail-config-defaults-page.c:620
+msgid "Use a Real Folder for _Junk:"
+msgstr "Use a Real Folder for _Junk:"
+
+#: ../mail/e-mail-config-defaults-page.c:621
+msgid "Choose a folder for junk messages."
+msgstr "Choose a folder for junk messages."
+
+#: ../mail/e-mail-config-defaults-page.c:638
+msgid "Composing Messages"
+msgstr "Composing Messages"
+
+#: ../mail/e-mail-config-defaults-page.c:647
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Alway_s carbon-copy (cc) to:"
+
+#: ../mail/e-mail-config-defaults-page.c:672
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (bcc) to:"
+
+#: ../mail/e-mail-config-defaults-page.c:707
+msgid "Message Receipts"
+msgstr "Message Receipts"
+
+#: ../mail/e-mail-config-defaults-page.c:716
+msgid "S_end message receipts:"
+msgstr "S_end message receipts:"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "Never"
+
+#: ../mail/e-mail-config-defaults-page.c:747
+msgid "Always"
+msgstr "Always"
+
+#: ../mail/e-mail-config-defaults-page.c:753
+msgid "Ask for each message"
+msgstr "Ask for each message"
+
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "Defaults"
+
+#: ../mail/e-mail-config-identity-page.c:254
+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/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-summary-page.c:324
+msgid "Account Information"
+msgstr "Account Information"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../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/e-mail-config-identity-page.c:299
+#: ../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:"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+msgstr "Required Information"
+
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "Full Nam_e:"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "E-mail _Address:"
+
+#: ../mail/e-mail-config-identity-page.c:409
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Optional Information"
+
+#: ../mail/e-mail-config-identity-page.c:417
+msgid "Re_ply-To:"
+msgstr "Re_ply-To:"
+
+#: ../mail/e-mail-config-identity-page.c:444
+msgid "Or_ganization:"
+msgstr "Or_ganisation:"
+
+#: ../mail/e-mail-config-identity-page.c:499
+msgid "Add Ne_w Signature..."
+msgstr "Add Ne_w Signature…"
+
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "Identity"
+
+#: ../mail/e-mail-config-lookup-page.c:68
+msgid "Looking up account details..."
+msgstr "Looking up account details…"
+
+#: ../mail/e-mail-config-provider-page.c:485
+msgid "Checking for New Mail"
+msgstr "Checking for New Mail"
+
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "Check for _new messages every"
+
+#: ../mail/e-mail-config-provider-page.c:700
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:4315 ../mail/em-account-editor.c:4417
-msgid "Checking for New Messages"
-msgstr "Checking for New Messages"
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:4920
-msgid "Setup Google con_tacts with Evolution"
-msgstr "Setup Google con_tacts with Evolution"
+#: ../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"
 
-#: ../mail/em-account-editor.c:4927
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "Setup Google ca_lendar with Evolution"
+#: ../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/em-account-editor.c:4975
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "Setup _Yahoo calendar with Evolution"
+#: ../mail/e-mail-config-security-page.c:290
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/em-account-editor.c:5000
-msgid "Yahoo Calen_dar name:"
-msgstr "Yahoo Calen_dar name:"
+#: ../mail/e-mail-config-security-page.c:298
+msgid "OpenPGP _Key ID:"
+msgstr "OpenPGP _Key ID:"
 
-#: ../mail/e-mail-account-manager.c:405
-msgid "_Restore Default"
-msgstr "_Restore Default"
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Si_gning algorithm:"
 
-#: ../mail/e-mail-account-manager.c:418
-msgid "You can drag and drop account names to reorder them."
-msgstr "You can drag and drop account names to reorder them."
+#: ../mail/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/e-mail-account-manager.c:463
-msgid "De_fault"
-msgstr "De_fault"
+#: ../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/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:509
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:855
-msgid "Enabled"
-msgstr "Enabled"
+#: ../mail/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/e-mail-account-tree-view.c:105
-msgid "Account Name"
-msgstr "Account Name"
+#: ../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"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
-#: ../mail/mail-config.ui.h:51
-#: ../plugins/google-account-setup/google-source.c:311
-#: ../plugins/google-account-setup/google-source.c:553
-#: ../plugins/google-account-setup/google-source.c:690
-msgid "Default"
-msgstr "Default"
+#: ../mail/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"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Attachment"
-msgstr[1] "Attachments"
+#: ../mail/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/e-mail-attachment-bar.c:619
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Icon View"
+#: ../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/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "List View"
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-backend.c:661
-msgid "Unknown background operation"
-msgstr "Unknown background operation"
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "Sig_ning certificate:"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-msgid "Close this window"
-msgstr "Close this window"
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+msgid "Select"
+msgstr "Select"
 
-#: ../mail/e-mail-browser.c:289
-msgid "(No Subject)"
-msgstr "(No Subject)"
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "Signing _algorithm:"
+
+#: ../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/e-mail-config-security-page.c:523
+msgid "Encryption certificate:"
+msgstr "Encryption certificate:"
+
+#: ../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/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/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "Sending E-mail"
+
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "Server _Type:"
+
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+"This is a summary of the settings which will be used to access your mail."
+
+#: ../mail/e-mail-config-summary-page.c:372
+msgid "Personal Details"
+msgstr "Personal Details"
+
+#: ../mail/e-mail-config-summary-page.c:381
+msgid "Full Name:"
+msgstr "Full Name:"
+
+#: ../mail/e-mail-config-summary-page.c:395
+msgid "Email Address:"
+msgstr "E-mail Address:"
+
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "Receiving"
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "Sending"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-config-summary-page.c:433
+msgid "Server Type:"
+msgstr "Server Type:"
+
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../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:691
+msgid "Username:"
+msgstr "Username:"
+
+#: ../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 ""
+"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."
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "Welcome"
+
+#: ../mail/e-mail-config-window.c:329
+msgid "Account Editor"
+msgstr "Account Editor"
+
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "_Add to Address Book…"
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "Send _Reply To…"
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "Send a reply message to this address"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
+#: ../mail/e-mail-display.c:159
+msgid "Save _Image..."
+msgstr "Save _Image…"
+
+#: ../mail/e-mail-display.c:161
+msgid "Save the image to a file"
+msgstr "Save the image to a file"
+
 #. 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
@@ -11279,7 +11112,7 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
 msgstr "Add Label"
 
@@ -11299,641 +11132,670 @@ msgstr ""
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1359
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "Name"
-
-#: ../mail/e-mail-migrate.c:1269
+#: ../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"
 
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "Please select a folder"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:124
+#, c-format
+msgid "Page %d of %d"
+msgstr "Page %d of %d"
+
+#: ../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"
+
+#: ../mail/e-mail-printer.c:555
+msgid "Header Name"
+msgstr "Header Name"
+
+#: ../mail/e-mail-printer.c:561
+msgid "Header Value"
+msgstr "Header Value"
+
+#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
+msgid "Headers"
+msgstr "Headers"
+
+#: ../mail/e-mail-reader.c:349
+msgid "Save Image"
+msgstr "Save Image"
+
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "_Move"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1535
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1726
+msgid "Failed to retrieve message:"
+msgstr "Failed to retrieve message:"
+
+#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Retrieving message '%s'"
+
+#: ../mail/e-mail-reader.c:1949
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1951
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1956
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1958
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1963
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder…"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1965
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1970
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:1823
-msgid "Filter on Mailing _List..."
-msgstr "Filter on Mailing _List…"
+#: ../mail/e-mail-reader.c:1977
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "Create a Filter Rule for Mailing _List…"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../mail/e-mail-reader.c:1830
-msgid "Filter on _Recipients..."
-msgstr "Filter on _Recipients…"
+#: ../mail/e-mail-reader.c:1984
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "Create a Filter Rule for _Recipients…"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Create a rule to filter messages to these recipients"
 
-#: ../mail/e-mail-reader.c:1837
-msgid "Filter on Se_nder..."
-msgstr "Filter on Se_nder…"
+#: ../mail/e-mail-reader.c:1991
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "Create a Filter Rule for Se_nder…"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1993
 msgid "Create a rule to filter messages from this sender"
 msgstr "Create a rule to filter messages from this sender"
 
-#: ../mail/e-mail-reader.c:1844
-msgid "Filter on _Subject..."
-msgstr "Filter on _Subject…"
+#: ../mail/e-mail-reader.c:1998
+msgid "Create a Filter Rule for _Subject..."
+msgstr "Create a Filter Rule for _Subject…"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages with this subject"
 msgstr "Create a rule to filter messages with this subject"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2005
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:2007
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2012
 msgid "_Find in Message..."
 msgstr "_Find in Message…"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:2014
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:2019
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:2021
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2026
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:2028
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Set the follow-up flag to completed on the selected messages"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2033
 msgid "Follow _Up..."
 msgstr "Follow _Up…"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:2035
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2040
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Forward the selected message to someone as an attachment"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2054
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
 msgid "Forward the selected message in the body of a new message"
 msgstr "Forward the selected message in the body of a new message"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2068
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2075
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2082
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2084
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2089
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2096
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2103
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2110
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2117
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2119
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2124
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as not having been read"
 msgstr "Mark the selected messages as not having been read"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2131
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message…"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in the composer for editing"
 msgstr "Open the selected messages in the composer for editing"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2140
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2145
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2147
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2152
 msgid "_Move to Folder..."
 msgstr "_Move to Folder…"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2154
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2159
 msgid "_Switch to Folder"
 msgstr "_Switch to Folder"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the parent folder"
 msgstr "Display the parent folder"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to _next tab"
 msgstr "Switch to _next tab"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2168
 msgid "Switch to the next tab"
 msgstr "Switch to the next tab"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to _previous tab"
 msgstr "Switch to _previous tab"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2175
 msgid "Switch to the previous tab"
 msgstr "Switch to the previous tab"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2180
 msgid "Cl_ose current tab"
 msgstr "Cl_ose current tab"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2182
 msgid "Close current tab"
 msgstr "Close current tab"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2187
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2194
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2201
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2203
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2208
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2215
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2222
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2229
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2236
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2245
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2252
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2257
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2259
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2264
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2266
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2271
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2273
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2280
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Compose a reply to all the recipients of the selected message"
 
-#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2287
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
-#: ../mail/e-mail-reader.c:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2292
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2294
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compose a reply to the sender of the selected message"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2299
 msgid "_Save as mbox..."
 msgstr "_Save as mbox…"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2301
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2306
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2308
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2320
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2322
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2327
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2329
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2334
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2336
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2341
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2343
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:2196
-msgid "Create R_ule"
-msgstr "Create R_ule"
+#: ../mail/e-mail-reader.c:2350
+msgid "Cre_ate"
+msgstr "Cre_ate"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2357
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2364
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2371
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2378
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2385
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2392
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2399
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Mailing _List..."
-msgstr "Search Folder from Mailing _List…"
+#: ../mail/e-mail-reader.c:2409
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "Create a Search Folder from Mailing _List…"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2411
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Recipien_ts..."
-msgstr "Search Folder from Recipien_ts…"
+#: ../mail/e-mail-reader.c:2416
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "Create a Search Folder from Recipien_ts…"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2418
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from Sen_der..."
-msgstr "Search Folder from Sen_der…"
+#: ../mail/e-mail-reader.c:2423
+msgid "Create a Search Folder from Sen_der..."
+msgstr "Create a Search Folder from Sen_der…"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2425
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../mail/e-mail-reader.c:2276
-msgid "Search Folder from S_ubject..."
-msgstr "Search Folder from S_ubject…"
+#: ../mail/e-mail-reader.c:2430
+msgid "Create a Search Folder from S_ubject..."
+msgstr "Create a Search Folder from S_ubject…"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up…"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2463
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2467
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2471
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2475
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2479
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2527
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2529
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2535
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2537
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:2712
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "Retrieving message '%s'"
+#: ../mail/e-mail-reader.c:2868
+msgid "Retrieving message"
+msgstr "Retrieving message"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:3851
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3852
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3871
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3872
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Reply to the mailing list, or to all recipients"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3962
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4705
 #, c-format
 msgid "Folder '%s'"
 msgstr "Folder '%s'"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr "Do not warn me again"
 
+#: ../mail/e-mail-reader-utils.c:954
+msgid "Printing"
+msgstr "Printing"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:1136
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11948,7 +11810,7 @@ msgstr[1] ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1541
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -11959,12 +11821,21 @@ msgstr[1] "Save Messages"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1562
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
+#: ../mail/e-mail-reader-utils.c:2017
+msgid "Parsing message"
+msgstr "Parsing message"
+
+#: ../mail/e-mail-request.c:152
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "Failed to load part '%s'"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
@@ -11973,7 +11844,7 @@ msgstr "Flag to Follow Up"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1229
+#: ../mail/em-composer-utils.c:1282
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11981,23 +11852,27 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1240
+#: ../mail/em-composer-utils.c:1288
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+#: ../mail/em-composer-utils.c:1293
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2467
+#: ../mail/em-composer-utils.c:2573
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../mail/em-composer-utils.c:2862
+#: ../mail/em-composer-utils.c:2991
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:2863
+#: ../mail/em-composer-utils.c:2992
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:158
 msgid "Select Folder"
 msgstr "Select Folder"
 
@@ -12122,7 +11997,7 @@ msgstr "is not set"
 msgid "is set"
 msgstr "is set"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "Junk"
 
@@ -12171,7 +12046,7 @@ msgid "Play Sound"
 msgstr "Play Sound"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Read"
 
@@ -12247,20 +12122,20 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: ../mail/em-filter-i18n.h:77
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Color"
 msgstr "Unset Colour"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:527
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:558
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -12294,397 +12169,153 @@ msgstr "Folder Properties"
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:389
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:395
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:780
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1606
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
 msgid "Loading..."
 msgstr "Loading…"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Move Folder To"
 msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Copy Folder To"
 msgstr "Copy Folder To"
 
-#: ../mail/em-folder-utils.c:601
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: ../mail/em-folder-utils.c:602
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "Formatting Message…"
-
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Retrieving '%s'"
-
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "Valid signature, but cannot verify sender"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "Signature exists, but need public key"
-
-#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: ../mail/em-format-html.c:2210
-msgid "Unknown external-body part."
-msgstr "Unknown external-body part."
-
-#: ../mail/em-format-html.c:2220
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: ../mail/em-format-html.c:2251
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: ../mail/em-format-html.c:2262
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: ../mail/em-format-html.c:2264
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: ../mail/em-format-html.c:2285
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: ../mail/em-format-html.c:2300
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3008
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "From: %s"
-
-#: ../mail/em-format-html.c:3030
-msgid "(no subject)"
-msgstr "(no subject)"
-
-#: ../mail/em-format-html.c:3106
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "This message was sent by %s on behalf of %s"
-
-#: ../mail/em-format-html-display.c:97
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-
-#: ../mail/em-format-html-display.c:98
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-
-#: ../mail/em-format-html-display.c:108
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-
-#: ../mail/em-format-html-display.c:109
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-
-#: ../mail/em-format-html-display.c:110
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-
-#: ../mail/em-format-html-display.c:111
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
-msgid "_View Certificate"
-msgstr "_View Certificate"
-
-#: ../mail/em-format-html-display.c:274
-msgid "This certificate is not viewable"
-msgstr "This certificate is not viewable"
-
-#: ../mail/em-format-html-display.c:589
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution cannot render this e-mail as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "Save Image"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "Save _Image…"
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "Save the image to a file"
-
-#: ../mail/em-format-html-display.c:1024
-msgid "Completed on"
-msgstr "Completed on"
-
-#: ../mail/em-format-html-display.c:1036
-msgid "Overdue:"
-msgstr "Overdue:"
-
-#: ../mail/em-format-html-display.c:1044
-msgid "by"
-msgstr "by"
-
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
-msgid "View _Unformatted"
-msgstr "View _Unformatted"
-
-#: ../mail/em-format-html-display.c:1327
-msgid "Hide _Unformatted"
-msgstr "Hide _Unformatted"
-
-#: ../mail/em-format-html-display.c:1398
-msgid "O_pen With"
-msgstr "O_pen With"
-
-#. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
-msgctxt "Button"
-msgid "Attachment"
-msgstr "Attachment"
-
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "Page %d of %d"
-
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "No HTML stream available"
-
-#: ../mail/em-subscription-editor.c:870
+#: ../mail/em-subscription-editor.c:869
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../mail/em-subscription-editor.c:879
+#: ../mail/em-subscription-editor.c:878
 msgid "Su_bscribe To Shown"
 msgstr "Su_bscribe To Shown"
 
-#: ../mail/em-subscription-editor.c:887
+#: ../mail/em-subscription-editor.c:886
 msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../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/em-subscription-editor.c:996
+#: ../mail/em-subscription-editor.c:995
 msgid "Unsu_bscribe From Hidden"
 msgstr "Unsu_bscribe From Hidden"
 
-#: ../mail/em-subscription-editor.c:1004
+#: ../mail/em-subscription-editor.c:1003
 msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1682
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/em-subscription-editor.c:1715
+#: ../mail/em-subscription-editor.c:1722
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../mail/em-subscription-editor.c:1730
+#: ../mail/em-subscription-editor.c:1737
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../mail/em-subscription-editor.c:1748
+#: ../mail/em-subscription-editor.c:1755
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../mail/em-subscription-editor.c:1793
+#: ../mail/em-subscription-editor.c:1800
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../mail/em-subscription-editor.c:1794
+#: ../mail/em-subscription-editor.c:1801
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../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/em-subscription-editor.c:1879
+#: ../mail/em-subscription-editor.c:1886
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../mail/em-subscription-editor.c:1880
+#: ../mail/em-subscription-editor.c:1887
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../mail/em-subscription-editor.c:1890
+#: ../mail/em-subscription-editor.c:1897
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../mail/em-subscription-editor.c:1891
+#: ../mail/em-subscription-editor.c:1898
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../mail/em-subscription-editor.c:1901
+#: ../mail/em-subscription-editor.c:1908
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../mail/em-subscription-editor.c:1913
+#: ../mail/em-subscription-editor.c:1920
 msgid "Stop the current operation"
 msgstr "Stop the current operation"
 
@@ -12692,23 +12323,23 @@ msgstr "Stop the current operation"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:110
+#: ../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/em-utils.c:166
+#: ../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/em-utils.c:318
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:979
+#: ../mail/em-utils.c:1067
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -12717,420 +12348,89 @@ msgstr "Messages from %s"
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-editor-rule.c:339
+#: ../mail/em-vfolder-editor-rule.c:391
 msgid "Add Folder"
 msgstr "Add Folder"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr "Digitally sign messages when original message signed (PGP or S/MIME)"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Composer Window default width"
-msgstr "Composer Window default width"
-
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default width of the Composer Window."
-msgstr "Default width of the Composer Window."
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Composer Window default height"
-msgstr "Composer Window default height"
-
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default height of the Composer Window."
-msgstr "Default height of the Composer Window."
-
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid "Attribute message."
-msgstr "Attribute message."
-
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Forward message."
-msgstr "Forward message."
-
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Original message."
-msgstr "Original message."
-
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr "Whether to show local folders (On This Computer) in a folder tree."
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mail browser width"
-msgstr "Mail browser width"
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Default width of the mail browser window."
-msgstr "Default width of the mail browser window."
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mail browser height"
-msgstr "Mail browser height"
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Default height of the mail browser window."
-msgstr "Default height of the mail browser window."
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Mail browser maximized"
-msgstr "Mail browser maximised"
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Default maximized state of the mail browser window."
-msgstr "Default maximised state of the mail browser window."
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "\"Folder Subscriptions\" window height"
-msgstr "\"Folder Subscriptions\" window height"
-
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "\"Folder Subscriptions\" window maximise state"
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximised. This key exists only as an implementation detail."
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "\"Folder Subscriptions\" window width"
-msgstr "\"Folder Subscriptions\" window width"
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Default reply style"
-msgstr "Default reply style"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"Possible values are: never — to never close browser window; always — to "
-"always close browser window; ask — (or any other value) will ask user"
-
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid "List of accounts"
-msgstr "List of accounts"
-
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "List of accepted licenses"
-msgstr "List of accepted licences"
-
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "List of protocol names whose license has been accepted."
-msgstr "List of protocol names whose licence has been accepted."
-
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "\"Filter Editor\" window height"
-msgstr "\"Filter Editor\" window height"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "\"Filter Editor\" window maximize state"
-msgstr "\"Filter Editor\" window maximise state"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Filter Editor\" window. The value updates "
-"when the user maximises or unmaximises the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximised. This key exists only as an implementation detail."
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "\"Filter Editor\" window width"
-msgstr "\"Filter Editor\" window width"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"Whether to check for new messages when Evolution is started. This includes "
-"also sending messages from the Outbox."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Whether to check for new messages in all active accounts regardless of the "
-"account's \"Check for new messages every X minutes\" option when Evolution "
-"is started. This option is used only together with 'send_recv_on_start' "
-"option."
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "\"Send and Receive Mail\" window height"
-msgstr "\"Send and Receive Mail\" window height"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"Send and Receive Mail\" window maximise state"
-
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Initial maximise state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximised. This key exists only as an implementation "
-"detail."
-
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "\"Send and Receive Mail\" window width"
-msgstr "\"Send and Receive Mail\" window width"
-
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "\"Search Folder Editor\" window height"
-msgstr "\"Search Folder Editor\" window height"
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"Search Folder Editor\" window maximise state"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Initial maximise state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximised. This key exists only as an implementation detail."
+#: ../mail/em-vfolder-editor-rule.c:517
+msgid "Search Folder Sources"
+msgstr "Search Folder Sources"
 
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "\"Search Folder Editor\" window width"
-msgstr "\"Search Folder Editor\" window width"
+#: ../mail/em-vfolder-editor-rule.c:549
+msgid "Automatically update on any _source folder change"
+msgstr "Automatically update on any _source folder change"
 
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
+#: ../mail/em-vfolder-editor-rule.c:561
+msgid "All local folders"
+msgstr "All local folders"
 
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Drag'n'drop export format"
-msgstr "Drag'n'drop export format"
+#: ../mail/em-vfolder-editor-rule.c:562
+msgid "All active remote folders"
+msgstr "All active remote folders"
 
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are "
-"mbox or pdf"
-msgstr ""
-"Define the email export format when doing drag'n'drop. Possible values are "
-"mbox or pdf"
+#: ../mail/em-vfolder-editor-rule.c:563
+msgid "All local and active remote folders"
+msgstr "All local and active remote folders"
 
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid "Format of the drag'n'drop export filename"
-msgstr "Format of the drag'n'drop export filename"
+#: ../mail/em-vfolder-editor-rule.c:564
+msgid "Specific folders"
+msgstr "Specific folders"
 
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid ""
-"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
-"email sent date), 2 (: drag'n'drop date)"
-msgstr ""
-"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
-"email sent date), 2 (: drag'n'drop date)"
+#: ../mail/em-vfolder-editor-rule.c:602
+msgid "include subfolders"
+msgstr "include subfolders"
 
-#: ../mail/importers/elm-importer.c:181
+#: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1042
+#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
+#: ../modules/mail/e-mail-shell-view.c:1074
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "Mail"
 
-#: ../mail/importers/elm-importer.c:400
+#: ../mail/importers/elm-importer.c:379
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:401
+#: ../mail/importers/elm-importer.c:380
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/dbx-import/dbx-importer.c:255
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
 #: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:557
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "Select folder"
 msgstr "Select folder"
 
 #: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../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/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:439
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Subject"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:444
 msgctxt "mboxImp"
 msgid "From"
 msgstr "From"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:488
 #: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:489
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
@@ -13140,8 +12440,8 @@ msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:621
-#: ../plugins/pst-import/pst-importer.c:770
+#: ../plugins/dbx-import/dbx-importer.c:616
+#: ../plugins/pst-import/pst-importer.c:784
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importing '%s'"
@@ -13151,20 +12451,19 @@ msgstr "Importing '%s'"
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:251
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
+#: ../mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
@@ -13235,92 +12534,74 @@ msgid "Header content"
 msgstr "Header content"
 
 #: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "_Add Signature"
-
-#: ../mail/mail-config.ui.h:6
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"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/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "_Script:"
-
-#: ../mail/mail-config.ui.h:11
 msgid "Default Behavior"
 msgstr "Default Behaviour"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:6
 msgid "For_mat messages in HTML"
 msgstr "For_mat messages in HTML"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:9
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Encode filenames in an _Outlook/GMail way"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:10
 msgid "Ch_aracter encoding:"
 msgstr "Ch_aracter encoding:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
 msgstr "Replies and Forwards"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.ui.h:21
+#: ../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/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_nore Reply-To: for mailing lists"
 
-#: ../mail/mail-config.ui.h:23
+#: ../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/mail-config.ui.h:24
+#: ../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:26
+#: ../mail/mail-config.ui.h:20
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:21
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:22
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:23
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13328,28 +12609,28 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:24
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:27
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:29
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:30
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -13358,575 +12639,291 @@ msgstr ""
 "before taking the following checkmarked actions:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:32
 msgid "Sending a message with an _empty subject line"
 msgstr "Sending a message with an _empty subject line"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:34
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Sending a message with only _Bcc recipients defined"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../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"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../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"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../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"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../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/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:43
 msgid "Confirmations"
 msgstr "Confirmations"
 
-#: ../mail/mail-config.ui.h:52
-msgid "SHA1"
-msgstr "SHA1"
-
-#: ../mail/mail-config.ui.h:53
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:54
-msgid "SHA384"
-msgstr "SHA384"
-
-#: ../mail/mail-config.ui.h:55
-msgid "SHA512"
-msgstr "SHA512"
-
-#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Inline (Outlook style)"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "Do not quote"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:55
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Inline"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Proxy Settings"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:58
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:59
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:60
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:61
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "SOC_KS Proxy:"
 msgstr "SOC_KS Proxy:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "No _Proxy for:"
 msgstr "No _Proxy for:"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "Start up"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:69
 msgid "Check for new _messages on start"
 msgstr "Check for new _messages on start"
 
-#: ../mail/mail-config.ui.h:77
+#: ../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/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Fix_ed Width Font:"
 msgstr "Fix_ed Width Font:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:77
+msgid "_Mark messages as read after"
+msgstr "_Mark messages as read after"
+
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:81
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../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/mail-config.ui.h:88
+#: ../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/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:88
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../mail/mail-config.ui.h:94
+#: ../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/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr "Loading Images"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:92
 msgid "_Load images only in messages from contacts"
 msgstr "_Load images only in messages from contacts"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "Sender Photograph"
 
-#: ../mail/mail-config.ui.h:102
+#: ../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/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:100
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
+#: ../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/mail-config.ui.h:107
-msgid "Headers"
-msgstr "Headers"
-
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:103
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:104
 msgid "Delete junk messages on e_xit"
 msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.ui.h:111
+#: ../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/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:107
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:108
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+#: ../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/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
-#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Special Folders"
-msgstr "Special Folders"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "Drafts _Folder:"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "Sent _Messages Folder:"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "Wastebaske_t Folder:"
-
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "_Junk Folder:"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "Composing Messages"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Always _blind carbon-copy (bcc) to:"
-
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Alway_s carbon-copy (cc) to:"
-
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "Message Receipts"
-
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "S_end message receipts:"
-
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "Account Information"
-
-#: ../mail/mail-config.ui.h:129
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "Required Information"
-
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "E-mail _Address:"
-
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "Full Nam_e:"
-
-#: ../mail/mail-config.ui.h:134
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "Optional Information"
-
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "Signat_ure:"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "Add Ne_w Signature…"
-
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "Or_ganisation:"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Re_ply-To:"
-msgstr "Re_ply-To:"
-
-#: ../mail/mail-config.ui.h:139
-msgid "_Make this my default account"
-msgstr "_Make this my default account"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "_Do not sign meeting requests (for Outlook compatibility)"
-
-#: ../mail/mail-config.ui.h:141
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: ../mail/mail-config.ui.h:142
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG _Key ID:"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "Si_gning algorithm:"
-
-#: ../mail/mail-config.ui.h:144
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "Al_ways sign outgoing messages when using this account"
-
-#: ../mail/mail-config.ui.h:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Always encrypt to _myself when sending encrypted messages"
-
-#: ../mail/mail-config.ui.h:146
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Always _trust keys in my keyring when encrypting"
-
-#: ../mail/mail-config.ui.h:147
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
-
-#: ../mail/mail-config.ui.h:148
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "Also encrypt to sel_f when sending encrypted messages"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "Encrypt out_going messages (by default)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Digitally sign o_utgoing messages (by default)"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Encry_ption certificate:"
-msgstr "Encry_ption certificate:"
-
-#: ../mail/mail-config.ui.h:152
-msgid "Sig_ning certificate:"
-msgstr "Sig_ning certificate:"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "S_elect…"
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "Clea_r"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "Signing _algorithm:"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "Cle_ar"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "Server _Type:"
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "description"
-
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../mail/mail-config.ui.h:162
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:250
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
-msgid "User_name:"
-msgstr "User_name:"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "Mailbox location"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "_Use secure connection:"
-
-#: ../mail/mail-config.ui.h:168
-msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL is not supported in this build of Evolution"
-
-#: ../mail/mail-config.ui.h:169
-msgid "_Authentication Type"
-msgstr "_Authentication Type"
-
-#: ../mail/mail-config.ui.h:170
-msgid "Ch_eck for Supported Types"
-msgstr "Ch_eck for Supported Types"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "Re_member password"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "Server Configuration"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "Ser_ver requires authentication"
-
-#: ../mail/mail-config.ui.h:175
-#: ../modules/addressbook/addressbook-config.c:1122
-msgid "Authentication"
-msgstr "Authentication"
-
-#: ../mail/mail-config.ui.h:176
-msgid "T_ype:"
-msgstr "T_ype:"
-
-#: ../mail/mail-config.ui.h:177
-msgid "User _Name:"
-msgstr "User_name:"
-
-#: ../mail/mail-config.ui.h:178
-msgid "Remember _password"
-msgstr "Remember _password"
-
-#: ../mail/mail-config.ui.h:179
-msgid "Personal Details:"
-msgstr "Personal Details:"
-
-#: ../mail/mail-config.ui.h:188
-msgid "Encryption:"
-msgstr "Encryption:"
-
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "none"
-
-#: ../mail/mail-config.ui.h:190
-msgid "label"
-msgstr "label"
-
 #: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "Search Folder Sources"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "All local folders"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "All active remote folders"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "All local and active remote folders"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "Specific folders"
-
-#: ../mail/mail-dialogs.ui.h:6
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13934,72 +12931,72 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "_Due By:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
 msgstr "Review"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "Digital Signature"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "Encryption"
 
@@ -14204,7 +13201,7 @@ msgstr ""
 "folders?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
@@ -14288,14 +13285,22 @@ msgstr ""
 "be renamed, moved, or deleted."
 
 #: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "Failed to expunge folder &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "Failed to refresh folder &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:61
+#: ../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/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -14303,21 +13308,21 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "Really delete folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../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/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "These messages are not copies."
 
-#: ../mail/mail.error.xml.h:67
+#: ../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 "
@@ -14327,63 +13332,63 @@ msgstr ""
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:69
+#: ../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/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "Cannot create folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "Cannot open source \"{1}\"."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:77
+#: ../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/mail.error.xml.h:78
+#: ../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/mail.error.xml.h:79
+#: ../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/mail.error.xml.h:80
+#: ../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/mail.error.xml.h:81
+#: ../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/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14391,54 +13396,30 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:84
+#: ../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/mail.error.xml.h:85
+#: ../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/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "Do _Not Disable"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:626
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Could not save signature file."
-msgstr "Could not save signature file."
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Cannot set signature script \"{0}\"."
-
-#: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "The script file must exist and be executable."
-
 #: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "_Discard changes"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
 
-#: ../mail/mail.error.xml.h:95
+#: ../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."
@@ -14446,39 +13427,39 @@ msgstr ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:98
+#: ../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/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#: ../mail/mail.error.xml.h:106
+#: ../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 "
@@ -14488,11 +13469,11 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14504,23 +13485,23 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr "Evolution's local mail format has changed."
 
-#: ../mail/mail.error.xml.h:116
+#: ../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 "
@@ -14538,19 +13519,19 @@ msgstr ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "_Exit Evolution"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "_Migrate Now"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:122
+#: ../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."
@@ -14558,35 +13539,25 @@ msgstr ""
 "Cannot read the licence file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its licence."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:124
+#: ../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/mail.error.xml.h:125
+#: ../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."
 
-#  mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:126
-msgid "Unable to connect to the GroupWise server."
-msgstr "Unable to connect to the GroupWise server."
-
-#  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:127
-msgid "Please check your account settings and try again."
-msgstr "Please check your account settings and try again."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronise folders locally for offline usage?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14594,23 +13565,23 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
 msgstr "Do _Not Synchronise"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:126
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../mail/mail.error.xml.h:132
+#: ../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/mail.error.xml.h:133
+#: ../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/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14618,51 +13589,47 @@ msgstr ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:130
 msgid "Close message window."
 msgstr "Close message window."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:131
 msgid "Would you like to close the message window?"
 msgstr "Would you like to close the message window?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:132
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:133
 msgid "_No"
 msgstr "_No"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:134
 msgid "_Always"
 msgstr "_Always"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:135
 msgid "N_ever"
 msgstr "N_ever"
 
-#: ../mail/mail.error.xml.h:141
-msgid "Signature Already Exists"
-msgstr "Signature Already Exists"
+#: ../mail/mail.error.xml.h:136
+msgid "Copy folder in folder tree."
+msgstr "Copy folder in folder tree."
 
-#: ../mail/mail.error.xml.h:142
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+#: ../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/mail.error.xml.h:143
-msgid "Blank Signature"
-msgstr "Blank Signature"
+#: ../mail/mail.error.xml.h:138
+msgid "Move folder in folder tree."
+msgstr "Move folder in folder tree."
 
-#: ../mail/mail.error.xml.h:144
-msgid "Please provide an unique name to identify this signature."
-msgstr "Please provide an unique name to identify this signature."
+#: ../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/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:140
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14671,84 +13638,88 @@ msgstr ""
 "not enabled"
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:146
+#: ../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/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:142
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:148
+#: ../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/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:144
 msgid "\"Check Junk\" Failed"
 msgstr "\"Check Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Junk\" Failed"
 msgstr "\"Report Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:146
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"Report Not Junk\" Failed"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:147
 msgid "Remove duplicate messages?"
 msgstr "Remove duplicate messages?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:148
 msgid "No duplicate messages found."
 msgstr "No duplicate messages found."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../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/mail.error.xml.h:156
-msgid "Failed to unsubscribe from folder."
-msgstr "Failed to unsubscribe from folder."
+#: ../mail/mail.error.xml.h:151
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "Failed to disconnect account &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:158
+#: ../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/mail.error.xml.h:154
 msgid "Unable to retrieve message."
 msgstr "Unable to retrieve message."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:155
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to open folder."
 msgstr "Failed to open folder."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to find duplicate messages."
 msgstr "Failed to find duplicate messages."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
 msgstr "Failed to retrieve messages."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
 msgstr "Failed to remove attachments from messages."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to download messages for offline viewing."
 msgstr "Failed to download messages for offline viewing."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to save messages to disk."
 msgstr "Failed to save messages to disk."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:162
 msgid "Hidden file is attached."
 msgstr "Hidden file is attached."
 
-#: ../mail/mail.error.xml.h:167
+#: ../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."
@@ -14756,132 +13727,152 @@ msgstr ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:164
+msgid "Printing failed."
+msgstr "Printing failed."
+
+#: ../mail/mail.error.xml.h:165
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "The printer replied &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:166
+msgid "Could not perform this operation on {0}."
+msgstr "Could not perform this operation on {0}."
+
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "Cancelling…"
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "Updating…"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "Waiting…"
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "Search Folders"
+
 #: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1262
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1263
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1264
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1265
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1266
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1267
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1271
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1272
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1276
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1277
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1916
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1928
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1936
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1938
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2769
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Messages"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4132
 msgid "Follow-up"
 msgstr "Follow-up"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4638 ../mail/message-list.c:5058
+#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4875
+#: ../mail/message-list.c:4868
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"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. Either clear search with Search → "
-"Clear menu item or change it."
+"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/message-list.c:4877
+#: ../mail/message-list.c:4873
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -14893,11 +13884,6 @@ msgstr "Flagged"
 msgid "Received"
 msgstr "Received"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "Size"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Flag Status"
@@ -14923,504 +13909,383 @@ msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Body contains"
 msgstr "Body contains"
 
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "U_se in Birthday & Anniversaries calendar"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr "Copy _book content locally for offline operation"
-
-#: ../modules/addressbook/addressbook-config.c:812
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-
-#: ../modules/addressbook/addressbook-config.c:898
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
-"server."
-
-#: ../modules/addressbook/addressbook-config.c:987
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "Server Information"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Details"
-
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Searching"
-
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "Downloading"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "New Address Book"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML for the list of completion URIs"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML for the list of completion URIs."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show maps in preview pane."
-msgstr "Whether to show maps in preview pane."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-msgstr ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Table column:"
 msgstr "_Table column:"
 
-#: ../modules/addressbook/autocompletion-config.c:197
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "Address formatting"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../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"
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "Always _show address of the autocompleted contact"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "Multiple vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
 #, c-format
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:197
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "On LDAP Servers"
+#: ../modules/addressbook/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:309
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../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:316
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../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:326
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../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"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-view.c:356
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgid "Certificates"
 msgstr "Certificates"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:204
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../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…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "Co_py All Contacts To..."
 msgstr "Co_py All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "D_elete Address Book"
 msgstr "D_elete Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ve All Contacts To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Address _Book Properties"
 msgstr "Address _Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Address Book _Map"
 msgstr "Address Book _Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../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…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "Rename the selected address book"
 msgstr "Rename the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Stop loading"
 msgstr "Stop loading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "_Copy Contact To..."
 msgstr "_Copy Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "_Find in Contact..."
 msgstr "_Find in Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "_Forward Contact..."
 msgstr "_Forward Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "_Move Contact To..."
 msgstr "_Move Contact To…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "_New Contact..."
 msgstr "_New Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "New Contact _List..."
 msgstr "New Contact _List…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "_Open Contact"
 msgstr "_Open Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contact…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Address Book Map"
 msgstr "Address Book Map"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Contact _Preview"
 msgstr "Contact _Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Show _Maps"
 msgstr "Show _Maps"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Show maps in contact preview window"
 msgstr "Show maps in contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../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"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1084
 msgid "Print all shown contacts"
 msgstr "Print all shown contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1091
 msgid "Preview the contacts to be printed"
 msgstr "Preview the contacts to be printed"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1098
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "S_ave Address Book as vCard"
 msgstr "S_ave Address Book as vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../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"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../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…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
 msgid "Save selected contacts as a vCard"
 msgstr "Save selected contacts as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:300
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:302
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:333
 msgid "_Send Message to Contacts"
 msgstr "_Send Message to Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:335
 msgid "_Send Message to List"
 msgstr "_Send Message to List"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:337
 msgid "_Send Message to Contact"
 msgstr "_Send Message to Contact"
 
@@ -15429,10 +14294,12 @@ msgid "Anonymously"
 msgstr "Anonymously"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Using e-mail address"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
@@ -15450,6 +14317,12 @@ msgstr "Sub"
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
+#: ../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:"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Ser_ver:"
 msgstr "Ser_ver:"
@@ -15505,6 +14378,7 @@ msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "contacts"
 msgstr "contacts"
 
@@ -15521,371 +14395,509 @@ msgstr "_Download limit:"
 msgid "B_rowse this book until limit reached"
 msgstr "B_rowse this book until limit reached"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+msgid "Audio Player"
+msgstr "Audio Player"
+
+#: ../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"
+
+#: ../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."
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+msgid "_Restore from a backup file:"
+msgstr "_Restore from a backup file:"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+msgid "Choose a backup file to restore"
+msgstr "Choose a backup file to restore"
+
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+msgid "Restore from Backup"
+msgstr "Restore from Backup"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Select name of the Evolution backup file"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Restart Evolution after backup"
+
+#: ../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"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Restart Evolution after restore"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "_Back up Evolution Data…"
+
+#: ../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…"
+
+#: ../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"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "Back up Evolution directory"
+msgstr "Back up Evolution directory"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:85
+msgid "Restore Evolution directory"
+msgstr "Restore Evolution directory"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:87
+msgid "Check Evolution Back up"
+msgstr "Check Evolution Backup"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:89
+msgid "Restart Evolution"
+msgstr "Restart Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:91
+msgid "With Graphical User Interface"
+msgstr "With Graphical User Interface"
+
+#. 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"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:324
+msgid "Backing Evolution accounts and settings"
+msgstr "Backing up Evolution accounts and settings"
+
+#: ../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)"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:357
+msgid "Back up complete"
+msgstr "Backup complete"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
+msgid "Restarting Evolution"
+msgstr "Restarting Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:475
+msgid "Back up current Evolution data"
+msgstr "Back up current Evolution data"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:483
+msgid "Extracting files from back up"
+msgstr "Extracting files from backup"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:570
+msgid "Loading Evolution settings"
+msgstr "Loading Evolution settings"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:624
+msgid "Removing temporary back up files"
+msgstr "Removing temporary backup files"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:636
+msgid "Reloading registry service"
+msgstr "Reloading registry service"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:861
+msgid "Evolution Back Up"
+msgstr "Evolution Back Up"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:862
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Backing up to the folder %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:866
+msgid "Evolution Restore"
+msgstr "Evolution Restore"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:867
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Restoring from the folder %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:935
+msgid "Backing up Evolution Data"
+msgstr "Backing up Evolution Data"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:936
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Please wait while Evolution backs up your data."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:938
+msgid "Restoring Evolution Data"
+msgstr "Restoring Evolution Data"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:939
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Please wait while Evolution restores your data."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:957
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "This may take a while depending on the amount of data in your account."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "Invalid Evolution backup file"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "Please select a valid backup file to restore."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Are you sure you want to close Evolution?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+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/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Close and Back Up Evolution"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+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/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Close and Restore Evolution"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Insufficient Permissions"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "The selected folder is not writable."
+
+#: ../modules/bogofilter/evolution-bogofilter.c:149
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Failed to spawn Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:167
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Failed to stream mail message content to Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:216
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter either crashed or failed to process a mail message"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
+#: ../modules/bogofilter/evolution-bogofilter.c:318
 msgid "Bogofilter Options"
 msgstr "Bogofilter Options"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
+#: ../modules/bogofilter/evolution-bogofilter.c:327
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
+#: ../modules/bogofilter/evolution-bogofilter.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+msgid "Standard LDAP Port"
+msgstr "Standard LDAP Port"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+msgid "LDAP over SSL (deprecated)"
+msgstr "LDAP over SSL (deprecated)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "Use the system timezone instead of the timezone selected in Evolution."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr "Microsoft Global Catalogue"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr "Microsoft Global Catalogue over SSL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr "List of recently used second time zones in a Day View."
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+msgid "Connecting to LDAP"
+msgstr "Connecting to LDAP"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr "Maximum number of recently used timezones to remember."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "Server Information"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+msgid "StartTLS (recommended)"
+msgstr "StartTLS (recommended)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+msgid "Encryption:"
+msgstr "Encryption:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Vertical pane position"
-msgstr "Vertical pane position"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+msgid "Authentication"
+msgstr "Authentication"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+msgid "Anonymous"
+msgstr "Anonymous"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+msgid "Method:"
+msgstr "Method:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+"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 ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+"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/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr "Using LDAP"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:116
+msgid "Searching"
+msgstr "Searching"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "If \"true\", show the memo preview pane in the main window."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+msgid "Search Base:"
+msgstr "Search Base:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Position of the task preview pane when oriented horizontally."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "Find Possible Search Bases"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Position of the memo preview pane when oriented vertically."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+msgid "One Level"
+msgstr "One Level"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "If \"true\", show the task preview pane in the main window."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+msgid "Subtree"
+msgstr "Subtree"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "Position of the task preview pane when oriented vertically."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+msgid "Search Scope:"
+msgstr "Search Scope:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+"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 ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+"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/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "Whether to display the end time of events in the week and month views."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+msgid "Search Filter:"
+msgstr "Search Filter:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Days on which the start and end of work hours should be indicated."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "Downloading"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+msgid "Limit:"
+msgstr "Limit:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Colour to draw the Marcus Bains line in the Day View."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+msgid "Browse until limit is reached"
+msgstr "Browse until limit is reached"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr ""
-"Show days with recurrent events in italic font in bottom left calendar."
+#: ../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)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
-msgstr ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP Error: %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
-msgstr ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+msgid "Could not parse response"
+msgstr "Could not parse response"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Whether to hide completed tasks in the tasks view."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+msgid "Empty response"
+msgstr "Empty response"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+msgid "Unexpected reply from server"
+msgstr "Unexpected reply from server"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
-msgid "Number of units for determining when to hide tasks."
-msgstr "Number of units for determining when to hide tasks."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+msgid "Could not locate user's calendars"
+msgstr "Could not locate user's calendars"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+msgid "Path"
+msgstr "Path"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
+#: ../modules/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/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Whether to ask for confirmation when deleting an appointment or task."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "Choose a Memo List"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "Choose a Task List"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Whether to set a default reminder for appointments."
-msgstr "Whether to set a default reminder for appointments."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+msgid "Find Calendars"
+msgstr "Find Calendars"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Number of units for determining a default reminder."
-msgstr "Number of units for determining a default reminder."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+msgid "Find Memo Lists"
+msgstr "Find Memo Lists"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+msgid "Find Task Lists"
+msgstr "Find Task Lists"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Whether to set a reminder for birthdays and anniversaries."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
+msgid "Path:"
+msgstr "Path:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "Number of units for determining a birthday or anniversary reminder."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+msgid "Email:"
+msgstr "E-mail:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
-"Units for a birthday or anniversary reminder: \"minutes\", \"hours\" or "
-"\"days\"."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+msgid "Server handles meeting invitations"
+msgstr "Server handles meeting invitations"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "Whether to show week numbers in various places in the Calendar."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+msgid "Choose which address books to use."
+msgstr "Choose which address books to use."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Scroll Month View by a week"
-msgstr "Scroll Month View by a week"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "Use in Birthdays & Anniversaries calendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "Whether to scroll a Month View by a week, not by a month."
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+msgid "Default User Calendar"
+msgstr "Default User Calendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Time the last reminder ran, in time_t."
-msgstr "Time the last reminder ran, in time_t."
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, c-format
+msgid "Enter Google password for user '%s'."
+msgstr "Enter Google password for user '%s'."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Calendars to run reminders for"
-msgstr "Calendars to run reminders for"
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "User declined to provide a password"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programs that are allowed to be run by reminders."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr "Use an existing iCalendar (ics) file"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "Whether or not to use the notification tray for display reminders."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+msgid "iCalendar File"
+msgstr "iCalendar File"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Free/busy server URLs"
-msgstr "Free/busy server URLs"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+msgid "Choose an iCalendar file"
+msgstr "Choose an iCalendar file"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "List of server URLs for free/busy publishing."
-msgstr "List of server URLs for free/busy publishing."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+msgid "File:"
+msgstr "File:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+msgid "Allow Evolution to update the file"
+msgstr "Allow Evolution to update the file"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
-"debug messages."
-
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mport"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "Select a Task List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "I_mport to Tasks"
 
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
-msgstr "Selected Calendars for Reminders"
+#: ../modules/calendar/e-calendar-preferences.c:407
+msgid "Selected Calendars for Alarms"
+msgstr "Selected Calendars for Alarms"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "Ti_me and date:"
 msgstr "Ti_me and date:"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:830
 msgid "_Date only:"
 msgstr "_Date only:"
 
@@ -15951,7 +14963,7 @@ msgid "_24 hour"
 msgstr "_24 hour"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Work Week"
 msgstr "Work Week"
 
@@ -16043,6 +15055,10 @@ msgstr "Sc_roll Month View by a week"
 msgid "Display"
 msgstr "Display"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Task List"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Highlight t_asks due today"
 msgstr "Highlight t_asks due today"
@@ -16100,92 +15116,71 @@ msgstr "%u and %d will be replaced by user and domain from the e-mail address."
 msgid "Publishing Information"
 msgstr "Publishing Information"
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:114
-#: ../modules/calendar/e-memo-shell-migrate.c:155
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "On The Web"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "Weather"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "Birthdays & Anniversaries"
-
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:192
+msgid "New Calendar"
+msgstr "New Calendar"
+
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:475
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-backend.c:800
+#: ../modules/calendar/e-cal-shell-backend.c:627
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:211
 msgid "Loading calendars"
 msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-msgid "_New Calendar..."
-msgstr "_New Calendar…"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
+#: ../modules/calendar/e-cal-shell-sidebar.c:731
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1114
+#: ../modules/calendar/e-cal-shell-sidebar.c:1090
 #, c-format
-msgid "Opening calendar at %s"
-msgstr "Opening calendar at %s"
+msgid "Opening calendar '%s'"
+msgstr "Opening calendar '%s'"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-msgid "Print"
-msgstr "Print"
+#: ../modules/calendar/e-cal-shell-view-actions.c:292
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 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 "
@@ -16197,543 +15192,609 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:340
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:591
 msgid "Copying Items"
 msgstr "Copying Items"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:885
 msgid "Moving Items"
 msgstr "Moving Items"
 
 #. 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:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1218
 msgid "event"
 msgstr "event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "_Copy..."
 msgstr "_Copy…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+msgid "Find _next"
+msgstr "Find _next"
+
+#: ../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"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+msgid "Find _previous"
+msgstr "Find _previous"
+
+#: ../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"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+msgid "Stop _running search"
+msgstr "Stop _running search"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+msgid "Stop currently running search"
+msgstr "Stop currently running search"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New All Day _Event..."
 msgstr "New All Day _Event…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../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…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "New _Meeting..."
 msgstr "New _Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
 msgid "New _Appointment..."
 msgstr "New _Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointment…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Quit"
 msgstr "Quit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1722
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1729
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1736
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1774
 msgid "Occurs Less Than 5 Times"
 msgstr "Occurs Less Than 5 Times"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../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…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1930
 msgid "Go To"
 msgstr "Go To"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:547
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../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"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1477
+msgid "Searching next matching event"
+msgstr "Searching next matching event"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
+msgid "Searching previous matching event"
+msgstr "Searching previous matching event"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] "Cannot find matching event in the next %d year"
+msgstr[1] "Cannot find matching event in the next %d years"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1503
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] "Cannot find matching event in the previous %d year"
+msgstr[1] "Cannot find matching event in the previous %d years"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1528
+msgid "Cannot search with no active calendar"
+msgstr "Cannot search with no active calendar"
+
 #. 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:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:664
 msgid "task"
 msgstr "task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../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"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../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"
 
-#: ../modules/calendar/e-memo-shell-backend.c:308
+#: ../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"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:219
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../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/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:206
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:703
+#: ../modules/calendar/e-memo-shell-sidebar.c:663
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1001
+#: ../modules/calendar/e-memo-shell-sidebar.c:975
 #, c-format
-msgid "Opening memos at %s"
-msgstr "Opening memos at %s"
+msgid "Opening memo list '%s'"
+msgstr "Opening memo list '%s'"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../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/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:289
+msgid "Memo List Properties"
+msgstr "Memo List Properties"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "_Find in Memo..."
 msgstr "_Find in Memo…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../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/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:753
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../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/calendar/e-memo-shell-view-actions.c:756
+#: ../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/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../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/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:236
 msgid "Delete Memos"
 msgstr "Delete Memos"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memo"
 msgstr "Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../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/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../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/calendar/e-task-shell-backend.c:303
+#: ../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/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../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/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:206
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:703
+#: ../modules/calendar/e-task-shell-sidebar.c:663
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1002
+#: ../modules/calendar/e-task-shell-sidebar.c:975
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "Opening tasks at %s"
+msgid "Opening task list '%s'"
+msgstr "Opening task list '%s'"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../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/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:312
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: ../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"
@@ -16745,586 +15806,1453 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "_Find in Task..."
 msgstr "_Find in Task…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../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/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Copy..."
 msgstr "Copy…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:840
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:917
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../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/calendar/e-task-shell-view-actions.c:920
+#: ../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/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1038
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../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/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:371
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Task"
 msgstr "Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-private.c:498
+#: ../modules/calendar/e-task-shell-view-private.c:502
 msgid "Expunging"
 msgstr "Expunging"
 
-#: ../modules/calendar/e-task-shell-view-private.c:605
+#: ../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/mail/e-mail-attachment-handler.c:389
+#: ../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"
+
+#: ../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/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "_Fetch All Headers"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+msgid "_Basic Headers (fastest)"
+msgstr "_Basic Headers (fastest)"
+
+#: ../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/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/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "Custom Headers"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+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."
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:139
+msgid "ITIP"
+msgstr "ITIP"
+
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
+msgid "Display part as an invitation"
+msgstr "Display part as an invitation"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:240
+msgid "Today %H:%M"
+msgstr "Today %H:%M"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:300
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:305
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:314
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:318
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:327
+msgid "%A, %B %e"
+msgstr "%A %e %B"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:333
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:337
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:342
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:346
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:352
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:357
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e %B, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:361
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e %B, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:366
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e %B, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:370
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
+
+#: ../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/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/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/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/itip-formatter/itip-view.c:422
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%s has published the following meeting information:"
+
+#: ../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/itip-formatter/itip-view.c:430
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s through %s requests your presence at the following meeting:"
+
+#: ../modules/itip-formatter/itip-view.c:432
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s requests your presence at the following meeting:"
+
+#: ../modules/itip-formatter/itip-view.c: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/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/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/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/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/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/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/itip-formatter/itip-view.c:458
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "%s has cancelled the following meeting:"
+
+#: ../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/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/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/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/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/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%s has published the following task:"
+
+#: ../modules/itip-formatter/itip-view.c:517
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s requests the assignment of %s to the following task:"
+
+#: ../modules/itip-formatter/itip-view.c:520
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "%s through %s has assigned you a task:"
+
+#: ../modules/itip-formatter/itip-view.c:522
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%s has assigned you a task:"
+
+#: ../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/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/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/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/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/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/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/itip-formatter/itip-view.c:548
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%s has cancelled the following assigned task:"
+
+#: ../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/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/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/itip-formatter/itip-view.c:601
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s has published the following memo:"
+
+#: ../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/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/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/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/itip-formatter/itip-view.c:687
+msgid "All day:"
+msgstr "All day:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+msgid "Start day:"
+msgstr "Start day:"
+
+#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:1461
+msgid "Start time:"
+msgstr "Start time:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+msgid "End day:"
+msgstr "End day:"
+
+#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:1462
+msgid "End time:"
+msgstr "End time:"
+
+#: ../modules/itip-formatter/itip-view.c:1010
+msgid "_Open Calendar"
+msgstr "_Open Calendar"
+
+#: ../modules/itip-formatter/itip-view.c:1013
+msgid "_Decline all"
+msgstr "_Decline all"
+
+#: ../modules/itip-formatter/itip-view.c:1016
+msgid "_Decline"
+msgstr "_Decline"
+
+#: ../modules/itip-formatter/itip-view.c:1019
+msgid "_Tentative all"
+msgstr "_Tentative all"
+
+#: ../modules/itip-formatter/itip-view.c:1022
+msgid "_Tentative"
+msgstr "_Tentative"
+
+#: ../modules/itip-formatter/itip-view.c:1025
+msgid "A_ccept all"
+msgstr "A_ccept all"
+
+#: ../modules/itip-formatter/itip-view.c:1028
+msgid "A_ccept"
+msgstr "A_ccept"
+
+#: ../modules/itip-formatter/itip-view.c:1031
+msgid "_Send Information"
+msgstr "_Send Information"
+
+#: ../modules/itip-formatter/itip-view.c:1034
+msgid "_Update Attendee Status"
+msgstr "_Update Attendee Status"
+
+#: ../modules/itip-formatter/itip-view.c:1037
+msgid "_Update"
+msgstr "_Update"
+
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1512
+#: ../modules/itip-formatter/itip-view.c:1581
+msgid "Comment:"
+msgstr "Comment:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1500
+msgid "Send reply to sender"
+msgstr "Send reply to sender"
+
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1515
+msgid "Send _updates to attendees"
+msgstr "Send _updates to attendees"
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1518
+msgid "_Apply to all instances"
+msgstr "_Apply to all instances"
+
+#: ../modules/itip-formatter/itip-view.c:1519
+msgid "Show time as _free"
+msgstr "Show time as _free"
+
+#: ../modules/itip-formatter/itip-view.c:1520
+msgid "_Preserve my reminder"
+msgstr "_Preserve my reminder"
+
+#: ../modules/itip-formatter/itip-view.c:1521
+msgid "_Inherit reminder"
+msgstr "_Inherit reminder"
+
+#: ../modules/itip-formatter/itip-view.c:1845
+msgid "_Tasks:"
+msgstr "_Tasks:"
+
+#: ../modules/itip-formatter/itip-view.c:1848
+msgid "_Memos:"
+msgstr "_Memos:"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../modules/itip-formatter/itip-view.c:3493
+#, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Failed to load the calendar '%s' (%s)"
+
+#: ../modules/itip-formatter/itip-view.c:3652
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "An appointment in the calendar '%s' conflicts with this meeting"
+
+#: ../modules/itip-formatter/itip-view.c:3679
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Found the appointment in the calendar '%s'"
+
+#: ../modules/itip-formatter/itip-view.c:3774
+msgid "Unable to find any calendars"
+msgstr "Unable to find any calendars"
+
+#: ../modules/itip-formatter/itip-view.c:3782
+msgid "Unable to find this meeting in any calendar"
+msgstr "Unable to find this meeting in any calendar"
+
+#: ../modules/itip-formatter/itip-view.c:3787
+msgid "Unable to find this task in any task list"
+msgstr "Unable to find this task in any task list"
+
+#: ../modules/itip-formatter/itip-view.c:3792
+msgid "Unable to find this memo in any memo list"
+msgstr "Unable to find this memo in any memo list"
+
+#: ../modules/itip-formatter/itip-view.c:4132
+msgid "Opening the calendar. Please wait..."
+msgstr "Opening the calendar. Please wait…"
+
+#: ../modules/itip-formatter/itip-view.c:4137
+msgid "Searching for an existing version of this appointment"
+msgstr "Searching for an existing version of this appointment"
+
+#: ../modules/itip-formatter/itip-view.c:4523
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Unable to send item to calendar '%s'.  %s"
+
+#: ../modules/itip-formatter/itip-view.c:4538
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Sent to calendar '%s' as accepted"
+
+#: ../modules/itip-formatter/itip-view.c:4543
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Sent to calendar '%s' as tentative"
+
+#: ../modules/itip-formatter/itip-view.c:4549
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Sent to calendar '%s' as declined"
+
+#: ../modules/itip-formatter/itip-view.c:4555
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Sent to calendar '%s' as cancelled"
+
+#: ../modules/itip-formatter/itip-view.c:4576
+#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:5123
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "Saving changes to the calendar. Please wait…"
+
+#: ../modules/itip-formatter/itip-view.c:4617
+msgid "Unable to parse item"
+msgstr "Unable to parse item"
+
+#: ../modules/itip-formatter/itip-view.c:4807
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Organiser has removed the delegate %s "
+
+#: ../modules/itip-formatter/itip-view.c:4822
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Sent a cancellation notice to the delegate"
+
+#: ../modules/itip-formatter/itip-view.c:4826
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Could not send the cancellation notice to the delegate"
+
+#: ../modules/itip-formatter/itip-view.c:4874
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Unable to update attendee. %s"
+
+#: ../modules/itip-formatter/itip-view.c:4882
+msgid "Attendee status updated"
+msgstr "Attendee status updated"
+
+#: ../modules/itip-formatter/itip-view.c:4905
+msgid "The meeting is invalid and cannot be updated"
+msgstr "The meeting is invalid and cannot be updated"
+
+#: ../modules/itip-formatter/itip-view.c:4981
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Attendee status could not be updated because the status is invalid"
+
+#: ../modules/itip-formatter/itip-view.c:5053
+#: ../modules/itip-formatter/itip-view.c:5093
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Attendee status can not be updated because the item no longer exists"
+
+#: ../modules/itip-formatter/itip-view.c:5156
+msgid "Meeting information sent"
+msgstr "Meeting information sent"
+
+#: ../modules/itip-formatter/itip-view.c:5161
+msgid "Task information sent"
+msgstr "Task information sent"
+
+#: ../modules/itip-formatter/itip-view.c:5166
+msgid "Memo information sent"
+msgstr "Memo information sent"
+
+#: ../modules/itip-formatter/itip-view.c:5177
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Unable to send meeting information, the meeting does not exist"
+
+#: ../modules/itip-formatter/itip-view.c:5182
+msgid "Unable to send task information, the task does not exist"
+msgstr "Unable to send task information, the task does not exist"
+
+#: ../modules/itip-formatter/itip-view.c:5187
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Unable to send memo information, the memo does not exist"
+
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5252
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../modules/itip-formatter/itip-view.c:5257
+msgid "Save Calendar"
+msgstr "Save Calendar"
+
+#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5323
+msgid "The calendar attached is not valid"
+msgstr "The calendar attached is not valid"
+
+#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5324
+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/itip-formatter/itip-view.c:5366
+#: ../modules/itip-formatter/itip-view.c:5396
+#: ../modules/itip-formatter/itip-view.c:5496
+msgid "The item in the calendar is not valid"
+msgstr "The item in the calendar is not valid"
+
+#: ../modules/itip-formatter/itip-view.c:5367
+#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5497
+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/itip-formatter/itip-view.c:5412
+msgid "The calendar attached contains multiple items"
+msgstr "The calendar attached contains multiple items"
+
+#: ../modules/itip-formatter/itip-view.c:5413
+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/itip-formatter/itip-view.c:5937
+msgctxt "cal-itip"
+msgid "None"
+msgstr "None"
+
+#: ../modules/itip-formatter/itip-view.c:5953
+msgid "Tentatively Accepted"
+msgstr "Tentatively Accepted"
+
+#: ../modules/itip-formatter/itip-view.c:6096
+msgid "This meeting recurs"
+msgstr "This meeting recurs"
+
+#: ../modules/itip-formatter/itip-view.c:6099
+msgid "This task recurs"
+msgstr "This task recurs"
+
+#: ../modules/itip-formatter/itip-view.c:6102
+msgid "This memo recurs"
+msgstr "This memo recurs"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "This meeting has been delegated"
+
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+"'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+msgid "Meeting Invitations"
+msgstr "Meeting Invitations"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+msgid "_Delete message after acting"
+msgstr "_Delete message after acting"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+msgid "Conflict Search"
+msgstr "Conflict Search"
+
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Select the calendars to search for meeting conflicts"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr "Itip Formatter"
+
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Display \"text/calendar\" MIME parts in mail messages."
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+msgid "Google Features"
+msgstr "Google Features"
+
+#: ../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/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/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/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/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "Choose a MH mail directory"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "Local Delivery _File:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "Choose a local delivery file"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "Choose a Maildir mail directory"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "Spool _File:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "Choose a mbox spool file"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "Spool _Directory:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "Choose a mbox spool directory"
+
+#: ../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"
+
+#: ../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:"
+
+#: ../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:"
+
+#: ../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/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/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/mail-config/e-mail-config-smtp-backend.c:125
+msgid "Ser_ver requires authentication"
+msgstr "Ser_ver requires authentication"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+msgid "T_ype:"
+msgstr "T_ype:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+msgid "Yahoo! Features"
+msgstr "Yahoo! Features"
+
+#: ../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/mail/e-mail-attachment-handler.c:390
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d attached message"
 msgstr[1] "%d attached messages"
 
-#: ../modules/mail/e-mail-shell-backend.c:230
+#: ../modules/mail/e-mail-shell-backend.c:244
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:232
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Mail Acco_unt"
 
-#: ../modules/mail/e-mail-shell-backend.c:242
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail account"
 msgstr "Create a new mail account"
 
-#: ../modules/mail/e-mail-shell-backend.c:247
+#: ../modules/mail/e-mail-shell-backend.c:261
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:249
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:464
+#: ../modules/mail/e-mail-shell-backend.c:561
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: ../modules/mail/e-mail-shell-backend.c:473
+#: ../modules/mail/e-mail-shell-backend.c:570
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:482
+#: ../modules/mail/e-mail-shell-backend.c:579
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:491
+#: ../modules/mail/e-mail-shell-backend.c:588
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:725
-msgid "Evolution Account Assistant"
-msgstr "Evolution Account Assistant"
-
-#: ../modules/mail/e-mail-shell-backend.c:771
-msgid "Account Editor"
-msgstr "Account Editor"
+#. 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/mail/e-mail-shell-view-actions.c:1180
-#: ../modules/mail/e-mail-shell-view.c:947
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view.c:975
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../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/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../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/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../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/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../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/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../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/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../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/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_New..."
 msgstr "_New…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../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/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../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/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../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/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../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/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../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/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../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/mail/e-mail-shell-view-actions.c:1338
+#: ../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/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../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/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../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/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
+msgid "_Unmatched Folder Enabled"
+msgstr "_Unmatched Folder Enabled"
+
+#: ../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/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/mail/e-mail-shell-view-actions.c:1557
+#: ../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/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
-msgid "Recent Messages"
-msgstr "Recent Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:613
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:710
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:973
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:979
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1004
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1016
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1458
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../modules/mail/em-composer-prefs.c:513
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:86
 msgid "Every time"
 msgstr "Every time"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:87
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:88
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:318
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:322
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
+#: ../modules/mail/em-mailer-prefs.c:1146
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
@@ -17334,24 +17262,24 @@ msgstr "Do you want to make Evolution your default e-mail client?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:258
+#: ../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."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:324
+#: ../modules/mdn/evolution-mdn.c:390
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Delivery Notification for \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:449
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Send a read receipt to '%s'"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:454
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "_Notify Sender"
 
@@ -17383,7 +17311,7 @@ msgstr ""
 "Evolution will return to online mode once a network connection is "
 "established."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
+#: ../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."
@@ -17391,11 +17319,11 @@ msgstr ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17432,408 +17360,504 @@ msgstr "_Plugins"
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python Test Plugin"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+msgid "Display plain text version"
+msgstr "Display plain text version"
+
+#: ../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/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+msgid "Display HTML version"
+msgstr "Display HTML version"
+
+#: ../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/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/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/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/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Test Plugin for Python EPlugin loader."
+#: ../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/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Python Plugin Loader tests"
-msgstr "Python Plugin Loader tests"
+#: ../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/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Hello Python"
-msgstr "Hello Python"
+#: ../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/spamassassin/evolution-spamassassin.c:190
+#: ../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/prefer-plain/plugin/config-ui.c:129
+msgid "HTML _Mode"
+msgstr "HTML _Mode"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Prefer Plain Text"
+
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "Plain Text Mode"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "View mail messages as plain text, even if they contain HTML content."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Failed to spawn SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
+#: ../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/spamassassin/evolution-spamassassin.c:232
+#: ../modules/spamassassin/evolution-spamassassin.c:234
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Failed to write '%s' to SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
+#: ../modules/spamassassin/evolution-spamassassin.c:262
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Failed to read output from SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
+#: ../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/spamassassin/evolution-spamassassin.c:834
+#: ../modules/spamassassin/evolution-spamassassin.c:885
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin Options"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
+#: ../modules/spamassassin/evolution-spamassassin.c:900
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
+#: ../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/spamassassin/evolution-spamassassin.c:1072
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../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/startup-wizard/evolution-startup-wizard.c:315
+#: ../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/startup-wizard/evolution-startup-wizard.c:326
-#: ../modules/startup-wizard/evolution-startup-wizard.c:424
+#. 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/startup-wizard/evolution-startup-wizard.c:402
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
 msgid "Import cancelled."
 msgstr "Import cancelled."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
 msgid "Import complete."
 msgstr "Import complete."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:494
-msgid "Evolution Setup Assistant"
-msgstr "Evolution Setup Assistant"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:500
-msgid "Welcome"
-msgstr "Welcome"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:505
+#: ../modules/startup-wizard/e-startup-assistant.c:154
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
+"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. The next few screens will allow Evolution to connect "
-"to your e-mail accounts, and to import files from other applications."
+"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:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
 msgid "Loading accounts..."
 msgstr "Loading accounts…"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Local Address Books"
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+msgid "_Format as..."
+msgstr "_Format as…"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "Add local address books to Evolution."
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+msgid "_Other languages"
+msgstr "_Other languages"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
-msgid "_Do not show this message again."
-msgstr "_Do not show this message again."
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+msgid "Text Highlight"
+msgstr "Text Highlight"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:462
-msgid "Keywords"
-msgstr "Keywords"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+msgid "Syntax highlighting of mail parts"
+msgstr "Syntax highlighting of mail parts"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Message has no attachments"
-msgstr "Message has no attachments"
+#: ../modules/text-highlight/languages.c:32
+msgid "_Plain text"
+msgstr "_Plain text"
 
-#: ../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/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr "_Assembler"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add Attachment..."
-msgstr "_Add Attachment…"
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr "_Bash"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "_Edit Message"
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr "_C/C++"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Attachment Reminder"
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr "_C#"
 
-#: ../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/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr "_Cascade Style Sheet"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
-msgstr "Inline Audio"
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr "_HTML"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
-msgstr "Play audio attachments directly in mail messages."
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr "_Java"
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "Back up Evolution directory"
+#: ../modules/text-highlight/languages.c:87
+msgid "_JavaScript"
+msgstr "_JavaScript"
 
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "Restore Evolution directory"
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr "_Patch/diff"
 
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "Check Evolution Backup"
+#: ../modules/text-highlight/languages.c:99
+msgid "_Perl"
+msgstr "_Perl"
 
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Restart Evolution"
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr "_PHP"
 
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "With Graphical User Interface"
+#: ../modules/text-highlight/languages.c:123
+msgid "_Python"
+msgstr "_Python"
 
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
-msgid "Shutting down Evolution"
-msgstr "Shutting down Evolution"
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr "_Ruby"
 
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "Backing up Evolution accounts and settings"
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
 
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr "_TeX/LaTeX"
 
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "Backup complete"
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr "_Vala"
 
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "Restarting Evolution"
+#: ../modules/text-highlight/languages.c:152
+msgid "_Visual Basic"
+msgstr "_Visual Basic"
 
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "Back up current Evolution data"
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr "_XML"
 
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "Extracting files from backup"
+#: ../modules/text-highlight/languages.c:177
+msgid "_ActionScript"
+msgstr "_ActionScript"
 
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "Loading Evolution settings"
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr "_ADA95"
 
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "Removing temporary backup files"
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr "_ALGOL 68"
 
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "Ensuring local sources"
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr "(_G)AWK"
 
-#: ../plugins/backup-restore/backup.c:767
-msgid "Evolution Back Up"
-msgstr "Evolution Back Up"
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr "_COBOL"
 
-#: ../plugins/backup-restore/backup.c:768
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "Backing up to the folder %s"
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr "_DOS Batch"
 
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "Evolution Restore"
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr "_D"
 
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restoring from the folder %s"
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr "_Erlang"
 
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "Backing up Evolution Data"
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr "_FORTRAN 77"
 
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "Please wait while Evolution backs up your data."
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr "_FORTRAN 90"
 
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "Restoring Evolution Data"
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr "_F#"
 
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "Please wait while Evolution restores your data."
+#: ../modules/text-highlight/languages.c:235
+msgid "_Go"
+msgstr "_Go"
 
-#: ../plugins/backup-restore/backup.c:863
-msgid "This may take a while depending on the amount of data in your account."
-msgstr "This may take a while depending on the amount of data in your account."
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr "_Haskell"
 
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "Select name of the Evolution backup file"
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
+msgstr "_JSP"
 
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "_Restart Evolution after backup"
+#: ../modules/text-highlight/languages.c:250
+msgid "_Lisp"
+msgstr "_Lisp"
 
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr "Select name of the Evolution backup file to restore"
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr "_Lotus"
 
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "_Restart Evolution after restore"
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
+msgstr "_Lua"
 
-#: ../plugins/backup-restore/backup-restore.c:385
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
+msgstr "_Maple"
 
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "_Restore Evolution from the backup file"
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr "_Matlab"
 
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Please select an Evolution Archive to restore:"
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr "_Maya"
 
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "Choose a file to restore"
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr "_Oberon"
 
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "Restore from backup"
+#: ../modules/text-highlight/languages.c:288
+msgid "_Objective C"
+msgstr "_Objective C"
 
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "_Back up Evolution Data…"
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr "_OCaml"
 
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Back up Evolution data and settings to an archive file"
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr "_Octave"
 
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "R_estore Evolution Data…"
+#: ../modules/text-highlight/languages.c:304
+msgid "_Object Script"
+msgstr "_Object Script"
 
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Restore Evolution data and settings from an archive file"
+#: ../modules/text-highlight/languages.c:309
+msgid "_Pascal"
+msgstr "_Pascal"
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "Backup and Restore"
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr "_POV-Ray"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr "Back up and restore your Evolution data and settings."
+#: ../modules/text-highlight/languages.c:319
+msgid "_Prolog"
+msgstr "_Prolog"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "Invalid Evolution backup file"
+#: ../modules/text-highlight/languages.c:324
+msgid "_PostScript"
+msgstr "_PostScript"
 
-#: ../plugins/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/text-highlight/languages.c:329
+msgid "_R"
+msgstr "_R"
 
-#: ../plugins/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/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr "_RPM Spec"
 
-#: ../plugins/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/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr "_Scala"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Close and Back Up Evolution"
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr "_Smalltalk"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+#: ../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:118
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+msgid "Show F_ull vCard"
+msgstr "Show F_ull vCard"
+
+#: ../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/vcard-inline/e-mail-formatter-vcard-inline.c:145
+msgid "Save _To Addressbook"
+msgstr "Save _To Addressbook"
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+msgid "There is one other contact."
+msgstr "There is one other contact."
+
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#, 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:196
+msgid "Addressbook Contact"
+msgstr "Addressbook Contact"
+
+#: ../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/web-inspector/evolution-web-inspector.c:88
+msgid "_Inspect..."
+msgstr "_Inspect…"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "Inspect the HTML content (debugging feature)"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+msgid "Evolution Web Inspector"
+msgstr "Evolution Web Inspector"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_Do not show this message again."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:590
+#: ../plugins/templates/templates.c:469
+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 ""
-"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."
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 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."
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Close and Restore Evolution"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Add Attachment…"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "Insufficient Permissions"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Edit Message"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "The selected folder is not writable."
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Attachment Reminder"
 
-#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
+#: ../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:650 ../plugins/bbdb/bbdb.c:659
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:674
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:717
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:732
+#: ../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"
 
-#: ../plugins/bbdb/bbdb.c:740
+#: ../plugins/bbdb/bbdb.c:722
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:753
+#: ../plugins/bbdb/bbdb.c:735
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -17855,262 +17879,7 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr "Authentication failed. Server requires correct login."
-
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "Given URL cannot be found."
-
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"Server returned unexpected data.\n"
-"%d - %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "Failed to parse server response."
-
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "Events"
-
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "User's calendars"
-
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "Failed to get server URL."
-
-#: ../plugins/caldav/caldav-browse-server.c:762
-#: ../plugins/caldav/caldav-browse-server.c:803
-#: ../plugins/caldav/caldav-browse-server.c:1502
-msgid "Searching for user's calendars..."
-msgstr "Searching for user's calendars…"
-
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "Could not find any user calendar."
-
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "Previous attempt failed: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "Previous attempt failed with code %d"
-
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Enter password for user %s on server %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "Cannot create soup message for URL '%s'"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "Searching folder contents…"
-
-#: ../plugins/caldav/caldav-browse-server.c:1326
-#: ../plugins/caldav/caldav-source.c:262
-msgid "Server _handles meeting invitations"
-msgstr "Server _handles meeting invitations"
-
-#: ../plugins/caldav/caldav-browse-server.c:1333
-msgid "List of available calendars:"
-msgstr "List of available calendars:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1371
-msgid "Supports"
-msgstr "Supports"
-
-#: ../plugins/caldav/caldav-browse-server.c:1402
-#: ../plugins/caldav/caldav-source.c:260
-msgid "User e_mail:"
-msgstr "User e-_mail:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1478
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "Failed to create thread: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1599
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "Server URL '%s' is not a valid URL"
-
-#: ../plugins/caldav/caldav-browse-server.c:1609
-msgid "Browse for a CalDAV calendar"
-msgstr "Browse for a CalDAV calendar"
-
-#: ../plugins/caldav/caldav-source.c:241
-#: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:261
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../plugins/caldav/caldav-source.c:248
-#: ../plugins/calendar-http/calendar-http.c:149
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "Use _secure connection"
-
-#: ../plugins/caldav/caldav-source.c:265
-msgid "Brows_e server for a calendar"
-msgstr "Brows_e server for a calendar"
-
-#: ../plugins/caldav/caldav-source.c:283
-#: ../plugins/calendar-file/calendar-file.c:207
-#: ../plugins/calendar-http/calendar-http.c:132
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:661
-msgid "Re_fresh:"
-msgstr "Re_fresh:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "CalDAV Support"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "Add CalDAV support to Evolution."
-
-#: ../plugins/calendar-file/calendar-file.c:136
-msgid "C_ustomize options"
-msgstr "C_ustomise options"
-
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "F_ilename:"
-
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "Choose calendar file"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:213
-msgid "On open"
-msgstr "On open"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:215
-msgid "On file change"
-msgstr "On file change"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:217
-msgid "Periodically"
-msgstr "Periodically"
-
-#: ../plugins/calendar-file/calendar-file.c:238
-msgid "Force read _only"
-msgstr "Force read _only"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Local Calendars"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "Add local calendars to Evolution."
-
-#: ../plugins/calendar-http/calendar-http.c:214
-msgid "Userna_me:"
-msgstr "Userna_me:"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Web Calendars"
-msgstr "Web Calendars"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Add web calendars to Evolution."
-msgstr "Add web calendars to Evolution."
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "Weather: Fog"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "Weather: Cloudy"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "Weather: Cloudy Night"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "Weather: Overcast"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "Weather: Showers"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "Weather: Snow"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "Weather: Sunny"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "Weather: Clear Night"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "Weather: Thunderstorms"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Select a location"
-
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "None"
-
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_Units:"
-
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "Metric (Celsius, cm, etc)"
-
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Imperial (Fahrenheit, inches, etc)"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "Weather Calendars"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Add weather calendars to Evolution."
-msgstr "Add weather calendars to Evolution."
-
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:287
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
@@ -18126,80 +17895,52 @@ msgstr "Outlook Express 5/6 personal folders (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Import Outlook Express messages from DBX file"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "Mark as _default address book"
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "A_utocomplete with this address book"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "Mark as _default calendar"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "Mark as _default task list"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "Mark as _default memo list"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Default Sources"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr "Mark your preferred address book and calendar as default."
-
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../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:305
+#: ../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:306
+#: ../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:307
+#: ../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:308
+#: ../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:309
+#: ../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:310
+#: ../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:367
+#: ../plugins/email-custom-header/email-custom-header.c:357
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:530
 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:803
+#: ../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 \";\"."
@@ -18207,12 +17948,12 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:851
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
+#: ../plugins/email-custom-header/email-custom-header.c:867
+#: ../plugins/templates/templates.c:477
 msgid "Values"
 msgstr "Values"
 
@@ -18229,10 +17970,6 @@ msgstr "Add custom headers to outgoing mail messages."
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr "Automatically launch editor when key is pressed in the mail composer"
-
 #: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
@@ -18342,47 +18079,6 @@ msgstr "Not an image"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "The file you selected does not look like a valid PNG image. Error: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:249
-msgid "Server"
-msgstr "Server"
-
-#: ../plugins/google-account-setup/google-source.c:452
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Enter password for user %s to access list of subscribed calendars."
-
-#: ../plugins/google-account-setup/google-source.c:564
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"Cannot read data from Google server.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#: ../plugins/google-account-setup/google-source.c:665
-msgid "Cal_endar:"
-msgstr "Cal_endar:"
-
-#: ../plugins/google-account-setup/google-source.c:702
-msgid "Retrieve _List"
-msgstr "Retrieve _List"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Google Calendars"
-msgstr "Google Calendars"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Add Google Calendars to Evolution."
-msgstr "Add Google Calendars to Evolution."
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Inline Image"
@@ -18391,836 +18087,55 @@ msgstr "Inline Image"
 msgid "View image attachments directly in mail messages."
 msgstr "View image attachments directly in mail messages."
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "Custom Headers"
-
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "IMAP Headers"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "_Fetch All Headers"
-
-#: ../plugins/imap-features/imap-headers.ui.h:4
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Basic and _Mailing List Headers (Default)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "IMAP Features"
-msgstr "IMAP Features"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "Fine-tune your IMAP accounts."
-msgstr "Fine-tune your IMAP accounts."
-
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:505
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Failed to load the calendar '%s' (%s)"
-
-#: ../plugins/itip-formatter/itip-formatter.c:665
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "An appointment in the calendar '%s' conflicts with this meeting"
-
-#: ../plugins/itip-formatter/itip-formatter.c:689
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "Found the appointment in the calendar '%s'"
-
-#: ../plugins/itip-formatter/itip-formatter.c:802
-msgid "Unable to find any calendars"
-msgstr "Unable to find any calendars"
-
-#: ../plugins/itip-formatter/itip-formatter.c:809
-msgid "Unable to find this meeting in any calendar"
-msgstr "Unable to find this meeting in any calendar"
-
-#: ../plugins/itip-formatter/itip-formatter.c:813
-msgid "Unable to find this task in any task list"
-msgstr "Unable to find this task in any task list"
-
-#: ../plugins/itip-formatter/itip-formatter.c:817
-msgid "Unable to find this memo in any memo list"
-msgstr "Unable to find this memo in any memo list"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1119
-msgid "Opening the calendar. Please wait..."
-msgstr "Opening the calendar. Please wait…"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1122
-msgid "Searching for an existing version of this appointment"
-msgstr "Searching for an existing version of this appointment"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1484
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Unable to send item to calendar '%s'.  %s"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1498
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "Sent to calendar '%s' as accepted"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1502
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "Sent to calendar '%s' as tentative"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1507
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "Sent to calendar '%s' as declined"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1512
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "Sent to calendar '%s' as cancelled"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Saving changes to the calendar. Please wait…"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1620
-msgid "Unable to parse item"
-msgstr "Unable to parse item"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "Organiser has removed the delegate %s "
-
-#: ../plugins/itip-formatter/itip-formatter.c:1807
-msgid "Sent a cancelation notice to the delegate"
-msgstr "Sent a cancellation notice to the delegate"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1809
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "Could not send the cancellation notice to the delegate"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr "Unable to update attendee. %s"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1861
-msgid "Attendee status updated"
-msgstr "Attendee status updated"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1881
-msgid "The meeting is invalid and cannot be updated"
-msgstr "The meeting is invalid and cannot be updated"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1947
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Attendee status could not be updated because the status is invalid"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2086
-msgid "Meeting information sent"
-msgstr "Meeting information sent"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2089
-msgid "Task information sent"
-msgstr "Task information sent"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2092
-msgid "Memo information sent"
-msgstr "Memo information sent"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2101
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "Unable to send meeting information, the meeting does not exist"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2104
-msgid "Unable to send task information, the task does not exist"
-msgstr "Unable to send task information, the task does not exist"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2107
-msgid "Unable to send memo information, the memo does not exist"
-msgstr "Unable to send memo information, the memo does not exist"
-
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
-msgid "calendar.ics"
-msgstr "calendar.ics"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2178
-msgid "Save Calendar"
-msgstr "Save Calendar"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
-msgid "The calendar attached is not valid"
-msgstr "The calendar attached is not valid"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
-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."
-
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
-msgid "The item in the calendar is not valid"
-msgstr "The item in the calendar is not valid"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2335
-msgid "The calendar attached contains multiple items"
-msgstr "The calendar attached contains multiple items"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-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"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2860
-msgctxt "cal-itip"
-msgid "None"
-msgstr "None"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2876
-msgid "Tentatively Accepted"
-msgstr "Tentatively Accepted"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2994
-msgid "This meeting recurs"
-msgstr "This meeting recurs"
-
-#: ../plugins/itip-formatter/itip-formatter.c:2997
-msgid "This task recurs"
-msgstr "This task recurs"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3000
-msgid "This memo recurs"
-msgstr "This memo recurs"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3231
-msgid "Meeting Invitations"
-msgstr "Meeting Invitations"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3257
-msgid "_Delete message after acting"
-msgstr "_Delete message after acting"
-
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
-msgid "Conflict Search"
-msgstr "Conflict Search"
-
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Select the calendars to search for meeting conflicts"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
-msgid "Today %H:%M"
-msgstr "Today %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
-msgid "Today %H:%M:%S"
-msgstr "Today %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
-msgid "Today %l:%M:%S %p"
-msgstr "Today %l:%M:%S %p"
-
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
-msgid "Tomorrow %H:%M"
-msgstr "Tomorrow %H:%M"
-
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
-msgid "Tomorrow %H:%M:%S"
-msgstr "Tomorrow %H:%M:%S"
-
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
-msgid "Tomorrow %l:%M %p"
-msgstr "Tomorrow %l:%M %p"
-
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "Tomorrow %l:%M:%S %p"
-
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
-#, c-format
-msgid "%A"
-msgstr "%A"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
-
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
-msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
-
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
-msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
-
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
-msgid "%A, %B %e"
-msgstr "%A %e %B"
-
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %B %H:%M"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %B %H:%M:%S"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %B %l:%M %p"
-
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e %B %l:%M:%S %p"
-
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
-msgid "%A, %B %e, %Y"
-msgstr "%A, %e %B, %Y"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
-msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %e %B, %Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %e %B, %Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %e %B, %Y %l:%M %p"
-
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %e %B, %Y %l:%M:%S %p"
-
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
-msgid "An unknown person"
-msgstr "An unknown person"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr "Please respond on behalf of %s"
-
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
-#, c-format
-msgid "Received on behalf of %s"
-msgstr "Received on behalf of %s"
-
-#: ../plugins/itip-formatter/itip-view.c:379
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "%s through %s has published the following meeting information:"
-
-#: ../plugins/itip-formatter/itip-view.c:381
-#, c-format
-msgid "%s has published the following meeting information:"
-msgstr "%s has published the following meeting information:"
-
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "%s has delegated the following meeting to you:"
-
-#: ../plugins/itip-formatter/itip-view.c:389
-#, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "%s through %s requests your presence at the following meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:391
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "%s requests your presence at the following meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:397
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "%s through %s wishes to add to an existing meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:399
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "%s wishes to add to an existing meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:403
-#, 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:"
-
-#: ../plugins/itip-formatter/itip-view.c:405
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "%s wishes to receive the latest information for the following meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:409
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "%s through %s has sent back the following meeting response:"
-
-#: ../plugins/itip-formatter/itip-view.c:411
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "%s has sent back the following meeting response:"
-
-#: ../plugins/itip-formatter/itip-view.c:415
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "%s through %s has cancelled the following meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:417
-#, c-format
-msgid "%s has canceled the following meeting:"
-msgstr "%s has cancelled the following meeting:"
-
-#: ../plugins/itip-formatter/itip-view.c:421
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "%s through %s has proposed the following meeting changes."
-
-#: ../plugins/itip-formatter/itip-view.c:423
-#, c-format
-msgid "%s has proposed the following meeting changes:"
-msgstr "%s has proposed the following meeting changes:"
-
-#: ../plugins/itip-formatter/itip-view.c:427
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "%s through %s has declined the following meeting changes:"
-
-#: ../plugins/itip-formatter/itip-view.c:429
-#, c-format
-msgid "%s has declined the following meeting changes:"
-msgstr "%s has declined the following meeting changes:"
-
-#: ../plugins/itip-formatter/itip-view.c:467
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr "%s through %s has published the following task:"
-
-#: ../plugins/itip-formatter/itip-view.c:469
-#, c-format
-msgid "%s has published the following task:"
-msgstr "%s has published the following task:"
-
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr "%s requests the assignment of %s to the following task:"
-
-#: ../plugins/itip-formatter/itip-view.c:477
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "%s through %s has assigned you a task:"
-
-#: ../plugins/itip-formatter/itip-view.c:479
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr "%s has assigned you a task:"
-
-#: ../plugins/itip-formatter/itip-view.c:485
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "%s through %s wishes to add to an existing task:"
-
-#: ../plugins/itip-formatter/itip-view.c:487
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "%s wishes to add to an existing task:"
-
-#: ../plugins/itip-formatter/itip-view.c:491
-#, 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:"
-
-#: ../plugins/itip-formatter/itip-view.c:493
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-"%s wishes to receive the latest information for the following assigned task:"
-
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s through %s has sent back the following assigned task response:"
-
-#: ../plugins/itip-formatter/itip-view.c:499
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr "%s has sent back the following assigned task response:"
-
-#: ../plugins/itip-formatter/itip-view.c:503
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "%s through %s has cancelled the following assigned task:"
-
-#: ../plugins/itip-formatter/itip-view.c:505
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "%s has cancelled the following assigned task:"
-
-#: ../plugins/itip-formatter/itip-view.c:509
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%s through %s has proposed the following task assignment changes:"
-
-#: ../plugins/itip-formatter/itip-view.c:511
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "%s has proposed the following task assignment changes:"
-
-#: ../plugins/itip-formatter/itip-view.c:515
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "%s through %s has declined the following assigned task:"
-
-#: ../plugins/itip-formatter/itip-view.c:517
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "%s has declined the following assigned task:"
-
-#: ../plugins/itip-formatter/itip-view.c:554
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "%s through %s has published the following memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:556
-#, c-format
-msgid "%s has published the following memo:"
-msgstr "%s has published the following memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:561
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "%s through %s wishes to add to an existing memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:563
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "%s wishes to add to an existing memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:567
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "%s through %s has cancelled the following shared memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:569
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "%s has cancelled the following shared memo:"
-
-#: ../plugins/itip-formatter/itip-view.c:693
-msgid "All day:"
-msgstr "All day:"
-
-#: ../plugins/itip-formatter/itip-view.c:703
-msgid "Start day:"
-msgstr "Start day:"
-
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
-msgid "Start time:"
-msgstr "Start time:"
-
-#: ../plugins/itip-formatter/itip-view.c:715
-msgid "End day:"
-msgstr "End day:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
-msgid "End time:"
-msgstr "End time:"
-
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "_Open Calendar"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "_Decline"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "A_ccept"
-
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "_Decline all"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "_Tentative all"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "_Tentative"
-
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "A_ccept all"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "_Send Information"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "_Update Attendee Status"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "_Update"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
-msgid "Comment:"
-msgstr "Comment:"
-
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "Send _reply to sender"
-
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "Send _updates to attendees"
-
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "_Apply to all instances"
-
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "Show time as _free"
-
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "_Preserve my reminder"
-
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "_Inherit reminder"
-
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "_Tasks:"
-
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "_Memos:"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip Formatter"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Display \"text/calendar\" MIME parts in mail messages."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"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?"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr "This meeting has been delegated"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{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}'?"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../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"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
@@ -19312,73 +18227,57 @@ msgstr ""
 "\n"
 "Header: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:421
 #, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"You have received %d new message\n"
-"in %s."
-msgstr[1] ""
-"You have received %d new messages\n"
-"in %s."
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "You have received %d new message."
+msgstr[1] "You have received %d new messages."
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:410
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:420
-#, c-format
-msgid "You have received %d new message."
-msgid_plural "You have received %d new messages."
-msgstr[0] "You have received %d new message."
-msgstr[1] "You have received %d new messages."
-
-#: ../plugins/mail-notification/mail-notification.c:429
-#: ../plugins/mail-notification/mail-notification.c:437
-#: ../plugins/mail-notification/mail-notification.c:440
-msgid "New email"
-msgstr "New e-mail"
+#: ../plugins/mail-notification/mail-notification.c:427
+msgid "New email in Evolution"
+msgstr "New e-mail in Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:658
 msgid "_Play sound when a new message arrives"
 msgstr "_Play sound when a new message arrives"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:722
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:731
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:787
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:797
 msgid "Show _notification when a new message arrives"
 msgstr "Show _notification when a new message arrives"
 
@@ -19391,12 +18290,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifies you when new mail messages arrive."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../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"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19405,7 +18304,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../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 "
@@ -19414,7 +18313,7 @@ msgstr ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../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 "
@@ -19424,7 +18323,7 @@ msgstr ""
 "old memo?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../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 "
@@ -19440,7 +18339,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../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 "
@@ -19456,7 +18355,7 @@ msgstr[1] ""
 "add them all?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../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 "
@@ -19471,29 +18370,33 @@ msgstr[1] ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:676
+#: ../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?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:755
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:767
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../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"
 
-#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:844
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:844
+msgid "Unknown error."
+msgstr "Unknown error."
+
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19501,7 +18404,7 @@ msgstr ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:854
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19509,7 +18412,7 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:857
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19517,44 +18420,39 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "Cannot get source list. %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 msgid "No writable calendar is available."
 msgstr "No writeable calendar is available."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
-msgid "Create an _Event"
-msgstr "Create an _Event"
+#: ../plugins/mail-to-task/mail-to-task.c:1270
+msgid "Create an _Appointment"
+msgstr "Create an _Appointment"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../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"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../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"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../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"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../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"
 
@@ -19574,15 +18472,15 @@ msgstr ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:216
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current Folder and _Subfolders"
 msgstr "In Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:230
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../plugins/mark-all-read/mark-all-read.c:576
+#: ../plugins/mark-all-read/mark-all-read.c:545
 msgid "Mark Me_ssages as Read"
 msgstr "Mark Me_ssages as Read"
 
@@ -19594,59 +18492,6 @@ msgstr "Mark All Read"
 msgid "Mark all messages in a folder as read."
 msgstr "Mark all messages in a folder as read."
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "Prefer Plain Text"
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Plain Text Mode"
-msgstr "Plain Text Mode"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "View mail messages as plain text, even if they contain HTML content."
-
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show HTML if present"
-msgstr "Show HTML if present"
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Let Evolution choose the best part to show."
-msgstr "Let Evolution choose the best part to show."
-
-#: ../plugins/prefer-plain/prefer-plain.c:254
-msgid "Show plain text if present"
-msgstr "Show plain text if present"
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-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."
-
-#: ../plugins/prefer-plain/prefer-plain.c:259
-msgid "Only ever show plain text"
-msgstr "Only ever show plain text"
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-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."
-
-#: ../plugins/prefer-plain/prefer-plain.c:311
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "Show s_uppressed HTML parts as attachments"
-
-#: ../plugins/prefer-plain/prefer-plain.c:333
-msgid "HTML _Mode"
-msgstr "HTML _Mode"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST import"
@@ -19659,38 +18504,37 @@ msgstr "Outlook personal folders (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Import Outlook messages from PST file"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "_Address Book"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:599
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
-#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tasks"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:707
+#: ../plugins/pst-import/pst-importer.c:721
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:145
+#: ../plugins/publish-calendar/publish-calendar.c:152
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
@@ -19702,49 +18546,49 @@ msgstr "Locations"
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../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:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Could not open %s: Unknown error"
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../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:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publishing to %s finished successfully"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:279
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "E_nable"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../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?"
 
 #. 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:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1104
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1112
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
@@ -19836,100 +18680,100 @@ msgstr "_Remember password"
 msgid "Publishing Location"
 msgstr "Publishing Location"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../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"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:539
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:541
 msgid "Edit Location"
 msgstr "Edit Location"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Due"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "A_dvanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Prepend a _header"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "_Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "_Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "_Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:627
 msgid "Comma separated values (.csv)"
 msgstr "Comma separated values (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19946,31 +18790,31 @@ msgstr "Save a calendar or task list to disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:152
+#: ../plugins/save-calendar/rdf-format.c:146
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:387
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:123
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:185
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:340
 msgid "Save the selected calendar to disk"
 msgstr "Save the selected calendar to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:371
 msgid "Save the selected memo list to disk"
 msgstr "Save the selected memo list to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:402
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
@@ -19984,271 +18828,27 @@ msgstr ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an e-mail you are replying to."
 
-#: ../plugins/templates/templates.c:1105
+#: ../plugins/templates/templates.c:1112
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/templates.c:1217
+#: ../plugins/templates/templates.c:1221
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:1219
+#: ../plugins/templates/templates.c:1223
 msgid "Save as Template"
 msgstr "Save as Template"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "TNEF Decoder"
-msgstr "TNEF Decoder"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-msgid "Inline vCards"
-msgstr "Inline vCards"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr "Show vCards directly in mail messages."
-
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
-msgid "Show Full vCard"
-msgstr "Show Full vCard"
-
-#: ../plugins/vcard-inline/vcard-inline.c:211
-msgid "Show Compact vCard"
-msgstr "Show Compact vCard"
-
-#: ../plugins/vcard-inline/vcard-inline.c:272
-msgid "There is one other contact."
-msgstr "There is one other contact."
-
-#: ../plugins/vcard-inline/vcard-inline.c:281
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "There is %d other contact."
-msgstr[1] "There are %d other contacts."
-
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Save in Address Book"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "WebDAV contacts"
-msgstr "WebDAV contacts"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Add WebDAV contacts to Evolution."
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:287
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"List of paths for the folders to be synchronised to disk for offline usage"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Default window Y coordinate"
-msgstr "Default window Y coordinate"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "The default Y coordinate for the main window."
-msgstr "The default Y coordinate for the main window."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "Default window X coordinate"
-msgstr "Default window X coordinate"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "The default X coordinate for the main window."
-msgstr "The default X coordinate for the main window."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "Default window width"
-msgstr "Default window width"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "The default width for the main window, in pixels."
-msgstr "The default width for the main window, in pixels."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Default window height"
-msgstr "Default window height"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "The default height for the main window, in pixels."
-msgstr "The default height for the main window, in pixels."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Default window state"
-msgstr "Default window state"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Whether or not the window should be maximized."
-msgstr "Whether the window should be maximised."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid "Proxy configuration mode"
-msgstr "Proxy configuration mode"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig URL"
-"\" respectively."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "HTTP proxy port"
-msgstr "HTTP proxy port"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "HTTP proxy host name"
-msgstr "HTTP proxy host name"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The machine name to proxy HTTP through."
-msgstr "The machine name to proxy HTTP through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "Secure HTTP proxy port"
-msgstr "Secure HTTP proxy port"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "Secure HTTP proxy host name"
-msgstr "Secure HTTP proxy host name"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy secure HTTP through."
-msgstr "The machine name to proxy secure HTTP through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "SOCKS proxy port"
-msgstr "SOCKS proxy port"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "SOCKS proxy host name"
-msgstr "SOCKS proxy host name"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The machine name to proxy socks through."
-msgstr "The machine name to proxy socks through."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Use HTTP proxy"
-msgstr "Use HTTP proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Authenticate proxy server connections"
-msgstr "Authenticate proxy server connections"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "HTTP proxy username"
-msgstr "HTTP proxy username"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "Username to pass as authentication when doing HTTP proxying."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "HTTP proxy password"
-msgstr "HTTP proxy password"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Password to pass as authentication when doing HTTP proxying."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Non-proxy hosts"
-msgstr "Non-proxy hosts"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Automatic proxy configuration URL"
-msgstr "Automatic proxy configuration URL"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "URL that provides proxy configuration values."
-msgstr "URL that provides proxy configuration values."
-
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Preparing to go offline…"
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Preparing to go online…"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "Preparing to quit…"
 
@@ -20288,14 +18888,14 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:642
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72@yahoo.com>\n"
@@ -20303,290 +18903,282 @@ msgstr ""
 "Philip Withnall <philip@tecnocode.co.uk>\n"
 "Bruce Cowan <bruce@bcowan.me.uk>"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:891
 msgid "Categories Editor"
 msgstr "Categories Editor"
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "_Forget Passwords"
-
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Forget all remembered passwords"
-msgstr "Forget all remembered passwords"
-
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "I_mport…"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "Available Cate_gories"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "Manage available categories"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "_Advanced Search…"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches…"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "_Save Search…"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Report…"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../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"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "Define Views…"
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "Save Custom View…"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1816
+#: ../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"
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2327
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
 msgid "Select view: %s"
 msgstr "Select view: %s"
 
-#: ../shell/e-shell-window-actions.c:2428
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:497
 msgid "New"
 msgstr "New"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:585
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20621,7 +19213,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20629,13 +19221,13 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:305
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20643,47 +19235,47 @@ msgstr ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:309
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:313
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:315
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:317
 msgid "Start in \"express\" mode"
 msgstr "Start in \"express\" mode"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:320
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:323
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:325
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:329
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Import URIs or filenames given as rest of arguments."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:331
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20692,7 +19284,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20741,40 +19333,6 @@ msgstr ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Are you sure you want to forget all remembered passwords?"
-
-#: ../shell/shell.error.xml.h:12
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "_Forget"
-
-#: ../shell/test/e-test-shell-backend.c:52
-msgctxt "New"
-msgid "_Test Item"
-msgstr "_Test Item"
-
-#: ../shell/test/e-test-shell-backend.c:54
-msgid "Create a new test item"
-msgstr "Create a new test item"
-
-#: ../shell/test/e-test-shell-backend.c:62
-msgctxt "New"
-msgid "Test _Source"
-msgstr "Test _Source"
-
-#: ../shell/test/e-test-shell-backend.c:64
-msgid "Create a new test source"
-msgstr "Create a new test source"
-
 #: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -20865,7 +19423,7 @@ msgstr "Issued To Organisational Unit"
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:543
+#: ../smime/lib/e-cert.c:542
 msgid "Serial Number"
 msgstr "Serial Number"
 
@@ -20922,27 +19480,27 @@ msgstr "MD5 Fingerprint"
 msgid "Email Address"
 msgstr "E-mail Address"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:589
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to import…"
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:602
 msgid "All files"
 msgstr "All files"
 
-#: ../smime/gui/certificate-manager.c:632
+#: ../smime/gui/certificate-manager.c:637
 msgid "Failed to import certificate"
 msgstr "Failed to import certificate"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1013
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1030
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1047
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
@@ -21008,11 +19566,11 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Select certificate"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
@@ -21076,6 +19634,10 @@ msgstr "Certificate Fields"
 msgid "Field Value"
 msgstr "Field Value"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "Details"
+
 #: ../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:"
@@ -21139,7 +19701,7 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -21163,153 +19725,153 @@ msgstr "Do not trust the authenticity of this certificate"
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:391
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-cert.c:503
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-cert.c:518
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-cert.c:521
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-cert.c:524
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-cert.c:607
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-cert.c:610
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-cert.c:613
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "E-mail Certificate Authority"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "Signing"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:863
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:867
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:924
 msgid "Critical"
 msgstr "Critical"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "Extensions"
 
@@ -21321,44 +19883,44 @@ msgstr "Extensions"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1029
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
@@ -21489,7 +20051,7 @@ msgstr "Define Views for \"%s\""
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -21517,17 +20079,17 @@ msgstr "Type of view:"
 msgid "Type of View"
 msgstr "Type of View"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
+#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:317
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:318
+#: ../widgets/misc/ea-calendar-item.c:320
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendar: from %s to %s"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
@@ -21535,58 +20097,68 @@ msgstr "evolution calendar item"
 msgid "Close this message"
 msgstr "Close this message"
 
+#: ../widgets/misc/e-attachment-bar.c:658
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Icon View"
+
+#: ../widgets/misc/e-attachment-bar.c:660
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "List View"
+
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1000
+#: ../widgets/misc/e-attachment.c:966
 msgid "Attached message"
 msgstr "Attached message"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
@@ -21595,6 +20167,11 @@ msgstr "Could not save the attachment"
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "F_ilename:"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "MIME Type:"
@@ -21697,20 +20274,90 @@ msgstr "Open With \"%s\""
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
+#: ../widgets/misc/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Mark as default address book"
+
+#: ../widgets/misc/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Autocomplete with this address book"
+
+#: ../widgets/misc/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "Copy book content locally for offline operation"
+
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-click to open a link"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:187
+msgid "Previous month"
+msgstr "Previous month"
+
+#: ../widgets/misc/e-calendar.c:211
+msgid "Next month"
+msgstr "Next month"
+
+#: ../widgets/misc/e-calendar.c:233
+msgid "Previous year"
+msgstr "Previous year"
+
+#: ../widgets/misc/e-calendar.c:254
+msgid "Next year"
+msgstr "Next year"
+
+#: ../widgets/misc/e-calendar.c:278
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
+#. 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"
+
+#. This is a strftime() format. %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1285
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1269
+#: ../widgets/misc/e-calendar-item.c:1322
+msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
 
+#: ../widgets/misc/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Mark as default calendar"
+
+#: ../widgets/misc/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Mark as default task list"
+
+#: ../widgets/misc/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Mark as default memo list"
+
+#: ../widgets/misc/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Colour:"
+
+#: ../widgets/misc/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copy calendar contents locally for offline operation"
+
+#: ../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"
+
+#: ../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"
+
 #: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "Character Encoding"
@@ -21723,7 +20370,7 @@ msgstr "Enter the character set to use"
 msgid "Other..."
 msgstr "Other…"
 
-#: ../widgets/misc/e-contact-map-window.c:355
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "Contacts Map"
 
@@ -21759,16 +20406,16 @@ msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../widgets/misc/e-dateedit.c:1824
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../widgets/misc/e-dateedit.c:1868
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
@@ -21873,6 +20520,60 @@ msgstr "Select a File"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Click \"Apply\" to begin importing the file into Evolution."
 
+#: ../widgets/misc/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: ../widgets/misc/e-mail-signature-editor.c:287
+msgid "Close"
+msgstr "Close"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "_Save and Close"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "Edit Signature"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "_Signature Name:"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "Unnamed"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Add _Script"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "Add Signature Script"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "Edit Signature Script"
+
+#: ../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."
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "S_cript:"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Script file must be executable."
+
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
 msgstr "World Map"
@@ -21901,48 +20602,48 @@ msgstr "Evolution is currently offline because the network is unavailable."
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "Matches: %d"
+msgid "Matches: %u"
+msgstr "Matches: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "_Next"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
@@ -22081,106 +20782,140 @@ msgstr "Return Notification"
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../widgets/misc/e-signature-editor.c:142
-#: ../widgets/misc/e-signature-editor.c:567
-#: ../widgets/misc/e-signature-manager.c:376
-#: ../widgets/misc/e-signature-script-dialog.c:223
-msgid "Unnamed"
-msgstr "Unnamed"
+#: ../widgets/misc/e-source-config.c:679 ../widgets/misc/e-source-config.c:683
+msgid "Type:"
+msgstr "Type:"
 
-#: ../widgets/misc/e-signature-editor.c:218
-msgid "_Save and Close"
-msgstr "_Save and Close"
+#: ../widgets/misc/e-source-config.c:691 ../widgets/misc/e-source-config.c:695
+msgid "Name:"
+msgstr "Name:"
 
-#: ../widgets/misc/e-signature-editor.c:434
-msgid "Edit Signature"
-msgstr "Edit Signature"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../widgets/misc/e-source-config.c:1293
+msgid "Refresh every"
+msgstr "Refresh every"
 
-#: ../widgets/misc/e-signature-editor.c:449
-msgid "_Signature Name:"
-msgstr "_Signature Name:"
+#: ../widgets/misc/e-source-config.c:1323
+#: ../widgets/misc/e-source-config.c:1351
+msgid "Use a secure connection"
+msgstr "Use a secure connection"
 
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "Add Signature Script"
+#: ../widgets/misc/e-source-config.c:1365
+msgid "Ignore invalid SSL certificate"
+msgstr "Ignore invalid SSL certificate"
 
-#: ../widgets/misc/e-signature-manager.c:386
-msgid "Edit Signature Script"
-msgstr "Edit Signature Script"
+#: ../widgets/misc/e-source-config.c:1402
+msgid "User"
+msgstr "User"
 
-#: ../widgets/misc/e-signature-manager.c:605
-msgid "Add _Script"
-msgstr "Add _Script"
+#. no suggestions. Put something in the menu anyway...
+#: ../widgets/misc/e-spell-entry.c:351
+msgid "(no suggestions)"
+msgstr "(no suggestions)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"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."
+#: ../widgets/misc/e-spell-entry.c:375
+msgid "More..."
+msgstr "More…"
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "S_cript:"
+#. + Add to Dictionary
+#: ../widgets/misc/e-spell-entry.c:444
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Add \"%s\" to Dictionary"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "Script file must be executable."
+#. - Ignore All
+#: ../widgets/misc/e-spell-entry.c:487
+msgid "Ignore All"
+msgstr "Ignore All"
+
+#: ../widgets/misc/e-spell-entry.c:513
+msgid "Spelling Suggestions"
+msgstr "Spelling Suggestions"
 
 #: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "_Copy Image"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../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"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
+#: ../widgets/misc/e-web-view.c:1108 ../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"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
+
+#: ../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."
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Discard changes"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Blank Signature"
+
+#: ../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."
+
+#: ../widgets/misc/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "Could not load signature."
+
+#: ../widgets/misc/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "Could not save signature."
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "popup list"
@@ -22209,7 +20944,7 @@ msgstr "The time must be in the format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../widgets/table/e-table-click-to-add.c:610
+#: ../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"
@@ -22322,7 +21057,7 @@ msgstr "_Group By…"
 msgid "_Fields Shown..."
 msgstr "_Fields Shown…"
 
-#: ../widgets/table/e-table-field-chooser.c:153
+#: ../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."
@@ -22341,7 +21076,7 @@ msgstr "Add a Column"
 #. * 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:361
+#: ../widgets/table/e-table-group-container.c:360
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22354,7 +21089,7 @@ msgstr[1] "%s: %s (%d items)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:373
+#: ../widgets/table/e-table-group-container.c:372
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22450,14 +21185,1701 @@ msgstr "click"
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2338
+#: ../widgets/text/e-text.c:2074
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2351
+#: ../widgets/text/e-text.c:2087
 msgid "Input Methods"
 msgstr "Input Methods"
 
+#~ msgid "Some features may not work properly with your current server"
+#~ msgstr "Some features may not work properly with your current server"
+
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results the server should be upgraded "
+#~ "to a supported version"
+#~ msgstr ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results the server should be upgraded "
+#~ "to a supported version"
+
+#~ msgid "GroupWise Address book creation:"
+#~ msgstr "GroupWise Address book creation:"
+
+#~ msgid ""
+#~ "Currently you can only access the GroupWise System Address Book from "
+#~ "Evolution. Please use some other GroupWise mail client once to get your "
+#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+#~ msgstr ""
+#~ "Currently you can only access the GroupWise System Address Book from "
+#~ "Evolution. Please use some other GroupWise mail client once to get your "
+#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+
+#~ msgid "Couldn't get list of address books: %s"
+#~ msgstr "Couldn't get list of address books: %s"
+
+#~ msgid "Some features may not work properly with your current server."
+#~ msgstr "Some features may not work properly with your current server."
+
+#~ msgid ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results, the server should be upgraded "
+#~ "to a supported version."
+#~ msgstr ""
+#~ "You are connecting to an unsupported GroupWise server and may encounter "
+#~ "problems using Evolution. For best results, the server should be upgraded "
+#~ "to a supported version."
+
+#~ msgid "_Type:"
+#~ msgstr "_Type:"
+
+#~ msgid "Sh_ow reminder notifications"
+#~ msgstr "Sh_ow reminder notifications"
+
+#~ msgid "You are acting on behalf of %s"
+#~ msgstr "You are acting on behalf of %s"
+
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "ID of the socket to embed in"
+
+#~ msgid "socket"
+#~ msgstr "socket"
+
+#~ msgid "Please enter your full name."
+#~ msgstr "Please enter your full name."
+
+#~ msgid "Please enter your email address."
+#~ msgstr "Please enter your e-mail address."
+
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "The e-mail address you have entered is invalid."
+
+#~ msgid "Please enter your password."
+#~ msgstr "Please enter your password."
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Always (SSL)"
+#~ msgstr "Always (SSL)"
+
+#~ msgid "When possible (TLS)"
+#~ msgstr "When possible (TLS)"
+
+#~ msgid "Personal details:"
+#~ msgstr "Personal details:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail address:"
+
+#~ msgid "Details:"
+#~ msgstr "Details:"
+
+#~ msgid "Server type:"
+#~ msgstr "Server type:"
+
+#~ msgid "Server address:"
+#~ msgstr "Server address:"
+
+#~ msgid "Use encryption:"
+#~ msgstr "Use encryption:"
+
+#~ msgid ""
+#~ "To use the email application you'll need to setup an account. Put your "
+#~ "email address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+#~ msgstr ""
+#~ "To use the e-mail application you'll need to set up an account. Put your "
+#~ "e-mail address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+
+#~ msgid ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+#~ msgstr ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+
+#~ msgid "You can specify more options to configure the account."
+#~ msgstr "You can specify more options to configure the account."
+
+#~ msgid ""
+#~ "Now we need your settings for sending mail. We've tried to make some "
+#~ "guesses but you should check them over to make sure."
+#~ msgstr ""
+#~ "Now we need your settings for sending mail. We've tried to make some "
+#~ "guesses but you should check them over to make sure."
+
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "You can specify your default settings for your account."
+
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+
+#~ msgid "Next - Receiving mail"
+#~ msgstr "Next — Receiving mail"
+
+#~ msgid "Receiving mail"
+#~ msgstr "Receiving mail"
+
+#~ msgid "Next - Sending mail"
+#~ msgstr "Next — Sending mail"
+
+#~ msgid "Back - Identity"
+#~ msgstr "Back — Identity"
+
+#~ msgid "Next - Receiving options"
+#~ msgstr "Next — Receiving options"
+
+#~ msgid "Receiving options"
+#~ msgstr "Receiving options"
+
+#~ msgid "Back - Receiving mail"
+#~ msgstr "Back — Receiving mail"
+
+#~ msgid "Sending mail"
+#~ msgstr "Sending mail"
+
+#~ msgid "Next - Review account"
+#~ msgstr "Next — Review account"
+
+#~ msgid "Next - Defaults"
+#~ msgstr "Next — Defaults"
+
+#~ msgid "Back - Receiving options"
+#~ msgstr "Back — Receiving options"
+
+#~ msgid "Back - Sending mail"
+#~ msgstr "Back — Sending mail"
+
+#~ msgid "Review account"
+#~ msgstr "Review account"
+
+#~ msgid "Finish"
+#~ msgstr "Finish"
+
+#~ msgid "Back - Sending"
+#~ msgstr "Back — Sending"
+
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "Set up Google Contacts with Evolution"
+
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "Set up Google Calendar with Evolution"
+
+#~ msgid "Google account settings:"
+#~ msgstr "Google account settings:"
+
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "Setup Yahoo calendar with Evolution"
+
+#~ msgid ""
+#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. So please confirm and re-enter the calendar name if it "
+#~ "is not correct."
+#~ msgstr ""
+#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. So please confirm and re-enter the calendar name if it "
+#~ "is not correct."
+
+#~ msgid "Yahoo account settings:"
+#~ msgstr "Yahoo account settings:"
+
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "Yahoo Calendar name:"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#~ msgid "Close Tab"
+#~ msgstr "Close Tab"
+
+#~ msgid "Account Wizard"
+#~ msgstr "Account Wizard"
+
+#~ msgid "Evolution account assistant"
+#~ msgstr "Evolution account assistant"
+
+#~ msgid "On This Computer"
+#~ msgstr "On This Computer"
+
+#~ msgid "Modify %s..."
+#~ msgstr "Modify %s…"
+
+#~ msgid "Add a new account"
+#~ msgstr "Add a new account"
+
+#~ msgid "Account management"
+#~ msgstr "Account management"
+
+#~ msgid "Settings"
+#~ msgstr "Settings"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Undo the last action"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Redo the last undone action"
+
+#~ msgid "Search for text"
+#~ msgstr "Search for text"
+
+#~ msgid "Search for and replace text"
+#~ msgstr "Search for and replace text"
+
+#~ msgid "List of selected calendars"
+#~ msgstr "List of selected calendars"
+
+#~ msgid "List of calendars to load"
+#~ msgstr "List of calendars to load"
+
+#~ msgid "List of selected memo lists"
+#~ msgstr "List of selected memo lists"
+
+#~ msgid "List of memo lists to load"
+#~ msgstr "List of memo lists to load"
+
+#~ msgid "List of selected task lists"
+#~ msgstr "List of selected task lists"
+
+#~ msgid "List of task lists to load"
+#~ msgstr "List of task lists to load"
+
+#~ msgid "Configuration version"
+#~ msgstr "Configuration version"
+
+#~ msgid ""
+#~ "The configuration version of Evolution, with major/minor/configuration "
+#~ "level (for example \"2.6.0\")."
+#~ msgstr ""
+#~ "The configuration version of Evolution, with major/minor/configuration "
+#~ "level (for example \"2.6.0\")."
+
+#~ msgid "Last upgraded configuration version"
+#~ msgstr "Last upgraded configuration version"
+
+#~ msgid ""
+#~ "The last upgraded configuration version of Evolution, with major/minor/"
+#~ "configuration level (for example \"2.6.0\")."
+#~ msgstr ""
+#~ "The last upgraded configuration version of Evolution, with major/minor/"
+#~ "configuration level (for example \"2.6.0\")."
+
+#~ msgid "Enable local folders"
+#~ msgstr "Enable local folders"
+
+#~ msgid "Enable search folders on startup."
+#~ msgstr "Enable search folders on startup."
+
+#~ msgid "Display only message texts not exceeding certain size"
+#~ msgstr "Display only message texts not exceeding certain size"
+
+#~ msgid ""
+#~ "Enable to display only message texts not exceeding size defined in "
+#~ "'message_text_part_limit' key."
+#~ msgstr ""
+#~ "Enable display only of message texts not exceeding size defined in "
+#~ "'message_text_part_limit' key."
+
+#~ msgid "Message text limit for display"
+#~ msgstr "Message text limit for display"
+
+#~ msgid ""
+#~ "This decides the max size of the message text that will be displayed "
+#~ "under Evolution, specified in terms of KB. The default is 4096 (4MB). "
+#~ "This value is used only when 'force_message_limit' key is activated."
+#~ msgstr ""
+#~ "This decides the maximum size of the message text that will be displayed "
+#~ "under Evolution, specified in terms of KB. The default is 4096 (4MB). "
+#~ "This value is used only when the 'force_message_limit' key is activated."
+
+#~ msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+#~ msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
+
+#~ msgid "Play sound when new messages arrive."
+#~ msgstr "Play sound when new messages arrive."
+
+#~ msgid ""
+#~ "If \"true\", then beep, otherwise will play sound file when new messages "
+#~ "arrive."
+#~ msgstr ""
+#~ "If \"true\", then beep, otherwise will play sound file when new messages "
+#~ "arrive."
+
+#~ msgid "FIXME"
+#~ msgstr "FIXME"
+
+#~ msgid "Could not parse S/MIME message: Unknown error"
+#~ msgstr "Could not parse S/MIME message: Unknown error"
+
+#~ msgid "Could not parse PGP/MIME message: Unknown error"
+#~ msgstr "Could not parse PGP/MIME message: Unknown error"
+
+#~ msgid "Unknown error verifying signature"
+#~ msgstr "Unknown error verifying signature"
+
+#~ msgid "If all conditions are met"
+#~ msgstr "If all conditions are met"
+
+#~ msgid "If any conditions are met"
+#~ msgstr "If any conditions are met"
+
+#~ msgid "Enter Passphrase for %s"
+#~ msgstr "Enter Passphrase for %s"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "Enter Passphrase"
+
+#~ msgid "Enter Password for %s"
+#~ msgstr "Enter Password for %s"
+
+#~ msgid "Enter Password"
+#~ msgstr "Enter Password"
+
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "Cannot get transport for account '%s'"
+
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "Unsubscribing from folder '%s'"
+
+#~ msgid "Refreshing folder '%s'"
+#~ msgstr "Refreshing folder '%s'"
+
+#~ msgid "Expunging folder '%s'"
+#~ msgstr "Expunging folder '%s'"
+
+#~ msgid "Disconnecting %s"
+#~ msgstr "Disconnecting %s"
+
+#~ msgctxt "mail-signature"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "Fil_e:"
+#~ msgstr "Fil_e:"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Mail Configuration"
+
+#~ msgid "Please configure the following account settings."
+#~ msgstr "Please configure the following account settings."
+
+#~ msgid ""
+#~ "Please enter information about the way you will send mail. If you are not "
+#~ "sure, ask your system administrator or Internet Service Provider."
+#~ msgstr ""
+#~ "Please enter information about the way you will send mail. If you are not "
+#~ "sure, ask your system administrator or Internet Service Provider."
+
+#~ msgid "minu_tes"
+#~ msgstr "minu_tes"
+
+#~ msgid "Checking for New Messages"
+#~ msgstr "Checking for New Messages"
+
+#~ msgid "Setup Google con_tacts with Evolution"
+#~ msgstr "Setup Google con_tacts with Evolution"
+
+#~ msgid "Setup Google ca_lendar with Evolution"
+#~ msgstr "Setup Google ca_lendar with Evolution"
+
+#~ msgid "Setup _Yahoo calendar with Evolution"
+#~ msgstr "Setup _Yahoo calendar with Evolution"
+
+#~ msgid "Yahoo Calen_dar name:"
+#~ msgstr "Yahoo Calen_dar name:"
+
+#~ msgid "Create R_ule"
+#~ msgstr "Create R_ule"
+
+#~ msgid "Formatting Message..."
+#~ msgstr "Formatting Message…"
+
+#~ msgid "Retrieving '%s'"
+#~ msgstr "Retrieving '%s'"
+
+#~ msgid "Unknown external-body part."
+#~ msgstr "Unknown external-body part."
+
+#~ msgid ""
+#~ "Evolution cannot render this email as it is too large to process. You can "
+#~ "view it unformatted or with an external text editor."
+#~ msgstr ""
+#~ "Evolution cannot render this e-mail as it is too large to process. You "
+#~ "can view it unformatted or with an external text editor."
+
+#~ msgid "Completed on"
+#~ msgstr "Completed on"
+
+#~ msgid "Overdue:"
+#~ msgstr "Overdue:"
+
+#~ msgid "by"
+#~ msgstr "by"
+
+#~ msgid "View _Unformatted"
+#~ msgstr "View _Unformatted"
+
+#~ msgid "Hide _Unformatted"
+#~ msgstr "Hide _Unformatted"
+
+#~ msgid "O_pen With"
+#~ msgstr "O_pen With"
+
+#~ msgctxt "Button"
+#~ msgid "Attachment"
+#~ msgstr "Attachment"
+
+#~ msgid "No HTML stream available"
+#~ msgstr "No HTML stream available"
+
+#~ msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#~ msgstr ""
+#~ "Digitally sign messages when original message signed (PGP or S/MIME)"
+
+#~ msgid "Composer Window default width"
+#~ msgstr "Composer Window default width"
+
+#~ msgid "Default width of the Composer Window."
+#~ msgstr "Default width of the Composer Window."
+
+#~ msgid "Composer Window default height"
+#~ msgstr "Composer Window default height"
+
+#~ msgid "Default height of the Composer Window."
+#~ msgstr "Default height of the Composer Window."
+
+#~ msgid "Attribute message."
+#~ msgstr "Attribute message."
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message, attributing the "
+#~ "message to the original author."
+#~ msgstr ""
+#~ "The text that is inserted when replying to a message, attributing the "
+#~ "message to the original author."
+
+#~ msgid "Forward message."
+#~ msgstr "Forward message."
+
+#~ msgid ""
+#~ "The text that is inserted when forwarding a message, saying that the "
+#~ "forwarded message follows."
+#~ msgstr ""
+#~ "The text that is inserted when forwarding a message, saying that the "
+#~ "forwarded message follows."
+
+#~ msgid "Original message."
+#~ msgstr "Original message."
+
+#~ msgid ""
+#~ "The text that is inserted when replying to a message (top posting), "
+#~ "saying that the original message follows."
+#~ msgstr ""
+#~ "The text that is inserted when replying to a message (top posting), "
+#~ "saying that the original message follows."
+
+#~ msgid ""
+#~ "This value can be an empty string, which means it'll use the system "
+#~ "Picture folder, usually set to ~/Pictures. This folder will be also used "
+#~ "when the set path is not pointing to the existent folder."
+#~ msgstr ""
+#~ "This value can be an empty string, which means it'll use the system "
+#~ "Picture folder, usually set to ~/Pictures. This folder will be also used "
+#~ "when the set path is not pointing to the existent folder."
+
+#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
+#~ msgstr "Whether to show local folders (On This Computer) in a folder tree."
+
+#~ msgid ""
+#~ "This setting specifies whether the threads should be in expanded or "
+#~ "collapsed state by default. Requires a restart to apply."
+#~ msgstr ""
+#~ "This setting specifies whether the threads should be in expanded or "
+#~ "collapsed state by default. Requires a restart to apply."
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded \"1\" = collapsed"
+#~ msgstr ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded \"1\" = collapsed"
+
+#~ msgid ""
+#~ "Tells how to sort accounts in a folder tree used in a Mail view. When set "
+#~ "to true accounts are sorted alphabetically, with an exception of On This "
+#~ "Computer and Search folders, otherwise accounts are sorted based on an "
+#~ "order given by a user."
+#~ msgstr ""
+#~ "Tells how to sort accounts in a folder tree used in a Mail view. When set "
+#~ "to true accounts are sorted alphabetically, with an exception of On This "
+#~ "Computer and Search folders, otherwise accounts are sorted based on an "
+#~ "order given by a user."
+
+#~ msgid "Mail browser width"
+#~ msgstr "Mail browser width"
+
+#~ msgid "Default width of the mail browser window."
+#~ msgstr "Default width of the mail browser window."
+
+#~ msgid "Mail browser height"
+#~ msgstr "Mail browser height"
+
+#~ msgid "Default height of the mail browser window."
+#~ msgstr "Default height of the mail browser window."
+
+#~ msgid "Mail browser maximized"
+#~ msgstr "Mail browser maximised"
+
+#~ msgid "Default maximized state of the mail browser window."
+#~ msgstr "Default maximised state of the mail browser window."
+
+#~ msgid "\"Folder Subscriptions\" window height"
+#~ msgstr "\"Folder Subscriptions\" window height"
+
+#~ msgid ""
+#~ "Initial height of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Initial height of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window vertically."
+
+#~ msgid "\"Folder Subscriptions\" window maximize state"
+#~ msgstr "\"Folder Subscriptions\" window maximise state"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Folder Subscriptions\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Folder Subscriptions"
+#~ "\" window cannot be maximized. This key exists only as an implementation "
+#~ "detail."
+#~ msgstr ""
+#~ "Initial maximise state of the \"Folder Subscriptions\" window. The value "
+#~ "updates when the user maximises or unmaximises the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Folder Subscriptions"
+#~ "\" window cannot be maximised. This key exists only as an implementation "
+#~ "detail."
+
+#~ msgid "\"Folder Subscriptions\" window width"
+#~ msgstr "\"Folder Subscriptions\" window width"
+
+#~ msgid ""
+#~ "Initial width of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Initial width of the \"Folder Subscriptions\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+
+#~ msgid "Default reply style"
+#~ msgstr "Default reply style"
+
+#~ msgid ""
+#~ "Possible values are: never - to never close browser window always - to "
+#~ "always close browser window ask - (or any other value) will ask user"
+#~ msgstr ""
+#~ "Possible values are: never — to never close browser window; always — to "
+#~ "always close browser window; ask — (or any other value) will ask user"
+
+#~ msgid "List of accounts"
+#~ msgstr "List of accounts"
+
+#~ msgid ""
+#~ "List of accounts known to the mail component of Evolution. The list "
+#~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
+#~ "accounts."
+#~ msgstr ""
+#~ "List of accounts known to the mail component of Evolution. The list "
+#~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
+#~ "accounts."
+
+#~ msgid "List of accepted licenses"
+#~ msgstr "List of accepted licences"
+
+#~ msgid "List of protocol names whose license has been accepted."
+#~ msgstr "List of protocol names whose licence has been accepted."
+
+#~ msgid "\"Filter Editor\" window height"
+#~ msgstr "\"Filter Editor\" window height"
+
+#~ msgid ""
+#~ "Initial height of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window vertically."
+#~ msgstr ""
+#~ "Initial height of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window vertically."
+
+#~ msgid "\"Filter Editor\" window maximize state"
+#~ msgstr "\"Filter Editor\" window maximise state"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#~ "when the user maximizes or unmaximizes the window. Note, this particular "
+#~ "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#~ "be maximized. This key exists only as an implementation detail."
+#~ msgstr ""
+#~ "Initial maximise state of the \"Filter Editor\" window. The value updates "
+#~ "when the user maximises or unmaximises the window. Note, this particular "
+#~ "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#~ "be maximised. This key exists only as an implementation detail."
+
+#~ msgid "\"Filter Editor\" window width"
+#~ msgstr "\"Filter Editor\" window width"
+
+#~ msgid ""
+#~ "Initial width of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window horizontally."
+#~ msgstr ""
+#~ "Initial width of the \"Filter Editor\" window. The value updates as the "
+#~ "user resizes the window horizontally."
+
+#~ msgid ""
+#~ "Whether check for new messages when Evolution is started. This includes "
+#~ "also sending messages from Outbox."
+#~ msgstr ""
+#~ "Whether to check for new messages when Evolution is started. This "
+#~ "includes also sending messages from the Outbox."
+
+#~ msgid ""
+#~ "Whether check for new messages in all active accounts regardless of the "
+#~ "account \"Check for new messages every X minutes\" option when Evolution "
+#~ "is started. This option is used only together with 'send_recv_on_start' "
+#~ "option."
+#~ msgstr ""
+#~ "Whether to check for new messages in all active accounts regardless of "
+#~ "the account's \"Check for new messages every X minutes\" option when "
+#~ "Evolution is started. This option is used only together with "
+#~ "'send_recv_on_start' option."
+
+#~ msgid "\"Send and Receive Mail\" window height"
+#~ msgstr "\"Send and Receive Mail\" window height"
+
+#~ msgid ""
+#~ "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window vertically."
+
+#~ msgid "\"Send and Receive Mail\" window maximize state"
+#~ msgstr "\"Send and Receive Mail\" window maximise state"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Send and Receive Mail\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Send and Receive "
+#~ "Mail\" window cannot be maximized. This key exists only as an "
+#~ "implementation detail."
+#~ msgstr ""
+#~ "Initial maximise state of the \"Send and Receive Mail\" window. The value "
+#~ "updates when the user maximises or unmaximises the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Send and Receive "
+#~ "Mail\" window cannot be maximised. This key exists only as an "
+#~ "implementation detail."
+
+#~ msgid "\"Send and Receive Mail\" window width"
+#~ msgstr "\"Send and Receive Mail\" window width"
+
+#~ msgid ""
+#~ "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+
+#~ msgid "\"Search Folder Editor\" window height"
+#~ msgstr "\"Search Folder Editor\" window height"
+
+#~ msgid ""
+#~ "Initial height of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window vertically."
+#~ msgstr ""
+#~ "Initial height of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window vertically."
+
+#~ msgid "\"Search Folder Editor\" window maximize state"
+#~ msgstr "\"Search Folder Editor\" window maximise state"
+
+#~ msgid ""
+#~ "Initial maximize state of the \"Search Folder Editor\" window. The value "
+#~ "updates when the user maximizes or unmaximizes the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Search Folder Editor"
+#~ "\" window cannot be maximized. This key exists only as an implementation "
+#~ "detail."
+#~ msgstr ""
+#~ "Initial maximise state of the \"Search Folder Editor\" window. The value "
+#~ "updates when the user maximises or unmaximises the window. Note, this "
+#~ "particular value is not used by Evolution since the \"Search Folder Editor"
+#~ "\" window cannot be maximised. This key exists only as an implementation "
+#~ "detail."
+
+#~ msgid "\"Search Folder Editor\" window width"
+#~ msgstr "\"Search Folder Editor\" window width"
+
+#~ msgid ""
+#~ "Initial width of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+#~ msgstr ""
+#~ "Initial width of the \"Search Folder Editor\" window. The value updates "
+#~ "as the user resizes the window horizontally."
+
+#~ msgid "Drag'n'drop export format"
+#~ msgstr "Drag'n'drop export format"
+
+#~ msgid ""
+#~ "Define the email export format when doing drag'n'drop. Possible values "
+#~ "are mbox or pdf"
+#~ msgstr ""
+#~ "Define the email export format when doing drag'n'drop. Possible values "
+#~ "are mbox or pdf"
+
+#~ msgid "Format of the drag'n'drop export filename"
+#~ msgstr "Format of the drag'n'drop export filename"
+
+#~ msgid ""
+#~ "Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#~ "(: email sent date), 2 (: drag'n'drop date)"
+#~ msgstr ""
+#~ "Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 "
+#~ "(: email sent date), 2 (: drag'n'drop date)"
+
+#~ msgid "_Add Signature"
+#~ msgstr "_Add Signature"
+
+#~ 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. "
+
+#~ msgid "Drafts _Folder:"
+#~ msgstr "Drafts _Folder:"
+
+#~ msgid "_Trash Folder:"
+#~ msgstr "Wastebaske_t Folder:"
+
+#~ msgid "_Junk Folder:"
+#~ msgstr "_Junk Folder:"
+
+#~ msgid "Signat_ure:"
+#~ msgstr "Signat_ure:"
+
+#~ msgid "_Make this my default account"
+#~ msgstr "_Make this my default account"
+
+#~ msgid "Also encrypt to sel_f when sending encrypted messages"
+#~ msgstr "Also encrypt to sel_f when sending encrypted messages"
+
+#~ msgid "Encrypt out_going messages (by default)"
+#~ msgstr "Encrypt out_going messages (by default)"
+
+#~ msgid "Digitally sign o_utgoing messages (by default)"
+#~ msgstr "Digitally sign o_utgoing messages (by default)"
+
+#~ msgid "S_elect..."
+#~ msgstr "S_elect…"
+
+#~ msgid "Clea_r"
+#~ msgstr "Clea_r"
+
+#~ msgid "Cle_ar"
+#~ msgstr "Cle_ar"
+
+#~ msgid "description"
+#~ msgstr "description"
+
+#~ msgid "Mailbox location"
+#~ msgstr "Mailbox location"
+
+#~ msgid "_Use secure connection:"
+#~ msgstr "_Use secure connection:"
+
+#~ msgid "SSL is not supported in this build of Evolution"
+#~ msgstr "SSL is not supported in this build of Evolution"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "_Authentication Type"
+
+#~ msgid "Re_member password"
+#~ msgstr "Re_member password"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server Configuration"
+
+#~ msgid "User _Name:"
+#~ msgstr "User_name:"
+
+#~ msgid "Remember _password"
+#~ msgstr "Remember _password"
+
+#~ msgid "none"
+#~ msgstr "none"
+
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "Cannot set signature script \"{0}\"."
+#~ msgstr "Cannot set signature script \"{0}\"."
+
+#~ msgid "The script file must exist and be executable."
+#~ msgstr "The script file must exist and be executable."
+
+#  mail:gw-accountsetup-error primary
+#~ msgid "Unable to connect to the GroupWise server."
+#~ msgstr "Unable to connect to the GroupWise server."
+
+#  mail:gw-accountsetup-error secondary
+#~ msgid "Please check your account settings and try again."
+#~ msgstr "Please check your account settings and try again."
+
+#~ msgid "Signature Already Exists"
+#~ msgstr "Signature Already Exists"
+
+#~ msgid ""
+#~ "A signature already exists with the name \"{0}\". Please specify a "
+#~ "different name."
+#~ msgstr ""
+#~ "A signature already exists with the name \"{0}\". Please specify a "
+#~ "different name."
+
+#~ msgid ""
+#~ "No message satisfies your search criteria. Either clear search with "
+#~ "Search->Clear menu item or change it."
+#~ msgstr ""
+#~ "No message satisfies your search criteria. Either clear search with "
+#~ "Search → Clear menu item or change it."
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports SSL."
+#~ msgstr ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports SSL."
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports TLS."
+#~ msgstr ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports TLS."
+
+#~ msgid ""
+#~ "Selecting this option means that your server does not support either SSL "
+#~ "or TLS. This means that your connection will be insecure, and that you "
+#~ "will be vulnerable to security exploits."
+#~ msgstr ""
+#~ "Selecting this option means that your server does not support either SSL "
+#~ "or TLS. This means that your connection will be insecure, and that you "
+#~ "will be vulnerable to security exploits."
+
+#~ msgid ""
+#~ "This is the port on the LDAP server that Evolution will try to connect "
+#~ "to. A list of standard ports has been provided. Ask your system "
+#~ "administrator what port you should specify."
+#~ msgstr ""
+#~ "This is the port on the LDAP server that Evolution will try to connect "
+#~ "to. A list of standard ports has been provided. Ask your system "
+#~ "administrator what port you should specify."
+
+#~ msgid "EFolderList XML for the list of completion URIs"
+#~ msgstr "EFolderList XML for the list of completion URIs"
+
+#~ msgid "EFolderList XML for the list of completion URIs."
+#~ msgstr "EFolderList XML for the list of completion URIs."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") address book in the sidebar of "
+#~ "the \"Contacts\" view."
+#~ msgstr ""
+#~ "The UID of the selected (or \"primary\") address book in the sidebar of "
+#~ "the \"Contacts\" view."
+
+#~ msgid "Whether to show maps in preview pane."
+#~ msgstr "Whether to show maps in preview pane."
+
+#~ msgid ""
+#~ "Whether addresses should be formatted according to standard in their "
+#~ "destination country."
+#~ msgstr ""
+#~ "Whether addresses should be formatted according to standard in their "
+#~ "destination country."
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "On LDAP Servers"
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#~ "\"Calendar\" view."
+#~ msgstr ""
+#~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#~ "\"Calendar\" view."
+
+#~ msgid ""
+#~ "The default timezone to use for dates and times in the calendar, as an "
+#~ "untranslated Olsen timezone database location like \"America/New York\"."
+#~ msgstr ""
+#~ "The default timezone to use for dates and times in the calendar, as an "
+#~ "untranslated Olsen timezone database location like \"America/New York\"."
+
+#~ msgid ""
+#~ "Use the system timezone instead of the timezone selected in Evolution."
+#~ msgstr ""
+#~ "Use the system timezone instead of the timezone selected in Evolution."
+
+#~ msgid ""
+#~ "Shows the second time zone in a Day View, if set. Value is similar to one "
+#~ "used in a 'timezone' key."
+#~ msgstr ""
+#~ "Shows the second time zone in a Day View, if set. Value is similar to one "
+#~ "used in a 'timezone' key."
+
+#~ msgid "List of recently used second time zones in a Day View."
+#~ msgstr "List of recently used second time zones in a Day View."
+
+#~ msgid "Maximum number of recently used timezones to remember."
+#~ msgstr "Maximum number of recently used timezones to remember."
+
+#~ msgid ""
+#~ "Maximum number of recently used timezones to remember in a "
+#~ "'day_second_zones' list."
+#~ msgstr ""
+#~ "Maximum number of recently used timezones to remember in a "
+#~ "'day_second_zones' list."
+
+#~ msgid ""
+#~ "Whether to show times in twenty four hour format instead of using am/pm."
+#~ msgstr ""
+#~ "Whether to show times in twenty four hour format instead of using am/pm."
+
+#~ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+#~ msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+
+#~ msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+#~ msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
+
+#~ msgid "Intervals shown in Day and Work Week views, in minutes."
+#~ msgstr "Intervals shown in Day and Work Week views, in minutes."
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the date navigator calendar and "
+#~ "the task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "Position of the horizontal pane, between the date navigator calendar and "
+#~ "the task list when not in the month view, in pixels."
+
+#~ msgid "Vertical pane position"
+#~ msgstr "Vertical pane position"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list when not in the month view, in pixels."
+#~ msgstr ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list when not in the month view, in pixels."
+
+#~ msgid ""
+#~ "Position of the horizontal pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "Position of the horizontal pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+#~ msgstr ""
+#~ "Position of the vertical pane, between the view and the date navigator "
+#~ "calendar and task list in the month view, in pixels."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the calendar lists and the date "
+#~ "navigator calendar."
+#~ msgstr ""
+#~ "Position of the vertical pane, between the calendar lists and the date "
+#~ "navigator calendar."
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#~ "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#~ "list."
+#~ msgstr ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#~ "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#~ "list."
+
+#~ msgid "If \"true\", show the memo preview pane in the main window."
+#~ msgstr "If \"true\", show the memo preview pane in the main window."
+
+#~ msgid "Position of the task preview pane when oriented horizontally."
+#~ msgstr "Position of the task preview pane when oriented horizontally."
+
+#~ msgid "Position of the memo preview pane when oriented vertically."
+#~ msgstr "Position of the memo preview pane when oriented vertically."
+
+#~ msgid ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the task list. \"0\" (Classic View) places the preview pane below the "
+#~ "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#~ "list."
+#~ msgstr ""
+#~ "The layout style determines where to place the preview pane in relation "
+#~ "to the task list. \"0\" (Classic View) places the preview pane below the "
+#~ "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#~ "list."
+
+#~ msgid "If \"true\", show the task preview pane in the main window."
+#~ msgstr "If \"true\", show the task preview pane in the main window."
+
+#~ msgid "Position of the task preview pane when oriented vertically."
+#~ msgstr "Position of the task preview pane when oriented vertically."
+
+#~ msgid ""
+#~ "Whether to compress weekends in the month view, which puts Saturday and "
+#~ "Sunday in the space of one weekday."
+#~ msgstr ""
+#~ "Whether to compress weekends in the month view, which puts Saturday and "
+#~ "Sunday in the space of one weekday."
+
+#~ msgid ""
+#~ "Whether to display the end time of events in the week and month views."
+#~ msgstr ""
+#~ "Whether to display the end time of events in the week and month views."
+
+#~ msgid "Days on which the start and end of work hours should be indicated."
+#~ msgstr "Days on which the start and end of work hours should be indicated."
+
+#~ msgid ""
+#~ "Whether to draw the Marcus Bains Line (line at current time) in the "
+#~ "calendar."
+#~ msgstr ""
+#~ "Whether to draw the Marcus Bains Line (line at current time) in the "
+#~ "calendar."
+
+#~ msgid "Color to draw the Marcus Bains line in the Day View."
+#~ msgstr "Colour to draw the Marcus Bains line in the Day View."
+
+#~ msgid ""
+#~ "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#~ msgstr ""
+#~ "Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
+
+#~ msgid ""
+#~ "Show days with recurrent events in italic font in bottom left calendar."
+#~ msgstr ""
+#~ "Show days with recurrent events in italic font in bottom left calendar."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#~ "\"Memos\" view."
+#~ msgstr ""
+#~ "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#~ "\"Memos\" view."
+
+#~ msgid ""
+#~ "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#~ "\"Tasks\" view."
+#~ msgstr ""
+#~ "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#~ "\"Tasks\" view."
+
+#~ msgid "Whether to hide completed tasks in the tasks view."
+#~ msgstr "Whether to hide completed tasks in the tasks view."
+
+#~ msgid ""
+#~ "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#~ "\"."
+#~ msgstr ""
+#~ "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#~ "\"."
+
+#~ msgid "Number of units for determining when to hide tasks."
+#~ msgstr "Number of units for determining when to hide tasks."
+
+#~ msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+#~ msgstr ""
+#~ "Background colour of tasks that are due today, in \"#rrggbb\" format."
+
+#~ msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+#~ msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when deleting an appointment or task."
+#~ msgstr ""
+#~ "Whether to ask for confirmation when deleting an appointment or task."
+
+#~ msgid ""
+#~ "Whether to ask for confirmation when expunging appointments and tasks."
+#~ msgstr ""
+#~ "Whether to ask for confirmation when expunging appointments and tasks."
+
+#~ msgid "Whether to set a default reminder for appointments."
+#~ msgstr "Whether to set a default reminder for appointments."
+
+#~ msgid "Number of units for determining a default reminder."
+#~ msgstr "Number of units for determining a default reminder."
+
+#~ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+#~ msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+
+#~ msgid "Whether to set a reminder for birthdays and anniversaries."
+#~ msgstr "Whether to set a reminder for birthdays and anniversaries."
+
+#~ msgid "Number of units for determining a birthday or anniversary reminder."
+#~ msgstr "Number of units for determining a birthday or anniversary reminder."
+
+#~ msgid ""
+#~ "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#~ "\"days\"."
+#~ msgstr ""
+#~ "Units for a birthday or anniversary reminder: \"minutes\", \"hours\" or "
+#~ "\"days\"."
+
+#~ msgid "Whether to show week numbers in various places in the Calendar."
+#~ msgstr "Whether to show week numbers in various places in the Calendar."
+
+#~ msgid "Scroll Month View by a week"
+#~ msgstr "Scroll Month View by a week"
+
+#~ msgid "Whether to scroll a Month View by a week, not by a month."
+#~ msgstr "Whether to scroll a Month View by a week, not by a month."
+
+#~ msgid "Time the last reminder ran, in time_t."
+#~ msgstr "Time the last reminder ran, in time_t."
+
+#~ msgid "Calendars to run reminders for"
+#~ msgstr "Calendars to run reminders for"
+
+#~ msgid "Programs that are allowed to be run by reminders."
+#~ msgstr "Programs that are allowed to be run by reminders."
+
+#~ msgid "Whether or not to use the notification tray for display reminders."
+#~ msgstr "Whether or not to use the notification tray for display reminders."
+
+#~ msgid "Free/busy server URLs"
+#~ msgstr "Free/busy server URLs"
+
+#~ msgid ""
+#~ "The URL template to use as a free/busy data fallback, %u is replaced by "
+#~ "the user part of the mail address and %d is replaced by the domain."
+#~ msgstr ""
+#~ "The URL template to use as a free/busy data fallback, %u is replaced by "
+#~ "the user part of the mail address and %d is replaced by the domain."
+
+#~ msgid ""
+#~ "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+#~ "debug messages."
+#~ msgstr ""
+#~ "This can have three possible values: 0 for errors, 1 for warnings, 2 for "
+#~ "debug messages."
+
+#~ msgid "On The Web"
+#~ msgstr "On The Web"
+
+#~ msgid "Weather"
+#~ msgstr "Weather"
+
+#~ msgid "Birthdays & Anniversaries"
+#~ msgstr "Birthdays & Anniversaries"
+
+#~ msgid "_New Calendar..."
+#~ msgstr "_New Calendar…"
+
+#~ msgid "Recent Messages"
+#~ msgstr "Recent Messages"
+
+#~ msgid "Python Test Plugin"
+#~ msgstr "Python Test Plugin"
+
+#~ msgid "Test Plugin for Python EPlugin loader."
+#~ msgstr "Test Plugin for Python EPlugin loader."
+
+#~ msgid "Python Plugin Loader tests"
+#~ msgstr "Python Plugin Loader tests"
+
+#~ msgid "Evolution Setup Assistant"
+#~ msgstr "Evolution Setup Assistant"
+
+#~ msgid "Local Address Books"
+#~ msgstr "Local Address Books"
+
+#~ msgid "Add local address books to Evolution."
+#~ msgstr "Add local address books to Evolution."
+
+#~ msgid "Inline Audio"
+#~ msgstr "Inline Audio"
+
+#~ msgid "Play audio attachments directly in mail messages."
+#~ msgstr "Play audio attachments directly in mail messages."
+
+#~ msgid "Ensuring local sources"
+#~ msgstr "Ensuring local sources"
+
+#~ msgid "_Restore Evolution from the backup file"
+#~ msgstr "_Restore Evolution from the backup file"
+
+#~ msgid "Please select an Evolution Archive to restore:"
+#~ msgstr "Please select an Evolution Archive to restore:"
+
+#~ msgid "Back up and Restore"
+#~ msgstr "Backup and Restore"
+
+#~ msgid "Back up and restore your Evolution data and settings."
+#~ msgstr "Back up and restore your Evolution data and settings."
+
+#~ msgid "Authentication failed. Server requires correct login."
+#~ msgstr "Authentication failed. Server requires correct login."
+
+#~ msgid "Given URL cannot be found."
+#~ msgstr "Given URL cannot be found."
+
+#~ msgid ""
+#~ "Server returned unexpected data.\n"
+#~ "%d - %s"
+#~ msgstr ""
+#~ "Server returned unexpected data.\n"
+#~ "%d - %s"
+
+#~ msgid "Failed to parse server response."
+#~ msgstr "Failed to parse server response."
+
+#~ msgid "Events"
+#~ msgstr "Events"
+
+#~ msgid "User's calendars"
+#~ msgstr "User's calendars"
+
+#~ msgid "Failed to get server URL."
+#~ msgstr "Failed to get server URL."
+
+#~ msgid "Searching for user's calendars..."
+#~ msgstr "Searching for user's calendars…"
+
+#~ msgid "Previous attempt failed: %s"
+#~ msgstr "Previous attempt failed: %s"
+
+#~ msgid "Previous attempt failed with code %d"
+#~ msgstr "Previous attempt failed with code %d"
+
+#~ msgid "Enter password for user %s on server %s"
+#~ msgstr "Enter password for user %s on server %s"
+
+#~ msgid "Cannot create soup message for URL '%s'"
+#~ msgstr "Cannot create soup message for URL '%s'"
+
+#~ msgid "Searching folder content..."
+#~ msgstr "Searching folder contents…"
+
+#~ msgid "List of available calendars:"
+#~ msgstr "List of available calendars:"
+
+#~ msgid "Supports"
+#~ msgstr "Supports"
+
+#~ msgid "User e_mail:"
+#~ msgstr "User e-_mail:"
+
+#~ msgid "Failed to create thread: %s"
+#~ msgstr "Failed to create thread: %s"
+
+#~ msgid "Server URL '%s' is not a valid URL"
+#~ msgstr "Server URL '%s' is not a valid URL"
+
+#~ msgid "Browse for a CalDAV calendar"
+#~ msgstr "Browse for a CalDAV calendar"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Brows_e server for a calendar"
+#~ msgstr "Brows_e server for a calendar"
+
+#~ msgid "Re_fresh:"
+#~ msgstr "Re_fresh:"
+
+#~ msgid "CalDAV Support"
+#~ msgstr "CalDAV Support"
+
+#~ msgid "Add CalDAV support to Evolution."
+#~ msgstr "Add CalDAV support to Evolution."
+
+#~ msgid "C_ustomize options"
+#~ msgstr "C_ustomise options"
+
+#~ msgid "On open"
+#~ msgstr "On open"
+
+#~ msgid "On file change"
+#~ msgstr "On file change"
+
+#~ msgid "Periodically"
+#~ msgstr "Periodically"
+
+#~ msgid "Force read _only"
+#~ msgstr "Force read _only"
+
+#~ msgid "Local Calendars"
+#~ msgstr "Local Calendars"
+
+#~ msgid "Add local calendars to Evolution."
+#~ msgstr "Add local calendars to Evolution."
+
+#~ msgid "Userna_me:"
+#~ msgstr "Userna_me:"
+
+#~ msgid "Web Calendars"
+#~ msgstr "Web Calendars"
+
+#~ msgid "Add web calendars to Evolution."
+#~ msgstr "Add web calendars to Evolution."
+
+#~ msgid "Weather: Fog"
+#~ msgstr "Weather: Fog"
+
+#~ msgid "Weather: Cloudy"
+#~ msgstr "Weather: Cloudy"
+
+#~ msgid "Weather: Cloudy Night"
+#~ msgstr "Weather: Cloudy Night"
+
+#~ msgid "Weather: Overcast"
+#~ msgstr "Weather: Overcast"
+
+#~ msgid "Weather: Showers"
+#~ msgstr "Weather: Showers"
+
+#~ msgid "Weather: Snow"
+#~ msgstr "Weather: Snow"
+
+#~ msgid "Weather: Sunny"
+#~ msgstr "Weather: Sunny"
+
+#~ msgid "Weather: Clear Night"
+#~ msgstr "Weather: Clear Night"
+
+#~ msgid "Weather: Thunderstorms"
+#~ msgstr "Weather: Thunderstorms"
+
+#~ msgid "Select a location"
+#~ msgstr "Select a location"
+
+#~ msgctxt "weather-cal-location"
+#~ msgid "None"
+#~ msgstr "None"
+
+#~ msgid "_Units:"
+#~ msgstr "_Units:"
+
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "Metric (Celsius, cm, etc)"
+
+#~ msgid "Imperial (Fahrenheit, inches, etc)"
+#~ msgstr "Imperial (Fahrenheit, inches, etc)"
+
+#~ msgid "Weather Calendars"
+#~ msgstr "Weather Calendars"
+
+#~ msgid "Add weather calendars to Evolution."
+#~ msgstr "Add weather calendars to Evolution."
+
+#~ msgid "Default Sources"
+#~ msgstr "Default Sources"
+
+#~ msgid "Mark your preferred address book and calendar as default."
+#~ msgstr "Mark your preferred address book and calendar as default."
+
+#~ msgid "Automatically launch editor when key is pressed in the mail composer"
+#~ msgstr ""
+#~ "Automatically launch editor when key is pressed in the mail composer"
+
+#~ msgid "Server"
+#~ msgstr "Server"
+
+#~ msgid "Enter password for user %s to access list of subscribed calendars."
+#~ msgstr "Enter password for user %s to access list of subscribed calendars."
+
+#~ msgid ""
+#~ "Cannot read data from Google server.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Cannot read data from Google server.\n"
+#~ "%s"
+
+#~ msgid "Cal_endar:"
+#~ msgstr "Cal_endar:"
+
+#~ msgid "Retrieve _List"
+#~ msgstr "Retrieve _List"
+
+#~ msgid "Google Calendars"
+#~ msgstr "Google Calendars"
+
+#~ msgid ""
+#~ "Select your IMAP Header Preferences. \n"
+#~ "The more headers you have the more time it will take to download."
+#~ msgstr ""
+#~ "Select your IMAP Header Preferences. \n"
+#~ "The more headers you have the more time it will take to download."
+
+#~ msgid ""
+#~ "Give the extra headers that you need to fetch in addition to the above "
+#~ "standard headers. \n"
+#~ "You can ignore this if you choose \"All Headers\"."
+#~ msgstr ""
+#~ "Give the extra headers that you need to fetch in addition to the above "
+#~ "standard headers. \n"
+#~ "You can ignore this if you choose \"All Headers\"."
+
+#~ msgid "Fine-tune your IMAP accounts."
+#~ msgstr "Fine-tune your IMAP accounts."
+
+#~ msgid ""
+#~ "You have received %d new message\n"
+#~ "in %s."
+#~ msgid_plural ""
+#~ "You have received %d new messages\n"
+#~ "in %s."
+#~ msgstr[0] ""
+#~ "You have received %d new message\n"
+#~ "in %s."
+#~ msgstr[1] ""
+#~ "You have received %d new messages\n"
+#~ "in %s."
+
+#~ msgid "New email"
+#~ msgstr "New e-mail"
+
+#~ msgid "Cannot get source list. %s"
+#~ msgstr "Cannot get source list. %s"
+
+#~ msgid "Create an _Event"
+#~ msgstr "Create an _Event"
+
+#~ msgid "TNEF Decoder"
+#~ msgstr "TNEF Decoder"
+
+#~ msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+#~ msgstr "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+
+#~ msgid "Inline vCards"
+#~ msgstr "Inline vCards"
+
+#~ msgid "Show vCards directly in mail messages."
+#~ msgstr "Show vCards directly in mail messages."
+
+#~ msgid "WebDAV contacts"
+#~ msgstr "WebDAV contacts"
+
+#~ msgid "Add WebDAV contacts to Evolution."
+#~ msgstr "Add WebDAV contacts to Evolution."
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
+#~ msgid ""
+#~ "List of paths for the folders to be synchronized to disk for offline usage"
+#~ msgstr ""
+#~ "List of paths for the folders to be synchronised to disk for offline usage"
+
+#~ msgid "Default window Y coordinate"
+#~ msgstr "Default window Y coordinate"
+
+#~ msgid "The default Y coordinate for the main window."
+#~ msgstr "The default Y coordinate for the main window."
+
+#~ msgid "Default window X coordinate"
+#~ msgstr "Default window X coordinate"
+
+#~ msgid "The default X coordinate for the main window."
+#~ msgstr "The default X coordinate for the main window."
+
+#~ msgid "Default window width"
+#~ msgstr "Default window width"
+
+#~ msgid "The default width for the main window, in pixels."
+#~ msgstr "The default width for the main window, in pixels."
+
+#~ msgid "Default window height"
+#~ msgstr "Default window height"
+
+#~ msgid "The default height for the main window, in pixels."
+#~ msgstr "The default height for the main window, in pixels."
+
+#~ msgid "Default window state"
+#~ msgstr "Default window state"
+
+#~ msgid "Whether or not the window should be maximized."
+#~ msgstr "Whether the window should be maximised."
+
+#~ msgid "Proxy configuration mode"
+#~ msgstr "Proxy configuration mode"
+
+#~ msgid ""
+#~ "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+#~ "representing \"use system settings\", \"no proxy\", \"use manual proxy "
+#~ "configuration\" and \"use proxy configuration provided in the autoconfig "
+#~ "url\" respectively."
+#~ msgstr ""
+#~ "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+#~ "representing \"use system settings\", \"no proxy\", \"use manual proxy "
+#~ "configuration\" and \"use proxy configuration provided in the autoconfig "
+#~ "URL\" respectively."
+
+#~ msgid "HTTP proxy port"
+#~ msgstr "HTTP proxy port"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "http_host\" that you proxy through."
+#~ msgstr ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "http_host\" that you proxy through."
+
+#~ msgid "HTTP proxy host name"
+#~ msgstr "HTTP proxy host name"
+
+#~ msgid "The machine name to proxy HTTP through."
+#~ msgstr "The machine name to proxy HTTP through."
+
+#~ msgid "Secure HTTP proxy port"
+#~ msgstr "Secure HTTP proxy port"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "secure_host\" that you proxy through."
+#~ msgstr ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "secure_host\" that you proxy through."
+
+#~ msgid "Secure HTTP proxy host name"
+#~ msgstr "Secure HTTP proxy host name"
+
+#~ msgid "The machine name to proxy secure HTTP through."
+#~ msgstr "The machine name to proxy secure HTTP through."
+
+#~ msgid "SOCKS proxy port"
+#~ msgstr "SOCKS proxy port"
+
+#~ msgid ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "socks_host\" that you proxy through."
+#~ msgstr ""
+#~ "The port on the machine defined by \"/apps/evolution/shell/network_config/"
+#~ "socks_host\" that you proxy through."
+
+#~ msgid "SOCKS proxy host name"
+#~ msgstr "SOCKS proxy host name"
+
+#~ msgid "The machine name to proxy socks through."
+#~ msgstr "The machine name to proxy socks through."
+
+#~ msgid "Use HTTP proxy"
+#~ msgstr "Use HTTP proxy"
+
+#~ msgid ""
+#~ "Enables the proxy settings when accessing HTTP/Secure HTTP over the "
+#~ "Internet."
+#~ msgstr ""
+#~ "Enables the proxy settings when accessing HTTP/Secure HTTP over the "
+#~ "Internet."
+
+#~ msgid "Authenticate proxy server connections"
+#~ msgstr "Authenticate proxy server connections"
+
+#~ msgid ""
+#~ "If true, then connections to the proxy server require authentication. The "
+#~ "username is retrieved from the \"/apps/evolution/shell/network_config/"
+#~ "authentication_user\" GConf key, and the password is retrieved from "
+#~ "either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+#~ msgstr ""
+#~ "If true, then connections to the proxy server require authentication. The "
+#~ "username is retrieved from the \"/apps/evolution/shell/network_config/"
+#~ "authentication_user\" GConf key, and the password is retrieved from "
+#~ "either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+
+#~ msgid "HTTP proxy username"
+#~ msgstr "HTTP proxy username"
+
+#~ msgid "Username to pass as authentication when doing HTTP proxying."
+#~ msgstr "Username to pass as authentication when doing HTTP proxying."
+
+#~ msgid "HTTP proxy password"
+#~ msgstr "HTTP proxy password"
+
+#~ msgid "Password to pass as authentication when doing HTTP proxying."
+#~ msgstr "Password to pass as authentication when doing HTTP proxying."
+
+#~ msgid "Non-proxy hosts"
+#~ msgstr "Non-proxy hosts"
+
+#~ msgid ""
+#~ "This key contains a list of hosts which are connected to directly, rather "
+#~ "than via the proxy (if it is active). The values can be hostnames, "
+#~ "domains (using an initial wildcard like *.foo.com), IP host addresses "
+#~ "(both IPv4 and IPv6) and network addresses with a netmask (something like "
+#~ "192.168.0.0/24)."
+#~ msgstr ""
+#~ "This key contains a list of hosts which are connected to directly, rather "
+#~ "than via the proxy (if it is active). The values can be hostnames, "
+#~ "domains (using an initial wildcard like *.foo.com), IP host addresses "
+#~ "(both IPv4 and IPv6) and network addresses with a netmask (something like "
+#~ "192.168.0.0/24)."
+
+#~ msgid "Automatic proxy configuration URL"
+#~ msgstr "Automatic proxy configuration URL"
+
+#~ msgid "URL that provides proxy configuration values."
+#~ msgstr "URL that provides proxy configuration values."
+
+#~ msgid "_Forget Passwords"
+#~ msgstr "_Forget Passwords"
+
+#~ msgid "Forget all remembered passwords"
+#~ msgstr "Forget all remembered passwords"
+
+#~ msgid "Are you sure you want to forget all remembered passwords?"
+#~ msgstr "Are you sure you want to forget all remembered passwords?"
+
+#~ msgid ""
+#~ "Forgetting your passwords will clear all remembered passwords. You will "
+#~ "be reprompted next time they are needed."
+#~ msgstr ""
+#~ "Forgetting your passwords will clear all remembered passwords. You will "
+#~ "be reprompted next time they are needed."
+
+#~ msgid "_Forget"
+#~ msgstr "_Forget"
+
+#~ msgctxt "New"
+#~ msgid "_Test Item"
+#~ msgstr "_Test Item"
+
+#~ msgid "Create a new test item"
+#~ msgstr "Create a new test item"
+
+#~ msgctxt "New"
+#~ msgid "Test _Source"
+#~ msgstr "Test _Source"
+
+#~ msgid "Create a new test source"
+#~ msgstr "Create a new test source"
+
 #~ msgid "Recent _Documents"
 #~ msgstr "Recent _Documents"
 
@@ -22482,9 +22904,6 @@ msgstr "Input Methods"
 #~ msgid "File exists \"{0}\"."
 #~ msgstr "File exists \"{0}\"."
 
-#~ msgid "GConf error: %s"
-#~ msgstr "GConf error: %s"
-
 #~ msgid "All further errors shown only on terminal."
 #~ msgstr "All further errors shown only on terminal."
 
@@ -22550,9 +22969,6 @@ msgstr "Input Methods"
 #~ msgid "File _name:"
 #~ msgstr "File _name:"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
 #~ msgid "Send the debugging output of all components to a file."
 #~ msgstr "Send the debugging output of all components to a file."
 
@@ -22714,9 +23130,6 @@ msgstr "Input Methods"
 #~ msgid "Use _SSL"
 #~ msgstr "Use _SSL"
 
-#~ msgid "_Secure connection"
-#~ msgstr "_Secure connection"
-
 #~ msgid "Show a map of all the contacts"
 #~ msgstr "Show a map of all the contacts"
 
@@ -22797,9 +23210,6 @@ msgstr "Input Methods"
 #~ msgid "Junk Mail Settings"
 #~ msgstr "Junk Mail Settings"
 
-#~ msgid "Email:"
-#~ msgstr "E-mail:"
-
 #~ msgid "Junk List:"
 #~ msgstr "Junk List:"
 
@@ -23529,9 +23939,6 @@ msgstr "Input Methods"
 #~ msgid "Log Messages:"
 #~ msgstr "Log Messages:"
 
-#~ msgid "Log Level"
-#~ msgstr "Log Level"
-
 #~ msgid "Error"
 #~ msgstr "Error"
 
@@ -23588,9 +23995,6 @@ msgstr "Input Methods"
 #~ msgid "Subscribe dialog default width"
 #~ msgstr "Subscribe dialogue default width"
 
-#~ msgid "(Not Recommended)"
-#~ msgstr "(Not Recommended)"
-
 #~ msgid "(Note: Requires restart of the application)"
 #~ msgstr "(Note: Requires restart of the application)"
 
@@ -23661,9 +24065,6 @@ msgstr "Input Methods"
 #~ msgid "V_ariable-width:"
 #~ msgstr "V_ariable-width:"
 
-#~ msgid "_Mark messages as read after"
-#~ msgstr "_Mark messages as read after"
-
 #~ msgid "_Show image animations"
 #~ msgstr "_Show image animations"
 
@@ -23865,9 +24266,6 @@ msgstr "Input Methods"
 #~ msgid "_From Field"
 #~ msgstr "_From Field"
 
-#~ msgid "Toggles whether the From chooser is displayed"
-#~ msgstr "Toggles whether the From chooser is displayed"
-
 #~ msgid "Hide"
 #~ msgstr "Hide"
 
@@ -24028,9 +24426,6 @@ msgstr "Input Methods"
 #~ msgid "Shell View"
 #~ msgstr "Shell View"
 
-#~ msgid "Source"
-#~ msgstr "Source"
-
 #~ msgid "Width"
 #~ msgstr "Width"
 
@@ -24055,9 +24450,6 @@ msgstr "Input Methods"
 #~ msgid "Adapter"
 #~ msgstr "Adaptor"
 
-#~ msgid "Selected"
-#~ msgstr "Selected"
-
 #~ msgid "Has Cursor"
 #~ msgstr "Has Cursor"
 
@@ -24196,9 +24588,6 @@ msgstr "Input Methods"
 #~ "Unable to read settings from previous Evolution install, `evolution/"
 #~ "config.xmldb' does not exist or is corrupt."
 
-#~ msgid "Allows Evolution to display text part of limited size"
-#~ msgstr "Allows Evolution to display text part of limited size"
-
 #~ msgid "Enable to render message text part of limited size."
 #~ msgstr "Enable to render message text part of limited size."
 
@@ -24558,9 +24947,6 @@ msgstr "Input Methods"
 #~ msgid "The shell window's GtkUIManager"
 #~ msgstr "The shell window's GtkUIManager"
 
-#~ msgid "Module Directory"
-#~ msgstr "Module Directory"
-
 #~ msgid "The directory from which to load EModules"
 #~ msgstr "The directory from which to load EModules"
 
@@ -24873,9 +25259,6 @@ msgstr "Input Methods"
 #~ msgid "Text width"
 #~ msgstr "Text width"
 
-#~ msgid "Text height"
-#~ msgstr "Text height"
-
 #~ msgid "Use ellipsis"
 #~ msgstr "Use ellipsis"
 
@@ -25277,9 +25660,6 @@ msgstr "Input Methods"
 #~ msgid "Rename Folder"
 #~ msgstr "Rename Folder"
 
-#~ msgid "message"
-#~ msgstr "message"
-
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr "Prompt to check if the user wants to go offline immediately"
 
@@ -25756,9 +26136,6 @@ msgstr "Input Methods"
 #~ msgid "Folder Size"
 #~ msgstr "Folder Size"
 
-#~ msgid "User"
-#~ msgstr "User"
-
 #~ msgid "Subscribe to Other User's Folder"
 #~ msgstr "Subscribe to Other User's Folder"
 
@@ -25834,9 +26211,6 @@ msgstr "Input Methods"
 #~ msgid "Create items"
 #~ msgstr "Create items"
 
-#~ msgid "Create subfolders"
-#~ msgstr "Create subfolders"
-
 #~ msgid "Delete Any Items"
 #~ msgstr "Delete Any Items"
 
@@ -26430,9 +26804,6 @@ msgstr "Input Methods"
 #~ "Position of the vertical pane, between the card and list views and the "
 #~ "preview pane, in pixels."
 
-#~ msgid "Look up in address books"
-#~ msgstr "Look up in address books"
-
 #~ msgid "Name begins with"
 #~ msgstr "Name begins with"
 
@@ -26561,9 +26932,6 @@ msgstr "Input Methods"
 #~ msgid "C_ut"
 #~ msgstr "C_ut"
 
-#~ msgid "_Paste"
-#~ msgstr "_Paste"
-
 #~ msgid "_Forward as iCalendar"
 #~ msgstr "_Forward as iCalendar"
 
@@ -26710,9 +27078,6 @@ msgstr "Input Methods"
 #~ msgid "Open in _New Window"
 #~ msgstr "Open in _New Window"
 
-#~ msgid "_Move..."
-#~ msgstr "_Move…"
-
 #~ msgid "_Unread Search Folder"
 #~ msgstr "_Unread Search Folder"
 
@@ -26823,9 +27188,6 @@ msgstr "Input Methods"
 #~ msgid "Subject or Sender contains"
 #~ msgstr "Subject or Sender contains"
 
-#~ msgid "Audio Inline"
-#~ msgstr "Audio Inline"
-
 #~ msgid "Copy Tool"
 #~ msgstr "Copy Tool"
 
@@ -27108,9 +27470,6 @@ msgstr "Input Methods"
 #~ msgid "Choose Image"
 #~ msgstr "Choose Image"
 
-#~ msgid "Empty message"
-#~ msgstr "Empty message"
-
 #~ msgid "Reflow model"
 #~ msgstr "Reflow model"
 
@@ -27141,9 +27500,6 @@ msgstr "Input Methods"
 #~ msgid "Basic"
 #~ msgstr "Basic"
 
-#~ msgid "Find Possible Search Bases"
-#~ msgstr "Find Possible Search Bases"
-
 #~ msgid "_Add Address Book"
 #~ msgstr "_Add Address Book"
 
@@ -28235,9 +28591,6 @@ msgstr "Input Methods"
 #~ msgid "A plugin to setup Google Calendar and Contacts."
 #~ msgstr "A plugin to setup Google Calendar and Contacts."
 
-#~ msgid "Google sources"
-#~ msgstr "Google sources"
-
 #~ msgid "A plugin to setup GroupWise calendar and contacts sources."
 #~ msgstr "A plugin to setup GroupWise calendar and contacts sources."
 
@@ -28479,9 +28832,6 @@ msgstr "Input Methods"
 #~ msgid "Gifts"
 #~ msgstr "Gifts"
 
-#~ msgid "Goals/Objectives"
-#~ msgstr "Goals/Objectives"
-
 #~ msgid "Holiday"
 #~ msgstr "Holiday"
 
@@ -28679,9 +29029,6 @@ msgstr "Input Methods"
 #~ msgid "Open File"
 #~ msgstr "Open File"
 
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Cannot open file &quot;{0}&quot;."
-
 #~ msgid "Attach original message"
 #~ msgstr "Attach original message"
 
@@ -28698,9 +29045,6 @@ msgstr "Input Methods"
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Delete messages in Search Folder &quot;{0}&quot;?"
-
 #~ msgid "Only on _Current Folder"
 #~ msgstr "Only on _Current Folder"
 
@@ -28716,9 +29060,6 @@ msgstr "Input Methods"
 #~ msgid "Gives an option to print from the composer."
 #~ msgstr "Gives an option to print from the composer."
 
-#~ msgid "Print Message"
-#~ msgstr "Print Message"
-
 #~ msgid "Prints the message"
 #~ msgstr "Prints the message"
 
@@ -28746,12 +29087,6 @@ msgstr "Input Methods"
 #~ msgid "PGP Sign"
 #~ msgstr "PGP Sign"
 
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "S/MIME Encrypt"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "S/MIME Sign"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Save in folder..."
 
@@ -28776,9 +29111,6 @@ msgstr "Input Methods"
 #~ msgid "Save and _Close"
 #~ msgstr "Save and _Close"
 
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Save the current file and close the window"
-
 #~ msgid "Refresh List"
 #~ msgstr "Refresh List"
 
@@ -28809,15 +29141,6 @@ msgstr "Input Methods"
 #~ msgid "\n"
 #~ msgstr "\n"
 
-#~ msgid "Add an email to the List"
-#~ msgstr "Add an email to the List"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "Insert email addresses from Address Book"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "Remove an email address from the List"
-
 #~ msgid "GTK Tree View"
 #~ msgstr "GTK Tree View"
 
@@ -28854,12 +29177,6 @@ msgstr "Input Methods"
 #~ "If you do not send a cancellation notice, the other participants may not "
 #~ "know the journal has been deleted."
 
-#~ msgid "Add Calendar"
-#~ msgstr "Add Calendar"
-
-#~ msgid "Add Task List"
-#~ msgstr "Add Task List"
-
 #~ msgid "_Add Calendar"
 #~ msgstr "_Add Calendar"
 
@@ -29056,9 +29373,6 @@ msgstr "Input Methods"
 #~ msgid "Beep w_hen new mail arrives"
 #~ msgstr "Beep w_hen new mail arrives"
 
-#~ msgid "HTML Mail"
-#~ msgstr "HTML Mail"
-
 #~ msgid "Se_lect..."
 #~ msgstr "Se_lect..."
 
@@ -29099,9 +29413,6 @@ msgstr "Input Methods"
 #~ msgid "Could not export data!"
 #~ msgstr "Could not export data!"
 
-#~ msgid "Exporting data failed."
-#~ msgstr "Exporting data failed."
-
 #~ msgid "Could not open addressbook!"
 #~ msgstr "Could not open addressbook!"
 
@@ -29210,9 +29521,6 @@ msgstr "Input Methods"
 #~ "When you receive an email with a read receipt request, what should "
 #~ "Evolution do?"
 
-#~ msgid "New mail notify"
-#~ msgstr "New mail notify"
-
 #~ msgid "Minicard Test"
 #~ msgstr "Minicard Test"
 
@@ -29408,9 +29716,6 @@ msgstr "Input Methods"
 #~ msgid "<b>Work Week</b>"
 #~ msgstr "<b>Work Week</b>"
 
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Calendar and Tasks Settings"
-
 #~ msgid "_Add URL"
 #~ msgstr "_Add URL"
 
@@ -29581,9 +29886,6 @@ msgstr "Input Methods"
 #~ msgid "Plugin manager"
 #~ msgstr "Plugin manager"
 
-#~ msgid "Path"
-#~ msgstr "Path"
-
 #~ msgid "Uid"
 #~ msgstr "Uid"
 
@@ -29639,9 +29941,6 @@ msgstr "Input Methods"
 #~ msgid "_Send / Receive"
 #~ msgstr "_Send / Receive"
 
-#~ msgid "Previous Button"
-#~ msgstr "Previous Button"
-
 #~ msgid "Text Date Entry"
 #~ msgstr "Text Date Entry"
 
@@ -29660,9 +29959,6 @@ msgstr "Input Methods"
 #~ msgid "Subitem ID"
 #~ msgstr "Subitem ID"
 
-#~ msgid "Find _Now"
-#~ msgstr "Find _Now"
-
 #~ msgid "%s : %s (%d items)"
 #~ msgstr "%s : %s (%d items)"
author	Bruce Cowan <bruce@bcowan.me.uk>	2012-09-04 18:33:07 +0800
committer	Bruce Cowan <bruce@bcowan.me.uk>	2012-09-04 18:33:07 +0800
commit	6cdedbe194cbea84d30ba58d5b637b309fa55d77 (patch)
tree	3cbfd1197cb766f0c57946a3130a16c08cd72a47 /po
parent	55dc92d4c578a7a842f7c6b2a9a37404e0839dca (diff)
download	gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.gz gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.bz2 gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.lz gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.xz gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.tar.zst gsoc2013-evolution-6cdedbe194cbea84d30ba58d5b637b309fa55d77.zip