[evolution] Updated Telugu Translation



commit c95b623cd128af5a1bb0cf8ae2279659f736773a
Author: Sasi Bhushan Boddepalli <sasi swecha net>
Date:   Thu Sep 20 14:59:21 2012 +0530

    Updated Telugu Translation

 po/te.po | 4645 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2375 insertions(+), 2270 deletions(-)
---
diff --git a/po/te.po b/po/te.po
index fa9a19b..7b0db51 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10,21 +10,23 @@
 # Krishnababu Krothapalli <kkrothap redhat com>, 2011, 2012.
 # Sasi Bhushan Boddepalli <sasi swecha net>, 2011, 2012.
 # y.srinivasreddy <y srinivas_reddy yahoo com>, 2012.
+# Pratap Reddy <pratap swecha net>, 2012.
 #
-#: ../shell/main.c:568
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-06-26 11:42+0000\n"
-"PO-Revision-Date: 2012-06-29 13:48+0530\n"
-"Last-Translator: y.srinivasreddy <y srinivas_reddy yahoo com>\n"
-"Language-Team: Telugu <y srinivas_reddy yahoo com>\n"
+"POT-Creation-Date: 2012-08-24 22:06+0000\n"
+"PO-Revision-Date: 2012-09-13 18:25+0530\n"
+"Last-Translator: Pratap Reddy <pratap swecha net>\n"
+"Language-Team: telugu <localization swecha net>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 "\n"
 "\n"
@@ -33,8 +35,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"X-Generator: Lokalize 1.2\n"
-"Language: te\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -100,41 +101,60 @@ msgid "This address book will be removed permanently."
 msgstr "à àààààààà ààààààà ààààààààà ààààààààààààààà."
 
 #: ../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 "àààààààààààà (_N)"
 
 #: ../addressbook/addressbook.error.xml.h:14
+#, fuzzy
+#| msgid "Delete address book '{0}'?"
+msgid "Delete remote address book &quot;{0}&quot;?"
+msgstr "àààààààà ààààààààààà àààààààààà '{0}'?"
+
+#: ../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 ""
+
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:68
+#, fuzzy
+#| msgid "Delegated From"
+msgid "_Delete From Server"
+msgstr "àààààààààà ààààààààààààààààààààààà"
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "ààààà ààààààààààà àààààààààà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Unable to open address book"
 msgstr "ààààààà ààààààààààà àààààààààààààà"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "àààààààààààààà"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Would you like to save your changes?"
 msgstr "àà ààààààààà àààààààààààààààààà?"
 
-#: ../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?"
 msgstr "à àààààààààà àààà ààààààààà àààààà. àààà à ààààààààà àààààààààààààààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "_Discard"
 msgstr "àààààààà(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Cannot move contact."
 msgstr "àààààààààà ààààààà"
 
-#: ../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?"
@@ -142,61 +162,61 @@ msgstr ""
 "àààà àààààààààà àà ààààààààààààààà ààààà ààààà àààààà àààààààààà àààààààààààààààààà ààààà ààà àààà "
 "ààààà ààààààààààà. àààà ààààààà àà àààà àààààààààààààààààà?"
 
-#: ../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 "àààà ààààààààà ààààààààà àààà ààààààà. àààà àààààà àààààà àààààààààààààààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "_Resize"
 msgstr "ààà: àààààààà(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Use as it is"
 msgstr "ààà àààà ààà ààààààààààà(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Do not save"
 msgstr "àààààààà(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0} àà ààààààà."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} àà {1} àà ààààààà àààà: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "àààààààààà àààààààà ààààààà ààààààà àààààà ààààààààààààà."
 
 #. 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 "àààààààààà àààààààààààààààààààààà {0} ààààà àà àààààààà àààààààààààà àààà."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "àààààààà '{0}' ààààà àààààà"
 
-#: ../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?"
 msgstr "àà ààààà à àààààààààà ààààà àààààà. àààà à àààààààààààà ààààà àààààààà àààààààààààààààààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:340 ../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 "àààààà(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Some addresses already exist in this contact list."
 msgstr "à ààààà àààààààààà àààààà àààààààààà ààààààààà àààààààà."
 
-#: ../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?"
@@ -204,19 +224,19 @@ msgstr ""
 "à àààààààààà ààààààààà àààààà ààààààààààà àààà ààààààààà àààààààààààààààààà. àààà àààààà àààààà ààà "
 "àààààààààààààà ààààààààààààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "Skip duplicates"
 msgstr "àààààààà àààààààà"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "Add with duplicates"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "List '{0}' is already in this contact list."
 msgstr "à ààààà àààààààààà àààààà '{0}' àààààààà ààààà."
 
-#: ../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?"
@@ -224,48 +244,21 @@ msgstr ""
 "àà ààààà àààààà '{0}' àààààà ààààààà ààààààààà à ààààà àààààààààà ààààà. ààààà àààààààààà ààààààààààà "
 "àààààààààààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "Some features may not work properly with your current server"
-msgstr "àà àààààààà  ààààààà àààààà àààààààà ààààààà àààààààà"
-
-#: ../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 ""
-"àààà ààààààààà àààààààà ààààààà àààààààààààààààààààààà ààààà àààààààààà àà àààààààààààà "
-"àààààààà àààààààààààà. àààà ààààààààààà ààààà àààààààààà àààààà àà àààààààààààààà"
-
-#: ../addressbook/addressbook.error.xml.h:42
-msgid "GroupWise Address book creation:"
-msgstr "ààààààà àààààà  àààààààà àààààà àààààà:"
-
 #: ../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 ""
-"ààààààààà àààà àààààààààà ààààà àààààààà àààààààà ààààààà àà ààààààà àààààààààà. àà àààà "
-"àààààààà ààààààààà ààààà àààààààà ààààààààà ààààààà àààààààà àààààààà, àààààà ààààà àààààààà "
-"àààààà ààààààààààà àààààà àààààààààààà."
-
-#: ../addressbook/addressbook.error.xml.h:44
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "àààààààààà ààààààààààà àààààààààà"
 
-#: ../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 "ààààààààà àààààààààààà ààààààààà ààààààààààà àààà ààààààààààààààààà."
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "Cannot add new contact"
 msgstr "ààààà àààààààààà ààààààààà"
 
 #. 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."
@@ -276,7 +269,7 @@ msgstr ""
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:625
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2923
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
 msgid "Contact Editor"
 msgstr "àààààààà àààààààààà"
 
@@ -314,8 +307,8 @@ msgstr "HTML àààààà àà ààààààààààààà
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:970
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:810
 msgid "Email"
@@ -341,7 +334,7 @@ msgstr "ààààà ààà(_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1786
+#: ../modules/itip-formatter/itip-view.c:1842
 msgid "_Calendar:"
 msgstr "àààààààààà(_C):"
 
@@ -433,7 +426,7 @@ msgid "_Anniversary:"
 msgstr "ààààààààààààà(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:710
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
 #: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
 msgstr "ààààààààààààà"
@@ -444,9 +437,8 @@ msgstr "ààààààààààààà"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:131
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "ààààààà àààà"
 
@@ -485,26 +477,26 @@ msgstr "àààààààà(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
+#: ../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 "àààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:369
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../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 "ààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:71
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:389
-#: ../calendar/gui/e-cal-model.c:3564
+#: ../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 "ààààààà"
 
@@ -517,48 +509,47 @@ msgid "Notes"
 msgstr "ààààààà"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Jabber"
 msgstr "ààààà"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:623
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
 msgid "Yahoo"
 msgstr "àààà"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:624
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "GroupWise"
 msgstr "ààààààà àààààà"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:625
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:626
-#| msgid "Title"
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
 msgid "Twitter"
 msgstr "ààààààààà"
 
@@ -576,20 +567,20 @@ msgid "Error removing contact"
 msgstr "àààààààà ààààààààààà àààà"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "àààààààààà àààààààààà-%s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "à àààààààààà   àààààà àà àààààààààààà ààààà àààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3400
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "ààààààààà àààà(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3733
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -597,28 +588,28 @@ msgstr ""
 "ààààààà àààààààà àààààààààààà:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3739
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ààààà àààààààààà àààààààààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3746
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' àààààààààà àààà àààààà "
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ààààà àààààààààà àààààààààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3767
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3781
+#: ../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' àààà àà àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3796
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
 msgid "Invalid contact."
 msgstr "àààààààààà àààààà"
 
@@ -733,7 +724,6 @@ msgid "Add an email to the List"
 msgstr ""
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#| msgid "Copy the email address to the clipboard"
 msgid "Remove an email address from the List"
 msgstr "àààààà ààààà àà ààààààà àààààààààà àààààààààà"
 
@@ -813,22 +803,22 @@ msgid "Merge Contact"
 msgstr "àààààààààà àààààààààà"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Name contains"
 msgstr "àààààà àààààààààààààà"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Email begins with"
 msgstr "àààààà à-ààààà àààààààààà"
 
 #: ../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:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../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 "à àààààààààà ààààààààààà "
 
@@ -838,145 +828,145 @@ msgstr "à àààààààààà ààààààààààà "
 msgid "evolution address book"
 msgstr "ààààààààà àààààààà ààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
 msgid "Copy _Email Address"
 msgstr "ààààààà àààààààààààà àààà àààààà(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:160
-#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:429
+#: ../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 "ààààààâààààààààà ààààààà àààààààààà àààààààà."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-#: ../widgets/misc/e-web-view.c:305 ../widgets/misc/e-web-view-gtkhtml.c:434
+#: ../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 "ààààà àààààààààà ààààààà ààààààààà(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:167
-#: ../widgets/misc/e-web-view.c:307 ../widgets/misc/e-web-view-gtkhtml.c:436
+#: ../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 "àààààààààà àààààà àààààààààà àààà."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../widgets/misc/e-web-view.c:1087 ../widgets/misc/e-web-view-gtkhtml.c:973
+#: ../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 "%s àà àààààà ààààààà àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:159
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "àààà àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:553
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
 msgid "List Members:"
 msgstr "àààààà ààààààà:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "àààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
 msgid "Department"
 msgstr "ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
 msgid "Profession"
 msgstr "ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
 msgid "Position"
 msgstr "'àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "ààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
 msgid "Video Chat"
 msgstr "ààààà àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:626
+#: ../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 "àààààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:678
+#: ../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 "àààà/ààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 msgid "Phone"
 msgstr "àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
 msgid "Fax"
 msgstr "àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:708
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
 msgid "Address"
 msgstr "àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
 msgid "Home Page"
 msgstr "ààààà ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
 msgid "Web Log"
 msgstr "àààààààà ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "àààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:711
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "ààààà ààààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:721
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:745
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:934
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "List Members"
 msgstr "àààààà àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:955
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
 msgid "Job Title"
 msgstr "ààààà ààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:996
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
 msgid "Home page"
 msgstr "àààààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
 msgid "Blog"
 msgstr "àààààà"
 
@@ -1127,7 +1117,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "àààààà àààà ààààà ààààààààà àààààààààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "Delete selected contacts"
 msgstr "ààààààààà ààààààààà àààààààààà"
 
@@ -1576,29 +1566,46 @@ msgid "Appointments"
 msgstr "ààààààààà"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "ààààààààà àààààààààààà (_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "ààààààààààà(_S)"
 
-#: ../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 "àààààààààààà (_D)"
 
-#: ../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 "àààààà:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "ààààààà ààààà ààààààà"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "ààààààààààà àààà(_t):"
 
 #. 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/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:352
+#: ../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 "àààààà"
 
-#: ../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 ../filter/filter.ui.h:7
 #: ../widgets/misc/e-interval-chooser.c:141
@@ -1606,59 +1613,42 @@ msgid "hours"
 msgstr "ààààà"
 
 #. 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 ../filter/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:541
+#: ../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 "àààààààà"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "ààààààà ààààà ààààààà"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1754
-#: ../calendar/alarm-notify/alarm-queue.c:1764
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:216
-#: ../modules/itip-formatter/itip-view.c:1413
-#: ../modules/itip-formatter/itip-view.c:1513
-msgid "Location:"
-msgstr "àààààà:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "ààààààààà àààààààààààà (_A)"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1603
-#: ../calendar/alarm-notify/alarm-queue.c:1735
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "ààààààààààà àààààààààà àààà."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "ààààà àààààààààà àààà"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1622
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "ààààààà ààààà ààààààà àààààààà àà àààà."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1668
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "àààà %d àààààààààà"
 msgstr[1] "àààà %d ààààààà àààààààà"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1864
-#: ../calendar/alarm-notify/alarm-queue.c:1899
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "àààààààà"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1670,7 +1660,7 @@ msgstr ""
 "ààààààà àààààààààààààààà.  àààààààààà ààààààà àà àààààà àààààààààààà\n"
 "àààààà àààààà àà ààààààààààààààà."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1687,7 +1677,7 @@ msgstr ""
 "\n"
 "àààà ààààààààà à àààààààààà àà àààààààààà àààààààààààààà?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1920
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "à àààààààààà ààààààà ààààà ààààà ààààààà"
 
@@ -1933,7 +1923,7 @@ msgid ""
 msgstr "àààààà ààààààààà àààààààààà. àààààààààààà ààààà à àààààààà ààààààà ààààààààààààààà."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3022
+#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "àààà(_S)"
 
@@ -2015,10 +2005,46 @@ msgid "This memo list will be removed permanently."
 msgstr "àààà àààààà ààààààààà ààààààààààààààà."
 
 #: ../calendar/calendar.error.xml.h:66
+#, fuzzy
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "Delete remote calendar &quot;{0}&quot;?"
+msgstr "àààààààààà àààà &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 ""
+
+#: ../calendar/calendar.error.xml.h:69
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Delete remote task list &quot;{0}&quot;?"
+msgstr "ààààààààà àààààààà àààààààààà '{0}'"
+
+#: ../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 ""
+
+#: ../calendar/calendar.error.xml.h:71
+#, fuzzy
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "Delete remote memo list &quot;{0}&quot;?"
+msgstr "àààààààààà àààà &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 ""
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "àààà ààààààààà àààààààààà ààààààà ààààààààààà ààààààà àààààààààààààà?"
 
-#: ../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."
@@ -2026,35 +2052,35 @@ msgstr ""
 "àà àààààààààààà àààà àààààààààà àààààààààààààà àààààà ààààààà ààà àà ààààààà ààààààààà àà ààààààààààààà "
 "àààààààà."
 
-#: ../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 "àààà àààààà à àààààààààààà ààààààààààà ààààààà àààààààààààààààààà?"
 
-#: ../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."
 msgstr ""
 "àà àààààààààà àààààààààà àààààààààààààà àààààààààààààà ààà àà àààààààà ààààààà àà ààààààààà àààààààà."
 
-#: ../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 "àààà ààààààààà àààààà àààààààààà ààààààà àààààààààààààààààà?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:78
 msgid "Error loading calendar"
 msgstr "àààààààààà ààààààà àà àààà"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:79
 msgid "The calendar is not marked for offline usage."
 msgstr "àààà ààààààà àààààààààà àààààààààà àààààààààààààà"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:80
 msgid "Cannot create a new event"
 msgstr "ààààà ààààààà àààààààààààà"
 
 #. 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."
@@ -2062,12 +2088,12 @@ msgstr ""
 "'{0}' àààààà-ààààààà àààààààààà ààààà àààààààààà. ààààààààààààààà àààààààààà ààààààààààà ààààà "
 "ààààààààààâàà àààààààààà."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "ààààà ààààààààààà"
 
 #. 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."
@@ -2075,57 +2101,43 @@ msgstr ""
 "'{0}' àààààà-ààààààà àààààààààà ààààà àààààààààà. ààààààààâàààààààââàà àààààààà ààààà ààààààààààâàà "
 "ààààààààààà."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:86
 msgid "Cannot save task"
 msgstr "ààààà ààààààààààà "
 
 #. 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}' àààààààààà ààààà àààààà àààààà, àààà àààààà àààààà ààààà ààààààààà."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:89
 msgid "Error loading task list"
 msgstr "ààààààà àààààààà àààààààà àààà"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:90
 msgid "The task list is not marked for offline usage."
 msgstr "àààà ààààààà àààààààààà ààààààààà àààààà àààààààààààààà"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:91
 msgid "Error loading memo list"
 msgstr "àààà àààààààà àààààààà àààà"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:92
 msgid "The memo list is not marked for offline usage."
 msgstr "àààà àààààà àààâàààà ààààààààààà ààààààààààààààà."
 
 #. 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 "{0} àà àààà: {1}"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Some features may not work properly with your current server."
-msgstr "àà àààààààà ààààààà àààààà àààààààà ààààààà àààààààà"
-
-#: ../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 ""
-"àààà ààààààààà àààààààà ààààààà àààààààààààààààààààààà ààààà àààààààààà àààààààààààà ààààààà "
-"àààààààààààà. àààà àààààà ààààà, ààààà ààààà àààààààààààà àààààà àà àààààààààààà."
-
-#: ../calendar/calendar.error.xml.h:91
-#| msgid "Cannot perform the operation."
+#: ../calendar/calendar.error.xml.h:96
 msgid "Could not perform this operation."
 msgstr "à àààààà àààà àààààà àààààà."
 
-#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:165
+#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
 msgid "You must be working online to complete this operation."
 msgstr ""
 
@@ -2221,7 +2233,7 @@ msgstr "ààààààààààààà"
 
 #: ../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:872
+#: ../plugins/publish-calendar/publish-calendar.c:870
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
@@ -2495,68 +2507,67 @@ msgstr "àààààààààà àààà"
 msgid "Keep original item?"
 msgstr "àààààà ààààààà àààààààààààà?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "àààààààà ààààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:134
+#: ../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:327 ../widgets/misc/e-web-view.c:1413
+#: ../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 "ààààààà àààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:141
+#: ../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:1407 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "àààààààààààààààà àààààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../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 "àààààààààààààààà àààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "ààààà àààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:148
+#: ../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:1419 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "àààààà àààààààà àààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "àààààààà  ààààààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
-#| msgid "_Save and Close"
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+#: ../widgets/misc/e-mail-signature-editor.c:294
 msgid "Save and Close"
 msgstr "àààà àààààà ààààà àààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
-#| msgid "Save current changes"
+#: ../calendar/gui/dialogs/comp-editor.c:1220
 msgid "Save current changes and close editor"
 msgstr "àààààààà àààààààà àààà àààààà ààààà àààààà àààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:155
+#: ../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 "ààààààààààààààà àààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
 msgstr "àààààààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2565,131 +2576,131 @@ msgstr "àààààààà(_C)"
 msgid "_Edit"
 msgstr "ààààààà(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:162
+#: ../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 "àààà (_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 #: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "ààààà(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "àààààààà (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "àààààààààààààà(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:176
+#: ../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 "àààààà(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "ààààààààà(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../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 "àà àààààà ààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
 msgstr "àààààààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "àààààààààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "àààààààààààà(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "ààà àààààààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "ààààààà(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "àààààààààà àà ààààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "ààààà(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "àààààààààààààààà ààààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "àààààààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "àààààààààààà ààààààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "ààààà àààààààà(_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "ààààà àààààààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP àààààààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "àààààààà àààààààà(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "àààààà àààààààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "ààààààà ààà(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "àààààààààà ààà ààààààààààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2110
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2459
-#: ../calendar/gui/dialogs/comp-editor.c:2643
-#: ../calendar/gui/dialogs/comp-editor.c:3647
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "à àààààààà ààààààààààà àààààààà ààààà ààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3611
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3679
+#: ../calendar/gui/dialogs/comp-editor.c:3683
 msgid "Unable to use current version!"
 msgstr "ààààààà ààààààà ààààààààààààà!"
 
@@ -2876,7 +2887,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ààà àààààààà àààààààààààààà, ààààààààà àààà ààààààààààà àààà"
 
 #: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3138
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "à ààà ààààààààààààààà ààààààààà"
 
@@ -2885,83 +2896,83 @@ msgstr "à ààà ààààààààààààààà àààà
 msgid "Or_ganizer:"
 msgstr "ààààààààààà(_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "ààààààà àààààà àààà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "àààà àààààà àààà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../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 "ààààààà àààààà ààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1482
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "àààà àààààà ààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "ààààààà àààààà ààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1512
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "àààà àààààà ààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1675
+#: ../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 "àààààààààààààààààà ààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1709
+#: ../calendar/gui/dialogs/event-page.c:1714
 #: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "ààààà àà àààààààààààà ààààà."
 
-#: ../calendar/gui/dialogs/event-page.c:1916
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "àààààààààààààààààà(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1918
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "àààààààààà(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/dialogs/event-page.c:2998
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "àààààààààà '%s'àà àààààààààààààà: %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3409
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d àààà àààààà ààààààà"
 msgstr[1] "%d ààààà àààààà ààààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:3415
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ààà àààààà ààààààà"
 msgstr[1] "%d àààà àààààà ààààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:3421
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d àààààà àààààà ààààààà"
 msgstr[1] "%dààààààà àààààà ààààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:3440
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "ààààààààà"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3446
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ààààààà"
@@ -3091,7 +3102,7 @@ msgid "Select Date"
 msgstr "àààààà ààààààààà"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Select _Today"
 msgstr "à àààààà àààààààààà(_T)"
 
@@ -3122,20 +3133,20 @@ msgstr "'%s' àààà ààààààà àààààààà àà
 
 #: ../calendar/gui/dialogs/memo-page.c:983
 #: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:105
+#: ../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:715 ../mail/e-mail-reader.c:1748
-#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4459
-#: ../modules/itip-formatter/itip-view.c:4857 ../plugins/face/face.c:174
+#: ../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 "ààààààà àààà"
 
 #: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1364
+#: ../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
@@ -3444,26 +3455,26 @@ msgstr "ààààà ààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../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:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "àààààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../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:1284
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
 msgstr "àààààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../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:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "àààààà"
 
@@ -3476,7 +3487,7 @@ msgstr "ààààààààààààààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../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
@@ -3486,7 +3497,7 @@ msgstr "àààààààà àààààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../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
@@ -3497,7 +3508,7 @@ msgstr "àààààààààà àààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../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
@@ -3510,11 +3521,11 @@ msgstr "ààààààààààààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../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:3414
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "àààààààààààààà"
 
@@ -3522,7 +3533,7 @@ msgstr "àààààààààààààà"
 #. * 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:3618
+#: ../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
@@ -3713,7 +3724,7 @@ msgid "Gnome Calendar"
 msgstr "àààààà àààààààààà"
 
 #: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1086
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3723,19 +3734,19 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
+#: ../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:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1093
-#: ../modules/calendar/e-cal-shell-view-private.c:1099
-#: ../modules/calendar/e-cal-shell-view-private.c:1102
+#: ../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"
 
@@ -3743,10 +3754,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1130
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1140
+#: ../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"
 
@@ -3755,10 +3766,10 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1868
+#: ../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:1126
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3864,48 +3875,47 @@ msgstr "àà ààààà àààààààààà àààààà
 msgid "calendar view for one or more weeks"
 msgstr "àààà àààà ààààààà ààààààà àààààààààà àààààà"
 
-#: ../calendar/gui/e-cal-component-preview.c:206 ../filter/e-filter-rule.c:691
-#: ../mail/e-mail-config-page.c:65
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "ààààààà àààà"
 
-#: ../calendar/gui/e-cal-component-preview.c:214
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Categories:"
 msgstr "ààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:276
 msgid "Summary:"
 msgstr "ààààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Start Date:"
 msgstr "ààààààà àààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#| msgid "End Date"
+#: ../calendar/gui/e-cal-component-preview.c:295
 msgid "End Date:"
 msgstr "ààààà àààààà"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:306
 msgid "Due Date:"
 msgstr "àààààààààààà àààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:286
-#: ../modules/itip-formatter/itip-view.c:1416
-#: ../modules/itip-formatter/itip-view.c:1522
+#: ../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 "àààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:343
 msgid "Priority:"
 msgstr "àààààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/e-mail-config-service-page.c:720
+#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "àààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:366
+#: ../calendar/gui/e-cal-component-preview.c:397
 msgid "Web Page:"
 msgstr "ààààà ààà:"
 
@@ -3921,7 +3931,7 @@ msgstr "ààààààà àààà"
 #: ../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 "ààà"
@@ -3930,7 +3940,7 @@ msgstr "ààà"
 msgid "Completion date"
 msgstr "àààààààà àààà"
 
-#: ../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 "àààààààà"
 
@@ -4032,8 +4042,8 @@ msgstr "àààà àààààà"
 #: ../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:1159
 #: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3406
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:3462
+#: ../modules/itip-formatter/itip-view.c:5962
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "ààààààà"
@@ -4064,35 +4074,35 @@ msgstr "àààà"
 msgid "Opening %s"
 msgstr "%sààààààààààà"
 
-#: ../calendar/gui/e-cal-model.c:3559
+#: ../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:5925
+#: ../modules/itip-formatter/itip-view.c:5950
 msgid "Accepted"
 msgstr "ààààààààààààà"
 
-#: ../calendar/gui/e-cal-model.c:3560
+#: ../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:5931
+#: ../modules/itip-formatter/itip-view.c:5956
 msgid "Declined"
 msgstr "ààààààààààà"
 
-#: ../calendar/gui/e-cal-model.c:3561
+#: ../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 "ààààààààà"
 
-#: ../calendar/gui/e-cal-model.c:3562
+#: ../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:5934
+#: ../modules/itip-formatter/itip-view.c:5959
 msgid "Delegated"
 msgstr "àààààààààààààààààà"
 
-#: ../calendar/gui/e-cal-model.c:3563
+#: ../calendar/gui/e-cal-model.c:3569
 msgid "Needs action"
 msgstr "àààà ààààà"
 
@@ -4142,14 +4152,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
 #: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
 #: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
 #: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
 #: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
@@ -4161,13 +4171,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:1835 ../calendar/gui/e-day-view-top-item.c:831
+#: ../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:1979
 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:2670
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "àààà %d"
@@ -4390,9 +4400,9 @@ msgstr "ààà"
 
 #: ../calendar/gui/e-memo-table.c:433
 #: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:301
+#: ../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 "àààààà"
 
@@ -4423,7 +4433,7 @@ msgid "Paste memos from the clipboard"
 msgstr "ààààààâààààààààààà ààààààà àààààààààà"
 
 #: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
 msgid "Delete selected memos"
 msgstr "àààààààààà àààààà àààààààààà"
 
@@ -4449,9 +4459,9 @@ msgstr "%d%%"
 #: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:456
+#: ../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 "àààààààààà"
 
@@ -4468,7 +4478,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "àààààà àààà ààààà ààààààààààà àààààààààà"
 
 #: ../calendar/gui/e-task-table.c:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:735
 msgid "Delete selected tasks"
 msgstr "ààààààààà ààààààààààà àààààààààà"
 
@@ -4862,7 +4872,7 @@ msgstr "ààààààààà ààààà ààààààààà"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5536
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid "Opening calendar"
 msgstr "ààààààààààâàà ààààààààààààà"
 
@@ -6587,329 +6597,46 @@ msgstr "ààààààà/àààààààà"
 msgid "Pacific/Yap"
 msgstr "ààààààà/ààà"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "ààààààààààààààà àààààà ààààà ID "
-
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "àààààà "
-
-#: ../capplet/settings/mail-account-view.c:74
-msgid "Please enter your full name."
-msgstr "àààààà àà àààààà àààààà ààààà àààààà "
-
-#: ../capplet/settings/mail-account-view.c:75
-msgid "Please enter your email address."
-msgstr "àààààà  àà ààààààà àààààà ààààà àààààà."
-
-#: ../capplet/settings/mail-account-view.c:76
-msgid "The email address you have entered is invalid."
-msgstr "àààà ààààà ààààà ààààààà àààààààà ààààààà."
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your password."
-msgstr "àààààà àà àààààààààà àààààààààààààà."
-
-#: ../capplet/settings/mail-account-view.c:245
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:335
-#: ../capplet/settings/mail-account-view.c:378
-msgid "Google"
-msgstr "Google"
-
-#: ../capplet/settings/mail-account-view.c:454
-#: ../capplet/settings/mail-account-view.c:558
-msgid "Always (SSL)"
-msgstr "ààààààààààà (SSL) "
-
-#: ../capplet/settings/mail-account-view.c:457
-#: ../capplet/settings/mail-account-view.c:561
-msgid "When possible (TLS)"
-msgstr "àààààààààààà (TLS) "
-
-#: ../capplet/settings/mail-account-view.c:460
-#: ../capplet/settings/mail-account-view.c:564
-#: ../mail/e-mail-config-defaults-page.c:729
-msgid "Never"
-msgstr "ààààààààààààà"
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "ààà àààà..."
 
-#: ../capplet/settings/mail-account-view.c:468
-msgid "Personal details:"
-msgstr "ààààààààà ààààààà "
+#: ../composer/e-composer-actions.c:295
+#: ../widgets/misc/e-mail-signature-editor.c:285
+msgid "_Close"
+msgstr "àààààà(_C)"
 
-#: ../capplet/settings/mail-account-view.c:475
-#: ../widgets/misc/e-source-config.c:681 ../widgets/misc/e-source-config.c:685
-msgid "Name:"
-msgstr "àààà: "
+#: ../composer/e-composer-actions.c:297
+msgid "Close the current file"
+msgstr "àààààààà àààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:484
-msgid "Email address:"
-msgstr "à àààààà ààààààà: "
+#: ../composer/e-composer-actions.c:302
+msgid "New _Message"
+msgstr "ààààà àààààà (_M)"
 
-#: ../capplet/settings/mail-account-view.c:494
-msgid "Details:"
-msgstr "ààààààà: "
+#: ../composer/e-composer-actions.c:304
+msgid "Open New Message window"
+msgstr "ààààà àààààà ààààààà àààààààà"
 
-#: ../capplet/settings/mail-account-view.c:502
-#: ../mail/e-mail-config-summary-page.c:409
-msgid "Receiving"
-msgstr "àààààààààààà "
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+msgid "Configure Evolution"
+msgstr "ààààààààà  ààààààààààà "
 
-#: ../capplet/settings/mail-account-view.c:509
-msgid "Server type:"
-msgstr "ààààà ààà  "
+#: ../composer/e-composer-actions.c:318
+msgid "Save the current file"
+msgstr "àààààààà àààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:518
-msgid "Server address:"
-msgstr "ààààà àààààààà:â"
+#: ../composer/e-composer-actions.c:323
+msgid "Save _As..."
+msgstr "ààà àààààà(_A)..."
 
-#: ../capplet/settings/mail-account-view.c:527
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
-msgid "Username:"
-msgstr "ààààààààààààà àààà:"
+#: ../composer/e-composer-actions.c:325
+msgid "Save the current file with a different name"
+msgstr "àààààààà àààààà àààà àààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:536
-msgid "Use encryption:"
-msgstr "àààààààààààà àà ààààààààààà: "
-
-#: ../capplet/settings/mail-account-view.c:569
-#: ../mail/e-mail-config-summary-page.c:421
-msgid "Sending"
-msgstr "ààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:615
-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 ""
-"ààààààà àààààààààààààà àààà àà àààà ààààà ààààààà. àààààà àà ààààààà àààààààà ààààà ààààà àààà  àà "
-"àààààà ààààà àààà ààààà àààààààààààà ààààààààààà ààààà ààà àààààààà. àààà ààààààààààà àààààà àààààààààà "
-"àààà ààààà àà àààààà àààààààà  ààààà  ààààààà."
-
-#: ../capplet/settings/mail-account-view.c:617
-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 ""
-"àààààààààà, àààà ààààààààààà àà àààààà àààààààà ààààààààà àààààààààà. àààààà  àààààà àààààà ààààà "
-"àààààààà. àààà ààààà ààààà ààààà ààààààà àà àà ààààààà ààààà ààààààààààààà àààà àààà àààààà ààààààààààà "
-"ààààà ààààààà. "
-
-#: ../capplet/settings/mail-account-view.c:619
-msgid "You can specify more options to configure the account."
-msgstr "àààà àààà àààààààààààààà ààààààà ààààààà àààààààààààà."
-
-#: ../capplet/settings/mail-account-view.c:621
-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 ""
-"ààààààà àààà àààààààà ààààààà àààà àà àààààààààààà ààààà. àààà àààààà ààààààà ààààà ààààààààà "
-"ààààààààààààà àààà àààà ààààààààà àààààà  ààààà àààààà. "
-
-#: ../capplet/settings/mail-account-view.c:622
-msgid "You can specify your default settings for your account."
-msgstr "àààà àà àààààà àà àààààààà àààààààààààà àààààààààààà. "
-
-#: ../capplet/settings/mail-account-view.c:623
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr ""
-"àààà ààààààààààà ààààà  ààààààà ààààà àààà àààààààààà   ààààà àààààààà ààààààà àààààààààà ààààà àà "
-"àààààà àààààààààà àààà àààààààààà. "
-
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "ààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Next - Receiving mail"
-msgstr "àààààà àààààà àà- àààààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Receiving mail"
-msgstr "àààààà àà àààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:639
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Next - Sending mail"
-msgstr "ààààààà  àààààà ààààààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Back - Identity"
-msgstr "ààààààà - ààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Next - Receiving options"
-msgstr "ààààààà àààààààààà  - àààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Receiving options"
-msgstr "àààààààààà àààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving mail"
-msgstr "ààààààà - àààààà àà àààààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Sending mail"
-msgstr "ààààààà ààààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:642
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Next - Review account"
-msgstr "àààààà - àààààà àààà "
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Next - Defaults"
-msgstr "ààààààà -  àààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving options"
-msgstr "ààààààà  - àààààààààà àààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:643
-#: ../mail/e-mail-config-defaults-page.c:812
-msgid "Defaults"
-msgstr "àààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Back - Sending mail"
-msgstr "ààààààà - àààààà ààààààààààààà"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Review account"
-msgstr "àààà àààààà "
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Finish"
-msgstr "ààààààà "
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Back - Sending"
-msgstr "àààààà - ààààààààààà "
-
-#: ../capplet/settings/mail-account-view.c:822
-msgid "Setup Google contacts with Evolution"
-msgstr "ààààààààà àà  àààààà  àààààààà ààààà "
-
-#: ../capplet/settings/mail-account-view.c:823
-msgid "Setup Google calendar with Evolution"
-msgstr "ààààààààààâàà àààààà àààààààààà ààààà àààààà."
-
-#: ../capplet/settings/mail-account-view.c:828
-msgid "You may need to enable IMAP access."
-msgstr "àààà IMAP àààà àà ààààààà àààààààà."
-
-#: ../capplet/settings/mail-account-view.c:836
-msgid "Google account settings:"
-msgstr "àààààà àààà ààààààààààà:â"
-
-#: ../capplet/settings/mail-account-view.c:862
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "ààààààààà àà  àààà  àààààààààà ààààà àààààà "
-
-#: ../capplet/settings/mail-account-view.c:866
-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 ""
-"àààà àààààààààààà ààààà àààà_ààààààààà(_l) ààààààààààà. àààà àààààààààà àààà ààààààà ààààààààà "
-"ààààààààààààà. ààà ààààààà àààà àààà àààààààààà àààà ààààààààààà ààààà àààààà ààààà àààààà. "
-
-#: ../capplet/settings/mail-account-view.c:875
-msgid "Yahoo account settings:"
-msgstr "àààà àààà ààààààààààà:â"
-
-#: ../capplet/settings/mail-account-view.c:889
-msgid "Yahoo Calendar name:"
-msgstr "àààà  àààààààààà àààà:"
-
-#: ../capplet/settings/mail-account-view.c:1088
-msgid "Password:"
-msgstr "àààààààà :"
-
-#: ../capplet/settings/mail-account-view.c:1143
-#: ../capplet/settings/mail-settings-view.c:260
-msgid "Close Tab"
-msgstr "àààà àààààà"
-
-#: ../capplet/settings/mail-account-view.c:1155
-msgid "Account Wizard"
-msgstr "àààà ààààààà "
-
-#: ../capplet/settings/mail-capplet-shell.c:209
-msgid "Evolution account assistant"
-msgstr "àààààààààà àààà àààààààà "
-
-#: ../capplet/settings/mail-settings-view.c:145
-#, c-format
-msgid "Modify %s..."
-msgstr "%s... ààààààà"
-
-#: ../capplet/settings/mail-settings-view.c:147
-msgid "Add a new account"
-msgstr "àà ààààà àààààà ààààààààà "
-
-#: ../capplet/settings/mail-settings-view.c:189
-msgid "Account management"
-msgstr "àààà ààààààà "
-
-#: ../capplet/settings/mail-settings-view.c:272
-msgid "Settings"
-msgstr "ààààààààà "
-
-#: ../composer/e-composer-actions.c:208
-msgid "Save as..."
-msgstr "ààà àààà..."
-
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
-msgid "_Close"
-msgstr "àààààà(_C)"
-
-#: ../composer/e-composer-actions.c:297
-msgid "Close the current file"
-msgstr "àààààààà àààààà àààààà"
-
-#: ../composer/e-composer-actions.c:302
-msgid "New _Message"
-msgstr "ààààà àààààà (_M)"
-
-#: ../composer/e-composer-actions.c:304
-msgid "Open New Message window"
-msgstr "ààààà àààààà ààààààà àààààààà"
-
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
-msgid "Configure Evolution"
-msgstr "ààààààààà  ààààààààààà "
-
-#: ../composer/e-composer-actions.c:318
-msgid "Save the current file"
-msgstr "àààààààà àààààà àààààà"
-
-#: ../composer/e-composer-actions.c:323
-msgid "Save _As..."
-msgstr "ààà àààààà(_A)..."
-
-#: ../composer/e-composer-actions.c:325
-msgid "Save the current file with a different name"
-msgstr "àààààààà àààààà àààà àààààà àààààà"
-
-#: ../composer/e-composer-actions.c:332
-msgid "Character _Encoding"
-msgstr "ààààà àààààààà (_E)"
+#: ../composer/e-composer-actions.c:332
+msgid "Character _Encoding"
+msgstr "ààààà àààààààà (_E)"
 
 #: ../composer/e-composer-actions.c:349
 msgid "_Print..."
@@ -6927,7 +6654,7 @@ msgstr "àààààààà àà àààààà (_D)"
 msgid "Save as draft"
 msgstr "àààààààà àà àààààà"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:342
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
 msgid "S_end"
 msgstr "ààààààà(_e)"
 
@@ -7075,23 +6802,7 @@ msgstr "àààààààà ààààààà ààààà ààà
 msgid "Click here to select folders to post to"
 msgstr "ààààààààààààà àààààààà ààààààààààà ààààà àààààààà"
 
-#: ../composer/e-composer-private.c:230
-msgid "Undo the last action"
-msgstr "ààààà àààààà ààààà "
-
-#: ../composer/e-composer-private.c:234
-msgid "Redo the last undone action"
-msgstr "àààààà ààààà ààààà àààààààààà ààààààààààààà "
-
-#: ../composer/e-composer-private.c:238
-msgid "Search for text"
-msgstr "àààà  ààààà àààààààà."
-
-#: ../composer/e-composer-private.c:242
-msgid "Search for and replace text"
-msgstr "àààà àààà ààààà àààààààà ààààà àààààà "
-
-#: ../composer/e-composer-private.c:362
+#: ../composer/e-composer-private.c:345
 msgid "Save draft"
 msgstr "àààààààà àà àààààà"
 
@@ -7114,11 +6825,11 @@ msgstr ""
 msgid "Compose Message"
 msgstr "àààààààààà àààààààà"
 
-#: ../composer/e-msg-composer.c:4182
+#: ../composer/e-msg-composer.c:4198
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ààààààà ààààààà àààà àààààà àààààà ààààààààà, ààà àààààààààà "
 
-#: ../composer/e-msg-composer.c:4859
+#: ../composer/e-msg-composer.c:4875
 msgid "Untitled Message"
 msgstr "ààààààààààà àààààà"
 
@@ -7244,7 +6955,7 @@ msgstr "àààààààààà àààà &quot;{0}&quot;. ààà
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "ààààà àà àààà ààààààààà. ààà àààà àààààààààà àààààààààààààà?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:151
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "àààààààààà àààà &quot;{0}&quot;."
 
@@ -7282,7 +6993,7 @@ msgstr "ààààààààà ààààà ààààààààà
 msgid "Calendar event notifications"
 msgstr "àààààààà àààààà ààààààààààààà "
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
+#: ../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"
@@ -7989,52 +7700,43 @@ msgid "Days on which the start and end of work hours should be indicated"
 msgstr "ààààààà ààààà ààààààà ààà àààààà àààààààààààà àààààà "
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-msgid "Configuration version"
-msgstr "àààààààà àààààà"
+#, fuzzy
+#| msgid "Evolution Restore"
+msgid "Previous Evolution version"
+msgstr "ààààààààà ààààààààààààààààà"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr "àààààààààà ààààà àààààààà àààààà, ààààà/ààààà/àààààààà àààààà àà (àààààà àà \"2.6.0\")."
-
-#
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "Last upgraded configuration version"
-msgstr "ààààààà àààààààààààà àààààààà àààààà"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-msgid ""
-"The last upgraded 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 ""
-"ààààààà àààààààààà àààààààààà ààààà àààààààà, ààààà/ààààà/àààààààà àààààà àà (àààààààà \"2.6.0\")."
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
 msgstr "àààààààà ààààààààà àààààà "
 
-#: ../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 "ààààààààà àà àààààààààà ààààààààà àààààà"
 
-#: ../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 "ààààà ààààà X àààààààâ"
 
-#: ../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 "ààààà ààààà Y ààààààà "
 
-#: ../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 "àààààààààà àà ààààà ààààà ààààààà "
 
-#: ../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 "àààààààààà àà ààààà ààààà ààààà "
 
-#: ../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 "ààààà ààààààààà àààààà "
 
@@ -8349,7 +8051,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Save file format for drag-and-drop operation"
-msgstr ""
+msgstr "àààààà ààààà àààààà ààààààà àààà àààààààà àà àààààà"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Can be either 'mbox' or 'pdf'."
@@ -8574,7 +8276,6 @@ msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ààààà-àààààà àààà ààààààààà ààààààààà (ààààààààà àà) àààààà."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "àààààààààà àààà ààààààà ààààààààààà "
 
@@ -8864,7 +8565,6 @@ msgstr ""
 "ààààààààà, ààààààà ààààààààààà ààààààààà ààààààààààààààààààààà."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#| msgid "Whether to show local folders (On This Computer) in a folder tree"
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "ààààààà àààà àà àààààà & àààààà àààààà àà ààààààà àààà ààààààààààà àààà ààààà"
 
@@ -8877,7 +8577,6 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#| msgid "Whether to show local folders (On This Computer) in a folder tree"
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "ààààààà àààà àà àààààà & àààààà àààààà àà ààààààà àààààààà àààààà ààààààààà àààà ààààà"
 
@@ -9158,13 +8857,20 @@ msgstr ""
 "àààààà àààààà ààààààà ààààààà àààààààà ààààààààà àààààààààà ààààààààà àààààààààààààà. àààààà ààààà 30 "
 "ààààààà ààààààà."
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.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 ""
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "ààààààààà àààààààààà àààààààà àààààà àààà àààà ààààààà ààààààà àààààà"
 
-#: ../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."
@@ -9175,12 +8881,10 @@ msgid "Address book source"
 msgstr "ààààààààà  àààààà àààà "
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-#| msgid "Address book to use for storing automatically synced contacts"
 msgid "Address book to use for storing automatically synced contacts."
 msgstr "ààààààààà àà àààààà ààààààà ààààà àààà ààààààààà àààààà àààààààà."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-#| msgid "Automatic Contacts"
 msgid "Auto sync Pidgin contacts"
 msgstr "ààààààààà àààààà ààààà ààà àààààààà"
 
@@ -9189,7 +8893,6 @@ msgid "Whether Pidgin contacts should be automatically synced."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-#| msgid "Invalid contact."
 msgid "Enable autocontacts"
 msgstr "ààààà ààààààààà ààààààààààà"
 
@@ -9199,18 +8902,15 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-#| msgid "Address book source"
 msgid "Pidgin address book source"
 msgstr "ààààà ààà àààààààà ààààààà àààà"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-#| msgid "Address book to use for storing automatically synced contacts"
 msgid ""
 "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr "ààààà ààà ààààà àààààààààààà àààààà ààààààààà ààààà àààà ààààààààà àààààà àààààààà."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-#| msgid "GAIM check interval"
 msgid "Pidgin check interval"
 msgstr "ààààà ààà ààààà àààààà"
 
@@ -9219,22 +8919,18 @@ msgid "Check interval for Pidgin syncing of contacts."
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-#| msgid "GAIM last sync MD5"
 msgid "Pidgin last sync MD5"
 msgstr "ààààà ààà ààààà ààààààààà MD5"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-#| msgid "GAIM last sync MD5"
 msgid "Pidgin last sync MD5."
 msgstr "ààààà ààà ààààà ààààààààà MD5."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
-#| msgid "GAIM last sync time"
 msgid "Pidgin last sync time"
 msgstr "ààààà ààà ààààà ààààààààà àààà"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
-#| msgid "GAIM last sync time"
 msgid "Pidgin last sync time."
 msgstr "ààààà ààà ààààà ààààààààà àààà."
 
@@ -9266,7 +8962,6 @@ msgid "Automatically launch when a new mail is edited"
 msgstr "ààààà àààààà àààààààààààààààà àààààààààààà àààààààààà"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#| msgid "Automatically launch editor when key is pressed in the mail composer"
 msgid "Automatically launch editor when key is pressed in the mail composer."
 msgstr "àà àààààà ààààààààà ààààààààààààà ààààààààààà àààààà àààààààà."
 
@@ -9281,7 +8976,6 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-#| msgid "_Delete Message"
 msgid "Delete processed"
 msgstr " àààààààà àààààààà"
 
@@ -9322,7 +9016,6 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "ààààà àààààà àààààààààààà àààààà àà àààààà àààààà."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#| msgid "Show new mail icon in notification area when new messages arrive."
 msgid "Enable audible notifications when new messages arrive."
 msgstr "ààààà àààààààà àààààààààààà ààààà ààààààààààààà ààààààààààà."
 
@@ -9334,30 +9027,24 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#| msgid "Whether to show the preview pane."
 msgid "Whether to emit a beep."
 msgstr "àà àààà àààààà àààààààà."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#| msgid "Whether play sound or beep when new messages arrive."
 msgid "Whether to emit a beep when new messages arrive."
 msgstr "ààààà àààààààà àààààààààààà àà àààà àààààà àààààààà."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#| msgid "Sound file name to be played."
 msgid "Sound filename to be played."
 msgstr " àààààà àààà àààà ààààààààà"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#| msgid ""
-#| "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 "ààààà \"ààààààààààà - ààààà - àààà - ààààà\" \"ààààààà\" àààà."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#| msgid "Beep or play sound file."
 msgid "Whether to play a sound file."
 msgstr "àà ààààà ààààà àààà àààààààà."
 
@@ -9376,7 +9063,6 @@ msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "ààààà àààààààà àààààààààààà àààààà àààà àààààà, ààààà àààà àààà àààà àà ààààààà."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
-#| msgid "Use custom fonts for displaying mail."
 msgid "Mode to use when displaying mails"
 msgstr "àààààààà àààààààààààààààààà ààààààààà àààà"
 
@@ -9388,12 +9074,10 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
-#| msgid "Whether to show the preview pane."
 msgid "Whether to show suppressed HTML output"
 msgstr "àààààààààààààà ààààààààààà ààààà ààààààààà"
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
-#| msgid "List of server URLs for free/busy publishing."
 msgid "List of Destinations for publishing"
 msgstr "ààààààà àààà ààààààààààà àààààà"
 
@@ -9436,7 +9120,7 @@ msgstr "àààààààà àààààà ààààààààà
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ààààààà ààààà àààààààà ààààààà."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
 msgid "Start in offline mode"
 msgstr "àààâàààà àààààààà ààààààààààààà"
 
@@ -9449,8 +9133,6 @@ msgid "Offline folder paths"
 msgstr "ààà ààààà ààààààà àààààààà"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-#| msgid ""
-#| "List of paths for the folders to be synchronized to disk for offline usage"
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr "ààà ààààà ààààà àààà àààààààà ààààààààààààààà àààààààà àààà ààààààà àààààà."
@@ -9529,7 +9211,6 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "ààààààà àààààà àààààààààà ààààààà àààààààààààà (DNS àààà)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-#| msgid "SpamAssassin Options"
 msgid "Socket path for SpamAssassin"
 msgstr "àààààà ààààààààààà àààà àààààà àààààà"
 
@@ -9542,12 +9223,10 @@ msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ààààààààààààà àààààà ààààà ààààààààà (spamc/spamd)àà àààààààààààà."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#| msgid "SpamAssassin Options"
 msgid "SpamAssassin client binary"
 msgstr "àààààà ààààààààààà àààààààà àààààà"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#| msgid "Use SpamAssassin daemon and client"
 msgid "SpamAssassin daemon binary"
 msgstr "àààààà ààààààààààà àààààà àààààà"
 
@@ -9562,51 +9241,51 @@ msgstr[0] "àààààààà"
 msgstr[1] "àààààààà"
 
 #: ../em-format/e-mail-formatter-attachment.c:369
-#| msgctxt "iCalImp"
-#| msgid "has attachments"
 msgid "Display as attachment"
 msgstr "àààààààààààà ààààààààààà"
 
-#: ../em-format/e-mail-formatter.c:1362 ../mail/e-mail-tag-editor.c:327
+#: ../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 "ààààà"
 
-#: ../em-format/e-mail-formatter.c:1363 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "àà-ààààààààààààà"
 
-#: ../em-format/e-mail-formatter.c:1365
+#: ../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/e-mail-formatter.c:1366
+#: ../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/e-mail-formatter.c:1367 ../mail/e-mail-tag-editor.c:332
-#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1373
+#: ../em-format/e-mail-formatter-quote-headers.c:165
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "ààààà"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/message-list.etspec.h:7
+#: ../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 "àààààà"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "ààààààààààààà"
 
-#: ../em-format/e-mail-formatter.c:1370 ../modules/mail/em-mailer-prefs.c:75
+#: ../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 "ààààà"
@@ -9634,23 +9313,20 @@ msgid "Regular Image"
 msgstr "ààààààààà àààààà"
 
 #: ../em-format/e-mail-formatter-image.c:158
-#| msgid "Display the next message"
 msgid "Display part as an image"
 msgstr "àààààààà àààààà ààààààààààà"
 
 #: ../em-format/e-mail-formatter-message-rfc822.c:237
-#| msgid "message"
 msgid "RFC822 message"
 msgstr "RFC822 àààààà"
 
 #: ../em-format/e-mail-formatter-message-rfc822.c:243
-#| msgid "Formatting message"
 msgid "Format part as an RFC822 message"
 msgstr "àà RFC 822 ààààà àààààààààà àààààà"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../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
@@ -9667,30 +9343,33 @@ msgstr "ààààààà"
 #: ../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:130
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
 msgid "Security"
 msgstr "ààààà"
 
 #: ../em-format/e-mail-formatter-print-headers.c:147
-#| msgid "Assigned"
 msgid "GPG signed"
 msgstr "GPG ààààà"
 
 #: ../em-format/e-mail-formatter-print-headers.c:152
-#| msgid "Unencrypted"
 msgid "GPG encrpyted"
 msgstr "àààààààààààààà GPG"
 
 #: ../em-format/e-mail-formatter-print-headers.c:158
-#| msgid "S/MIME Sig_n"
 msgid "S/MIME signed"
 msgstr "S / MIME ààààà ààààààà"
 
 #: ../em-format/e-mail-formatter-print-headers.c:164
-#| msgid "S/MIME En_crypt"
 msgid "S/MIME encrpyted"
 msgstr "S / MIME àààààààààààààà"
 
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:176
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1121
+msgid "Mailer"
+msgstr "ààààààà"
+
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:102
 #: ../em-format/e-mail-formatter-text-enriched.c:115
 msgid "Richtext"
@@ -9702,24 +9381,22 @@ msgid "Display part as enriched text"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:338
+#: ../em-format/e-mail-formatter-text-html.c:340
 msgid "HTML"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:344
-#| msgid "Format messages in _HTML"
+#: ../em-format/e-mail-formatter-text-html.c:346
 msgid "Format part as HTML"
 msgstr "HTML àààààààààà àààààà"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:179
-#| msgid "Plain Text Mode"
+#: ../em-format/e-mail-formatter-text-plain.c:182
 msgid "Plain Text"
 msgstr "àààààà àààààààà"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-text-plain.c:188
 msgid "Format part as plain text"
 msgstr "àààààà àààààààà àààààààààà àààààà"
 
@@ -9838,20 +9515,13 @@ msgstr "àààà"
 msgid "Display source of a MIME part"
 msgstr ""
 
-#. pseudo-header
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
-msgid "Mailer"
-msgstr "ààààààà"
-
 #: ../em-format/e-mail-parser-application-mbox.c:108
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr ""
 
-#: ../em-format/e-mail-parser-application-smime.c:102
+#: ../em-format/e-mail-parser-application-smime.c:104
 #, c-format
-#| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse S/MIME message: %s"
 msgstr "S / MIME àààààààààà ààààààààààààààààààààà: %s"
 
@@ -9863,12 +9533,10 @@ msgstr "PGP àààààààààà àààààààààààà
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:93
 #: ../em-format/e-mail-parser-multipart-signed.c:144
 #, c-format
-#| msgid "Error verifying signature"
 msgid "Error verifying signature: %s"
 msgstr "ààààà ààààààààààààààà àààà:% s"
 
 #: ../em-format/e-mail-parser-message-external.c:86
-#| msgid "Malformed external-body part."
 msgid "Malformed external-body part"
 msgstr "ààààààà àààà-àààà àààà"
 
@@ -9908,7 +9576,6 @@ msgstr "ààààààààààà/àààààààààààà
 
 #: ../em-format/e-mail-parser-multipart-encrypted.c:119
 #, c-format
-#| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP / MIME àààààààààà ààààààààààààààààààààà: %s"
 
@@ -10035,7 +9702,7 @@ msgstr "àààààààà"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1926
+#: ../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"
@@ -10155,7 +9822,6 @@ msgid ""
 msgstr ""
 
 #: ../e-util/e-system.error.xml.h:3
-#| msgid "_Reply"
 msgid "_Replace"
 msgstr "ààààà(_R):"
 
@@ -10171,6 +9837,30 @@ msgstr "àààààààà \"{1}\"."
 msgid "Cannot open file \"{0}\"."
 msgstr "àààààààààà ààààààààà \"{0}\"."
 
+#: ../e-util/e-system.error.xml.h:7
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "ààààà àààà &quot;{0}&quot; àà àààààààààààààà."
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#, fuzzy
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "àààààààààà àààà &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:9
+#, fuzzy
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "ààààààààààà àààà àààà &quot;{0}&quot; àà ààààààààààààà."
+
+#: ../e-util/e-system.error.xml.h:10
+#, fuzzy
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "ààààààà ààààààààà ààààààààààà &quot;{0}&quot;."
+
 #: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "ààààààà àààààààà ààààààà."
@@ -10301,68 +9991,73 @@ msgstr "àààààààààààà àà àààààààà à
 msgid "Choose a File"
 msgstr "àà ààààà ààààààààà"
 
-#: ../filter/e-filter-rule.c:686
+#: ../filter/e-filter-rule.c:741
 msgid "R_ule name:"
 msgstr "ààààà àààà(_u):"
 
-#: ../filter/e-filter-rule.c:718
-msgid "Find items that meet the following conditions"
+#: ../filter/e-filter-rule.c:791
+#, fuzzy
+#| msgid "Find items that meet the following conditions"
+msgid "all the following conditions"
 msgstr "ààààààà àààààààà àààààààà àààààààà ààààààààà"
 
-#: ../filter/e-filter-rule.c:743
-msgid "If all conditions are met"
-msgstr "ààààà ààààà ààààààà ààààààààà"
-
-#: ../filter/e-filter-rule.c:744
-msgid "If any conditions are met"
-msgstr "à ààààààà ààààà ààààààààà"
+#: ../filter/e-filter-rule.c:792
+#, fuzzy
+#| msgid "Find items that meet the following conditions"
+msgid "any of the following conditions"
+msgstr "ààààààà àààààààà àààààààà àààààààà ààààààààà"
 
-#: ../filter/e-filter-rule.c:747
-msgid "_Find items:"
+#: ../filter/e-filter-rule.c:798
+#, fuzzy
+#| msgid "_Find items:"
+msgid "_Find items which match:"
 msgstr "ààààààà ààààààààà(_F):"
 
+#: ../filter/e-filter-rule.c:820
+msgid "Find items that meet the following conditions"
+msgstr "ààààààà àààààààà àààààààà àààààààà ààààààààà"
+
 #. 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:835 ../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:318
+#: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "ààààààà"
 
-#: ../filter/e-filter-rule.c:777
+#: ../filter/e-filter-rule.c:836
 msgid "All related"
 msgstr "ààààààààààà ààààààà"
 
-#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "ààààààààààààààà"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:838
 msgid "Replies and parents"
 msgstr "ààààààààà ààààà ààààààààààààààà"
 
-#: ../filter/e-filter-rule.c:780
+#: ../filter/e-filter-rule.c:839
 msgid "No reply or parent"
 msgstr "à ààààààààààà àààà ààààààà àààà"
 
-#: ../filter/e-filter-rule.c:783
-#| msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:842
 msgid "I_nclude threads:"
 msgstr "àààààààà àààààààà(_n)"
 
-#: ../filter/e-filter-rule.c:808
+#: ../filter/e-filter-rule.c:919
 msgid "A_dd Condition"
 msgstr "ààààààààà àààààààà (_d)"
 
-#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
+#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
 #: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "àààààààààààà"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:303
+#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "ààààà àààààà"
 
@@ -10383,12 +10078,10 @@ msgid "You must choose a date."
 msgstr "àààà ààààààààà àà àààààà àààààààààààà."
 
 #: ../filter/filter.error.xml.h:3
-#| msgid "Missing file name."
 msgid "Missing filename."
 msgstr "ààààà àààà ààààààààààà."
 
 #: ../filter/filter.error.xml.h:4
-#| msgid "You must specify a file name."
 msgid "You must specify a filename."
 msgstr "àààà àà ààààà àààà àààààààààà."
 
@@ -10404,7 +10097,7 @@ msgstr "ààààààà ààààààààà ààààààà
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "àààààààà ààààààààààà àà àààààà ààààààà &quot;{1}&quot;."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:97
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "àààààààààà àààà."
 
@@ -10432,7 +10125,7 @@ msgstr "àààà ààààààààà àààà"
 msgid "a time relative to the current time"
 msgstr "àààààààà àààà ààààààààà àà àààà"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "ààààààà"
 
@@ -10461,7 +10154,7 @@ msgstr "àààààààààààà"
 msgid "Show filters for mail:"
 msgstr "àààààà àà àààààààà àààààà:"
 
-#: ../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 "ààààà ààààààà(_F)"
 
@@ -10495,146 +10188,140 @@ msgstr ""
 
 #: ../libemail-engine/e-mail-authenticator.c:182
 #, c-format
-#| msgid "Invalid authentication"
 msgid "Invalid authentication result code (%d)"
 msgstr "ààààààà ààààààà ààààà àààà (% d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:112
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ààààààà '% s' àà àààààà àààà ààààààààààà"
 
-#: ../libemail-engine/e-mail-folder-utils.c:272
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "àààààààààààà àààààààà"
 
-#: ../libemail-engine/e-mail-folder-utils.c:382
-#: ../libemail-engine/e-mail-folder-utils.c:633
+#: ../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] "%d àààààààààà ààààààààààààààà"
 msgstr[1] "%d ààààààààà ààààààààààààààà"
 
-#: ../libemail-engine/e-mail-folder-utils.c:476
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "àààààà àààà ààààààà ààààààà àààààààààà "
 
-#: ../libemail-engine/e-mail-folder-utils.c:883
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "àààààààààààà ààààààà '% s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
-#| msgid "All accounts have been removed."
 msgid "File \"%s\" has been removed."
 msgstr "ààààà \"% s\" ààààààààààààà."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1023
-#| msgid "All accounts have been removed."
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "ààààà ààààààààààààà."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1082
-#| msgid "Saving attachment"
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "àààààààààà àààààààààààà"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1246
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d àààààààààà ààààààààà"
 msgstr[1] "%d àààààààààà ààààààààà"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1602 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "ààààààà ààààààà URI '% s'"
 
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
+#: ../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:1033
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 msgid "Inbox"
 msgstr "àààâàààààà"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../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 "àààààààà"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../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 "àààààâàààààà"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1037
+#: ../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 "ààààà"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../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:1049 ../plugins/templates/templates.c:1349
-#: ../plugins/templates/templates.c:1359
+#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
+#: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "àààààààà"
 
-#: ../libemail-engine/e-mail-session.c:1243
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
-#| msgid "User canceled operation."
 msgid "User cancelled operation"
 msgstr "ààààààààààààà ààààà ààààà àààà"
 
-#: ../libemail-engine/e-mail-session.c:1368
+#: ../libemail-engine/e-mail-session.c:1489
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s àààààààààà àààààààààà"
+
+#: ../libemail-engine/e-mail-session.c:1534
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr ""
+
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
-#| msgid ""
-#| "No destination address provided, forward of the message has been "
-#| "cancelled."
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "àààà àààààààààààà àààààààà ààààààààààà,àààààà ààààààààààààà ààààà ààààààààààà."
 
-#: ../libemail-engine/e-mail-session.c:1381
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
-#| msgid "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 "àààààààààààà à ààààààààà àààààààà, àààààààààààà àààààààààà àààààààà."
 
-#: ../libemail-engine/e-mail-session.c:1543
-#, c-format
-#| msgid "Authentication Failed"
-msgid "%s authentication failed"
-msgstr "%s àààààààààà àààààààààà"
-
-#: ../libemail-engine/e-mail-session.c:1588
+#: ../libemail-engine/e-mail-session-utils.c:540
 #, c-format
-msgid "No data source found for UID '%s'"
+msgid "No mail service found with UID '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:420
+#: ../libemail-engine/e-mail-session-utils.c:549
 #, c-format
-#| msgid "Expunging and storing account '%s'"
-msgid "Cannot get transport for account '%s'"
-msgstr "àààà '% s' àààà ààààà àààààààà"
+msgid "UID '%s' is not a mail transport"
+msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:641
+#: ../libemail-engine/mail-ops.c:698
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ààààààààààà àààààààà ààààààààààà ààààààà: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:537
-#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:710 ../libemail-engine/mail-ops.c:746
+#: ../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"
@@ -10643,23 +10330,17 @@ msgstr ""
 "àààààààà àààààààààà %s: %s\n"
 "ààààààà ààààààà 'ààààà' ààààààààà  ààààààà."
 
-#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:768
+#: ../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 "ààààààà 'ààààà' ààààààààà ààààààà àààààààààà: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:896 ../libemail-engine/mail-ops.c:997
+#: ../libemail-engine/e-mail-session-utils.c:954
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "àààààààààà ààààààààààà"
 
-#: ../libemail-engine/e-mail-session-utils.c:897
-#, c-format
-#| msgid "Unsubscribing from folder \"%s\""
-msgid "Unsubscribing from folder '%s'"
-msgstr "ààààààà '% s' ààààà ààààààààààààààà ààààààààà"
-
 #: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -10675,115 +10356,95 @@ msgstr "'%s' àà àààààààààààààààààààà
 msgid "Preparing account '%s' for offline"
 msgstr "àààààààààààà '%s' àààààààà àààààààààààààà"
 
-#: ../libemail-engine/mail-folder-cache.c:887
+#: ../libemail-engine/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "àààààààà %s"
 
-#: ../libemail-engine/mail-ops.c:93
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "àààààààààà ààààààààà ààààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:215
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "àààààà àà àààààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:907
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d ààààà %1$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:958
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
-#| msgid "Failed to send %d of %d messages"
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "àà àààààààààà ààààà àààààààààà"
 msgstr[1] "%d ààààààààà %d ààààà àààààààààà"
 
-#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:854
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "àààààààààààà."
 
-#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:856
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "àààààààààà."
 
-#: ../libemail-engine/mail-ops.c:1078
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ààààààààà '%s' àà ààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ààààààààà '%s' àà ààààààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1196
+#: ../libemail-engine/mail-ops.c:1207
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' ààààààààà ààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1269
+#: ../libemail-engine/mail-ops.c:1281
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "àààà '%s' àà ààààààààààààààààà ààààà àààààààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1282
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' àààààà ààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1332
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "àààààààààààààà ààààààà '%s'"
-
-#: ../libemail-engine/mail-ops.c:1562
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "ààààààààààààààà ààààààà '%s'"
-
-#: ../libemail-engine/mail-ops.c:1655
+#: ../libemail-engine/mail-ops.c:1356
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ààààà ààààààà ààààààààààààà"
 
-#: ../libemail-engine/mail-ops.c:1751
-#, c-format
-msgid "Disconnecting %s"
-msgstr "%s ààààà ààààààààààààà ààààààààà"
-
 #: ../libemail-engine/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "àààààà ààààà  àà àààààààààààààààààà '%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 "àààààà àààà mbox àààà '%s' àààààààààààà ààààààààààààààà"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "àààààààààààààààà àààààà - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "àààààààààààààààà àààààà"
 
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:130
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ààààààà ààààààààà ààààààààààà: %s"
 
-#: ../libemail-engine/mail-vfolder.c:218
+#: ../libemail-engine/mail-vfolder.c:283
 #, c-format
-#| msgid "Updating Search Folders for '%s:%s'"
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "'%s' - %s àààà àààààà ààààààààà ààààààààààààà"
 
@@ -10792,7 +10453,7 @@ msgstr "'%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:560
+#: ../libemail-engine/mail-vfolder.c:648
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10806,7 +10467,6 @@ msgstr[0] "àààààà  ààààààààà ààààààà
 msgstr[1] "àààààà  ààààààààà ààààààààà  \"% s\" àààà  àààà ààààààà \"% s\" àààààà ààààààààààà "
 
 #: ../mail/e-mail-account-manager.c:446
-#| msgid "Use _Default"
 msgid "_Restore Default"
 msgstr "àààààààà ààààààààààààà(_D)"
 
@@ -10821,17 +10481,17 @@ msgstr "ààààààà(_f)"
 #: ../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:866
+#: ../plugins/publish-calendar/publish-calendar.c:864
 msgid "Enabled"
 msgstr "ààààààààààààààààà"
 
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
 msgid "Account Name"
 msgstr "àààààà àààà"
 
-#: ../mail/e-mail-account-tree-view.c:116
+#: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "àààààààà"
@@ -10848,7 +10508,6 @@ msgstr ""
 
 #: ../mail/e-mail-autoconfig.c:208
 #, c-format
-#| msgid "Error removing list"
 msgid "Error resolving '%s'"
 msgstr "àààà ààààààààààà'%s'"
 
@@ -10858,7 +10517,6 @@ msgid "No authoritative name server for '%s'"
 msgstr ""
 
 #: ../mail/e-mail-autoconfig.c:661
-#| msgid "Your password has expired."
 msgid "No email address provided"
 msgstr "ààààààà àààààààà ààà àààààààààà"
 
@@ -10866,8 +10524,7 @@ msgstr "ààààààà àààààààà ààà ààààà
 msgid "Missing domain in email address"
 msgstr "àààààà àààààà àà ààààààà ààààààààààà "
 
-#: ../mail/e-mail-backend.c:723
-#| msgid "Unknown action to be performed"
+#: ../mail/e-mail-backend.c:734
 msgid "Unknown background operation"
 msgstr "àààààà ààààààà ààààààà àààà"
 
@@ -10885,8 +10542,7 @@ msgstr "(ààààà àààà)"
 msgid "Evolution Account Assistant"
 msgstr "àààààààààà àààà àààààààà"
 
-#: ../mail/e-mail-config-auth-check.c:346
-#| msgid "Ch_eck for Supported Types"
+#: ../mail/e-mail-config-auth-check.c:348
 msgid "Check for Supported Types"
 msgstr "àààààà ààààà àààà ààààà àààààààà"
 
@@ -10908,81 +10564,82 @@ msgstr ""
 msgid "Done"
 msgstr "àààààà"
 
-#: ../mail/e-mail-config-defaults-page.c:527
-#| msgid "Local Folders"
+#: ../mail/e-mail-config-defaults-page.c:539
 msgid "Special Folders"
 msgstr "àààààààà ààààààààà"
 
-#: ../mail/e-mail-config-defaults-page.c:536
-#| msgid "Sent _Messages Folder:"
+#: ../mail/e-mail-config-defaults-page.c:548
 msgid "Draft Messages _Folder:"
 msgstr "àààààààà ààààààà ààààààà:(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:546
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Choose a folder for saving draft messages."
 msgstr "àààààààà àààààààà àààà ààààààààààà àà ààààààà ààààààààà."
 
-#: ../mail/e-mail-config-defaults-page.c:560
+#: ../mail/e-mail-config-defaults-page.c:572
 msgid "Sent _Messages Folder:"
 msgstr "ààààààà ààààààà ààààààà(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:570
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Choose a folder for saving sent messages."
 msgstr "ààààà ààààààà àààà ààààààààààà àà ààààààà ààààààààà."
 
-#: ../mail/e-mail-config-defaults-page.c:584
-#| msgid "Use _Default"
+#: ../mail/e-mail-config-defaults-page.c:596
 msgid "_Restore Defaults"
 msgstr "ààààààààààà ààààààààààààà(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:598
+#: ../mail/e-mail-config-defaults-page.c:610
 msgid "Use a Real Folder for _Trash:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:599
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "Choose a folder for deleted messages."
 msgstr "ààààààààà ààààààà àààà ààààààà ààààààààà."
 
-#: ../mail/e-mail-config-defaults-page.c:608
+#: ../mail/e-mail-config-defaults-page.c:620
 msgid "Use a Real Folder for _Junk:"
 msgstr ""
 
-#: ../mail/e-mail-config-defaults-page.c:609
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:621
 msgid "Choose a folder for junk messages."
 msgstr "àààààà ààààààà àààà ààààààà ààààààààà."
 
-#: ../mail/e-mail-config-defaults-page.c:626
+#: ../mail/e-mail-config-defaults-page.c:638
 msgid "Composing Messages"
 msgstr "àààààààà ààààààààà "
 
-#: ../mail/e-mail-config-defaults-page.c:635
+#: ../mail/e-mail-config-defaults-page.c:647
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ààààààà ààààà ààààààà-àààà (cc)(_s):"
 
-#: ../mail/e-mail-config-defaults-page.c:660
+#: ../mail/e-mail-config-defaults-page.c:672
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "(_b) ààààààà ààààààà ààààààà-àààà (bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:695
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Message Receipts"
 msgstr "ààààà ààààààà"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:716
 msgid "S_end message receipts:"
 msgstr "ààààà àààààààà àààààà(_e):"
 
-#: ../mail/e-mail-config-defaults-page.c:735
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "ààààààààààààà"
+
+#: ../mail/e-mail-config-defaults-page.c:747
 msgid "Always"
 msgstr "ààààààààààà"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:753
 msgid "Ask for each message"
 msgstr "ààààà àààààà ààààà ààààààà"
 
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "àààààààààà"
+
 #: ../mail/e-mail-config-identity-page.c:254
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10999,9 +10656,6 @@ msgstr "àààà ààààààà"
 
 #: ../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\""
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -11046,21 +10700,23 @@ msgstr "ààààààààààààà(_g):"
 msgid "Add Ne_w Signature..."
 msgstr "ààààà ààààààààà ààààààà(_w)..."
 
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "ààààààààà"
+
 #: ../mail/e-mail-config-lookup-page.c:68
-#| msgid "Loading..."
 msgid "Looking up account details..."
 msgstr "àààà ààààààà ààààà ..."
 
-#: ../mail/e-mail-config-provider-page.c:499
-#| msgid "Checking for new mail"
+#: ../mail/e-mail-config-provider-page.c:485
 msgid "Checking for New Mail"
 msgstr "ààààà àààààà àààà ààààà"
 
-#: ../mail/e-mail-config-provider-page.c:515
+#: ../mail/e-mail-config-provider-page.c:501
 msgid "Check for _new messages every"
 msgstr "ààààà ààààààà ààààà àààààààà (_n)"
 
-#: ../mail/e-mail-config-provider-page.c:787
+#: ../mail/e-mail-config-provider-page.c:700
 msgid "Receiving Options"
 msgstr "àààààààààà àààààààààààààààà"
 
@@ -11086,7 +10742,6 @@ msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "àààà àààà àààààààààà(OpenPGP)"
 
 #: ../mail/e-mail-config-security-page.c:298
-#| msgid "PGP/GPG _Key ID:"
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _àà ID:(_K):"
 
@@ -11136,7 +10791,6 @@ msgstr "àààààààààààà àà ààààààààà
 
 #: ../mail/e-mail-config-security-page.c:441
 #: ../mail/e-mail-config-security-page.c:547
-#| msgid "Selected"
 msgid "Select"
 msgstr "ààààààààà"
 
@@ -11145,22 +10799,18 @@ msgid "Signing _algorithm:"
 msgstr "àààààààààà ààààààààà:àà(_a):"
 
 #: ../mail/e-mail-config-security-page.c:500
-#| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always sign outgoing messages when using this account"
 msgstr "à àààà ààààààààà àààààààààà àààààààààà àààààà àààààà ààààààààà ààààà ààà àààààà"
 
 #: ../mail/e-mail-config-security-page.c:523
-#| msgid "Encry_ption certificate:"
 msgid "Encryption certificate:"
 msgstr "àààààààààààà àààààààààààà:"
 
 #: ../mail/e-mail-config-security-page.c:565
-#| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "à àààà ààààààààà àààààààààà àààààààààà àààààààààààà ààààààààà ààààààààààà àààà"
 
 #: ../mail/e-mail-config-security-page.c:585
-#| msgid "Always encrypt to _myself when sending encrypted messages"
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "ààààààààààààà ààààààààà ààààààààààààààà ààààààà àààààà ààààààààààààààààà"
 
@@ -11168,7 +10818,7 @@ msgstr "ààààààààààààà ààààààààà à
 msgid "Sending Email"
 msgstr "ààààààà ààààààààààààà"
 
-#: ../mail/e-mail-config-service-page.c:688
+#: ../mail/e-mail-config-service-page.c:640
 msgid "Server _Type:"
 msgstr "ààààà ààà (_T):"
 
@@ -11190,42 +10840,45 @@ msgid "Personal Details"
 msgstr "ààààààààà ààààààà"
 
 #: ../mail/e-mail-config-summary-page.c:381
-#| msgid "Full Nam_e:"
 msgid "Full Name:"
 msgstr "àààààà àààà:"
 
 #: ../mail/e-mail-config-summary-page.c:395
-#| msgid "Email _Address:"
 msgid "Email Address:"
 msgstr "à àààààà ààààààà:"
 
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "àààààààààààà "
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "ààààààààààà "
+
 #: ../mail/e-mail-config-summary-page.c:433
-#| msgid "Server _Type:"
 msgid "Server Type:"
 msgstr "àààààà àààààà:"
 
 #: ../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:"
 msgid "Server:"
 msgstr "ààààà :"
 
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+msgid "Username:"
+msgstr "ààààààààààààà àààà:"
+
 #: ../mail/e-mail-config-summary-page.c:496
-#| msgid "Security:"
 msgid "Security:"
 msgstr "ààààà: "
 
 #: ../mail/e-mail-config-summary-page.c:787
-#| msgid "Account Search"
 msgid "Account Summary"
 msgstr "àààà ààààààà"
 
 #: ../mail/e-mail-config-welcome-page.c:157
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Forward\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11240,42 +10893,39 @@ msgstr ""
 msgid "Welcome"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-config-window.c:321
+#: ../mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "àààà ààààààà"
 
-#: ../mail/e-mail-display.c:121
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "àààààààà àààà ààààààààà...(_A)"
 
-#: ../mail/e-mail-display.c:128
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "à àààààààààà (_T)"
 
-#: ../mail/e-mail-display.c:135
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "à àààààààà ààààà (_F)"
 
-#: ../mail/e-mail-display.c:142
-#| msgid "_Send To..."
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "àààààà ààààààà... (_R)"
 
-#: ../mail/e-mail-display.c:144
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "à àààààààààà àà ààààà àààààààààà àààà"
 
-#: ../mail/e-mail-display.c:151
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "àààà _ààààààà ààààààààààà(_F)"
 
-#: ../mail/e-mail-display.c:161
-#| msgid "Save as..."
+#: ../mail/e-mail-display.c:159
 msgid "Save _Image..."
 msgstr "_àààààààààà àààà àààààà ...(_I)"
 
-#: ../mail/e-mail-display.c:163
-#| msgid "Save the current file"
+#: ../mail/e-mail-display.c:161
 msgid "Save the image to a file"
 msgstr "ààààààà àààààààààà àààà àààààà"
 
@@ -11314,7 +10964,7 @@ msgid "_Later"
 msgstr "àààààà(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:745
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
 msgstr "àààààà àà àààààààà"
 
@@ -11334,13 +10984,12 @@ msgstr ""
 msgid "Color"
 msgstr "àààààà"
 
-#: ../mail/e-mail-migrate.c:646
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "%s: '%s'àààà ààààààà àààààà àààààààààà ààààààààààààààààà"
 
-#: ../mail/e-mail-notebook-view.c:627
-#| msgid "Please select a user."
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "àà ààààààààà ààààààààà"
 
@@ -11349,686 +10998,656 @@ msgstr "àà ààààààààà ààààààààà"
 msgid "Page %d of %d"
 msgstr "%2$d ààààà ààà %1$d"
 
-#: ../mail/e-mail-printer.c:520
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../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 "àààààà"
 
-#: ../mail/e-mail-printer.c:526
-#| msgid "Header Name:"
+#: ../mail/e-mail-printer.c:555
 msgid "Header Name"
 msgstr "ààààààà  àààà"
 
-#: ../mail/e-mail-printer.c:532
-#| msgid "Header Name:"
+#: ../mail/e-mail-printer.c:561
 msgid "Header Value"
 msgstr "ààààààà ààààà"
 
-#: ../mail/e-mail-printer.c:580 ../mail/mail-config.ui.h:100
+#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
 msgid "Headers"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-reader.c:357
+#: ../mail/e-mail-reader.c:349
 msgid "Save Image"
 msgstr "àààààààààà àààà àààààà"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ààààààààà àààààààààà"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "àààààààààà(_o)"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "ààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "ààààà(_M)"
 
-#: ../mail/e-mail-reader.c:1335 ../mail/e-mail-reader.c:1517
-#: ../mail/e-mail-reader.c:1557
+#: ../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 "ààààà ààààà àààààààà.(_D)"
 
-#: ../mail/e-mail-reader.c:1563
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ààààààà àààààààààààà àààààààààààà: ààààààààà àààààààà àààà."
 
-#: ../mail/e-mail-reader.c:1747
-#| msgid "Unable to retrieve message"
+#: ../mail/e-mail-reader.c:1726
 msgid "Failed to retrieve message:"
 msgstr "àààààà àààààà àààààà àààààààààà:"
 
-#: ../mail/e-mail-reader.c:1793 ../mail/e-mail-reader.c:2882
+#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "àààààààààà ààààààààààààààà '%s' "
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1949
 msgid "A_dd Sender to Address Book"
 msgstr "àààààààà ààààààààààà àààààà ààààààààààààà ààààààà(_d)"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1951
 msgid "Add sender to address book"
 msgstr "àààààà àààààààà ààààààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1956
 msgid "Check for _Junk"
 msgstr "àààààààà ààààà àààààààààààà(_J)"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1958
 msgid "Filter the selected messages for junk status"
 msgstr "àààààààààà àààà àààààà àààà àààààààààà ààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1963
 msgid "_Copy to Folder..."
 msgstr "ààààààà àààààààààà(_C)..."
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1965
 msgid "Copy selected messages to another folder"
 msgstr "ààààààààà ààààààààà àààà ààààààààà àààà àààààà"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1970
 msgid "_Delete Message"
 msgstr "àààààààààà àààààààààà(_D)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages for deletion"
 msgstr "ààààààààà ààààààààà ààààààààààà àààààààààààààà"
 
-#: ../mail/e-mail-reader.c:1997
-#| msgid "Filter on Mailing _List..."
+#: ../mail/e-mail-reader.c:1977
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "ààààààààà  àààààà ààààà àààààà ààààààààààà  (_L)..."
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "à ààààààààà àààààààà ààààààààà ààààààààà ààààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2004
-#| msgid "Filter on _Recipients..."
+#: ../mail/e-mail-reader.c:1984
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "àààààààà àààà àà ààààà àààààà ààààààààààà ...(_R)..."
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages to these recipients"
 msgstr "à àààààààààààà àà ààààààààà ààààààààà ààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2011
-#| msgid "Filter on Se_nder..."
+#: ../mail/e-mail-reader.c:1991
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "ààààààààà àààà àà ààààà àààààà ààààààààààà (_n)..."
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:1993
 msgid "Create a rule to filter messages from this sender"
 msgstr "à ààààààààà ààààà ààààà ààààààààà ààààààààà ààààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2018
-#| msgid "Filter on _Subject..."
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a Filter Rule for _Subject..."
 msgstr "ààààà ààààà ààààà àààààà ààààààààààà (_S)..."
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages with this subject"
 msgstr "à ààààààà ààààààààà ààààààààà ààààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2005
 msgid "A_pply Filters"
 msgstr "àààààààà àààààààààà(_p)"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2007
 msgid "Apply filter rules to the selected messages"
 msgstr "àààààààààà ààààààààà ààààà àààààààà àààààààààà"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2012
 msgid "_Find in Message..."
 msgstr "àààààààà ààààààààà(_F)..."
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2014
 msgid "Search for text in the body of the displayed message"
 msgstr "àààààààààààààà àààààà àààààààààààà ààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2019
 msgid "_Clear Flag"
 msgstr "àààààà àààààààààààà(_C)"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2021
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "àààààààà àààààààà ààààà àààààà  ààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2026
 msgid "_Flag Completed"
 msgstr "àààààà àààààààààà(_F)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2028
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ààààà àààààààààà  àààààààà  àààààà  ààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2033
 msgid "Follow _Up..."
 msgstr "ààààààààà(_U)..."
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2035
 msgid "Flag the selected messages for follow-up"
 msgstr "àààààààààààà àààààààààà ààààààààà  àààààà àààààà  "
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2040
 msgid "_Attached"
 msgstr "àààààààà(_A)"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ààààààààà àààààààààà àààààààààà àààààà ààààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Attached"
 msgstr "àààààààààà àà _ ààààà(_A)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2054
 msgid "_Inline"
 msgstr "àààâàààà(_I)"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
+#: ../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 "ààààààààà àààààààààà ààààà ààààààààà àààààààààààà ààààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Inline"
 msgstr "àààààààààà _ ààààà àà"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2068
 msgid "_Quoted"
 msgstr "àààààà(_Q)"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
 msgid "Forward the selected message quoted like a reply"
 msgstr "àààààààààààààà àààà àààà àààààààààà àààààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2075
 msgid "Forward As _Quoted"
 msgstr "ààààààààààà  àààààààà(_Q):"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2082
 msgid "_Load Images"
 msgstr "àààààààààà ààààààà(_L)"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2084
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML àààààà àààà àààààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2089
 msgid "_Important"
 msgstr "àààààààà(_I)"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as important"
 msgstr "ààààààààà ààààààààà àààààààààààà àààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2096
 msgid "_Junk"
 msgstr "àààààààà(_J)"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as junk"
 msgstr "ààààà ààààààààà àààààààààà àààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2103
 msgid "_Not Junk"
 msgstr "àààààààààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as not being junk"
 msgstr "ààààà ààààààààà àààààààààààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2110
 msgid "_Read"
 msgstr "ààààààà(_R)"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as having been read"
 msgstr "ààààààààà ààààààààà ààààààààààà àààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2117
 msgid "Uni_mportant"
 msgstr "ààààààààà(_m)"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2119
 msgid "Mark the selected messages as unimportant"
 msgstr "ààààààààà àààààààà ààààààà àààààààà àààààààààààà"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2124
 msgid "_Unread"
 msgstr "àààààààà àààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as not having been read"
 msgstr "ààààààààà àààààààà ààààààààààà àààààààààààà"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2131
 msgid "_Edit as New Message..."
 msgstr "ààààà àààààà àààà ààààààààà(_E)..."
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in the composer for editing"
 msgstr "àààààààààà ààààààààà ààààààààààà àààààààà ààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose _New Message"
 msgstr "ààààà àààààà àà àààààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2140
 msgid "Open a window for composing a mail message"
 msgstr "àààààà àààààààààà ààààààààà ààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2145
 msgid "_Open in New Window"
 msgstr " ààààà àààààààà àà àààààààà(_O)"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2147
 msgid "Open the selected messages in a new window"
 msgstr "ààààààààà ààààààààà ààààà àààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2152
 msgid "_Move to Folder..."
 msgstr "ààààààà ààààààà(_M)..."
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2154
 msgid "Move selected messages to another folder"
 msgstr "ààààààààà ààààààààà ààààà ààààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2179
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:2159
 msgid "_Switch to Folder"
 msgstr "ààààààà àààààà àààààà (_S)"
 
-#: ../mail/e-mail-reader.c:2181
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the parent folder"
 msgstr "àààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2186
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to _next tab"
 msgstr "ààààààà àààà àà àààààà(_n)"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2168
 msgid "Switch to the next tab"
 msgstr "àààààà àààààà àààààà "
 
-#: ../mail/e-mail-reader.c:2193
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to _previous tab"
 msgstr "ààààààà àààà àà àààààà (_p)"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2175
 msgid "Switch to the previous tab"
 msgstr "ààààààà àààà àààààà "
 
-#: ../mail/e-mail-reader.c:2200
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2180
 msgid "Cl_ose current tab"
 msgstr "àààààààà àààààà àààààààà (_o)"
 
-#: ../mail/e-mail-reader.c:2202
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2182
 msgid "Close current tab"
 msgstr "àààààààà àààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2187
 msgid "_Next Message"
 msgstr "ààààààà àààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the next message"
 msgstr "ààààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2194
 msgid "Next _Important Message"
 msgstr "ààààààà ààààà àààààà(_I)"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the next important message"
 msgstr "ààààààà ààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2201
 msgid "Next _Thread"
 msgstr "ààààààà àààà(_T)"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2203
 msgid "Display the next thread"
 msgstr "ààààààà àààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2208
 msgid "Next _Unread Message"
 msgstr "ààààààà ààààààà àààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next unread message"
 msgstr "ààààààà ààààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2215
 msgid "_Previous Message"
 msgstr "ààààààà àààààà(_P)"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the previous message"
 msgstr "ààààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2222
 msgid "Pr_evious Important Message"
 msgstr "ààààààà ààààà àààààà(_e)"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the previous important message"
 msgstr "ààààààà ààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2249
-#| msgid "_Previous Message"
+#: ../mail/e-mail-reader.c:2229
 msgid "Previous T_hread"
 msgstr "ààààààà àààààà(_h)"
 
-#: ../mail/e-mail-reader.c:2251
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the previous thread"
 msgstr "ààààààà àààààààà  ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2236
 msgid "P_revious Unread Message"
 msgstr "ààààààà ààààààà àààààà(_r)"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous unread message"
 msgstr "ààààààà ààààààà àààààààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2245
 msgid "Print this message"
 msgstr "à àààààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2252
 msgid "Preview the message to be printed"
 msgstr "àààààààààààààà àààààààààà ààà:àààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2257
 msgid "Re_direct"
 msgstr "ààààààààààààààààààà(_d)"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2259
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "àààààààààà àààààààà ààààààààààà ààààààààààààààààààà(bounce)"
 
-#: ../mail/e-mail-reader.c:2284
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2264
 msgid "Remo_ve Attachments"
 msgstr "àààààààààààà àààààààà(_v)"
 
-#: ../mail/e-mail-reader.c:2286
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2266
 msgid "Remove attachments"
 msgstr "àààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2291
-#| msgid "Hide S_elected Messages"
+#: ../mail/e-mail-reader.c:2271
 msgid "Remove Du_plicate Messages"
 msgstr "ààààà àààààààà  àààààààà(_p)"
 
-#: ../mail/e-mail-reader.c:2293
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2273
 msgid "Checks selected messages for duplicates"
 msgstr "ààààààààà  ààààà ààààààààà ààààààààà"
 
-#: ../mail/e-mail-reader.c:2298 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../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 "ààààààà àààààààààààààààààà(_A)"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2280
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ààààààààà àààààà ààààà ààààà ààààààààà àà àààààààààààà àààààààààà"
 
-#: ../mail/e-mail-reader.c:2305 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "àààààààà àààààààààààà(_L)"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2287
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "àààààààààà àààààà ààààà ààààààààà àààààà àà ààààààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2292
 #: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "ààààààààààà àààààààààààà(_R)"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2294
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ààààààààà àààààà ààààààààààà àààààààààààà àààààààà"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2299
 msgid "_Save as mbox..."
 msgstr "mbox ààà àààà àààààà ...(_S)"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2301
 msgid "Save selected messages as an mbox file"
 msgstr "mbox ààààà àà ààààààààà ààààààààà àààà àààààà"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2306
 msgid "_Message Source"
 msgstr "àààààà àààà(_M)"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../mail/e-mail-reader.c:2308
 msgid "Show the raw email source of the message"
 msgstr "àààààà àààààààààà à àààààà àààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2320
 msgid "_Undelete Message"
 msgstr "àààààààààà àààààààààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2342
+#: ../mail/e-mail-reader.c:2322
 msgid "Undelete the selected messages"
 msgstr "ààààà ààààààààà ààààààààà àààààààààààà"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2327
 msgid "_Normal Size"
 msgstr "àààààà ààààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../mail/e-mail-reader.c:2329
 msgid "Reset the text to its original size"
 msgstr "ààààààààà ààààà ààààààààààà ààà:àààààààà"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2334
 msgid "_Zoom In"
 msgstr "àààà ààààààà(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2336
 msgid "Increase the text size"
 msgstr "ààààà ààààààààààà ààààààà"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2341
 msgid "Zoom _Out"
 msgstr "àààà àààààààà(_O)"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2343
 msgid "Decrease the text size"
 msgstr "ààààà ààààààààààà àààààààààà"
 
-#: ../mail/e-mail-reader.c:2370
-#| msgid "Created"
+#: ../mail/e-mail-reader.c:2350
 msgid "Cre_ate"
 msgstr "ààààààààà(_a)"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2357
 msgid "Ch_aracter Encoding"
 msgstr "ààààà àààààààà(_a)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2364
 msgid "F_orward As"
 msgstr "ààà àààà(_o)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2371
 msgid "_Group Reply"
 msgstr "àààà  àààààààààààà(_G):"
 
-#: ../mail/e-mail-reader.c:2398
+#: ../mail/e-mail-reader.c:2378
 msgid "_Go To"
 msgstr "àààààà(_G)"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../mail/e-mail-reader.c:2385
 msgid "Mar_k As"
 msgstr "ààà àààààààààààà (_k)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2392
 msgid "_Message"
 msgstr "àààààà(_M)"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2399
 msgid "_Zoom"
 msgstr "àààà(_Z)"
 
-#: ../mail/e-mail-reader.c:2429
-#| msgid "Search Folder from Mailing _List..."
+#: ../mail/e-mail-reader.c:2409
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "ààààààààà àààààà ààààà àà àààà ààààààà ààààààààààà ..(_L)"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2411
 msgid "Create a search folder for this mailing list"
 msgstr "à ààààààààà àààààà àààà àà àààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2436
-#| msgid "Search Folder from Recipien_ts..."
+#: ../mail/e-mail-reader.c:2416
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "àààààààà ààààà àà àààà ààààààà ààààààààààà ..(_t)"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2418
 msgid "Create a search folder for these recipients"
 msgstr "à ààààààààà àà àààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2443
-#| msgid "Search Folder from Sen_der..."
+#: ../mail/e-mail-reader.c:2423
 msgid "Create a Search Folder from Sen_der..."
 msgstr "ààààààààà ààààà àà àààà ààààààà ààààààààààà ...(_d)"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2425
 msgid "Create a search folder for this sender"
 msgstr "à àààààààà àààà àà àààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2450
-#| msgid "Search Folder from S_ubject..."
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a Search Folder from S_ubject..."
 msgstr "ààààà ààààà àà àààà ààààààà ààààààààààà ...(_u)"
 
-#: ../mail/e-mail-reader.c:2452
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this subject"
 msgstr "à ààààà àààà àà àààà ààààààà ààààààààààà"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark for Follo_w Up..."
 msgstr "àààààààààà ààààà ààààààààààà(_w)..."
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2463
 msgid "Mark as _Important"
 msgstr "àààààààà ààààààà ààààààààààà(_I)"
 
-#: ../mail/e-mail-reader.c:2487
+#: ../mail/e-mail-reader.c:2467
 msgid "Mark as _Junk"
 msgstr "àààààààààà ààààààà ààààààààààà(_J)"
 
-#: ../mail/e-mail-reader.c:2491
+#: ../mail/e-mail-reader.c:2471
 msgid "Mark as _Not Junk"
 msgstr "àààààààà ààààààààààà ààààààààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2495
+#: ../mail/e-mail-reader.c:2475
 msgid "Mar_k as Read"
 msgstr "ààààààààààààà ààààààààààà(_k)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2479
 msgid "Mark as Uni_mportant"
 msgstr "ààààààààààà ààààà ààààààààà(_m)"
 
-#: ../mail/e-mail-reader.c:2503
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Unread"
 msgstr "àààààààààààà àààààààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2527
 msgid "_Caret Mode"
 msgstr "ààààààààà(_C)"
 
-#: ../mail/e-mail-reader.c:2549
+#: ../mail/e-mail-reader.c:2529
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "àààààààààààààà ààààààà àààààààààààà àààààààà àààààààà ààààààààà"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2535
 msgid "All Message _Headers"
 msgstr "ààààà ààààà ààààààà(_H)"
 
-#: ../mail/e-mail-reader.c:2557
+#: ../mail/e-mail-reader.c:2537
 msgid "Show messages with all email headers"
 msgstr "à àààààà àààààààà ààààààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2888
-#| msgid "Retrieving %d message"
-#| msgid_plural "Retrieving %d messages"
+#: ../mail/e-mail-reader.c:2868
 msgid "Retrieving message"
 msgstr "àààààààààà ààààààààààààààà"
 
-#: ../mail/e-mail-reader.c:3857
+#: ../mail/e-mail-reader.c:3851
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "ààààààààààà(_F)"
 
-#: ../mail/e-mail-reader.c:3858
+#: ../mail/e-mail-reader.c:3852
 msgid "Forward the selected message to someone"
 msgstr "ààààààààà àààààààààà àààààà ààààààà àààààà"
 
-#: ../mail/e-mail-reader.c:3877
+#: ../mail/e-mail-reader.c:3871
 msgid "Group Reply"
 msgstr "àààà àààààààààààà"
 
-#: ../mail/e-mail-reader.c:3878
+#: ../mail/e-mail-reader.c:3872
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ààààààààà àààààà àààààà, àààà ààààà ààààààààà"
 
-#: ../mail/e-mail-reader.c:3935 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "àààààààà"
 
-#: ../mail/e-mail-reader.c:3968
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../mail/e-mail-reader.c:3962
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-reader.c:3972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../mail/e-mail-reader.c:3966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-reader.c:4711
+#: ../mail/e-mail-reader.c:4705
 #, c-format
-#| msgid "Folder"
 msgid "Folder '%s'"
 msgstr "ààààà '%s'"
 
-#: ../mail/e-mail-reader-utils.c:152
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr " ààààà ààààààààààààà"
 
-#: ../mail/e-mail-reader-utils.c:551
-#| msgid "Print"
+#: ../mail/e-mail-reader-utils.c:954
 msgid "Printing"
 msgstr "àààààààààà"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:730
+#: ../mail/e-mail-reader-utils.c:1136
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12039,7 +11658,7 @@ msgid_plural ""
 msgstr[0] "ààààààà '%s' àà %u ààààà àààààà àààà. àààà àààààà ààààààààààààà àààààààààààààààààà?"
 msgstr[1] "ààààààà '%s'àà %u ààààà ààààààààà ààààà àààà. àààà àààààààààààà àààààààààààààààààà?"
 
-#: ../mail/e-mail-reader-utils.c:1134
+#: ../mail/e-mail-reader-utils.c:1541
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "àààààààààà àààà àààààà"
@@ -12050,19 +11669,17 @@ msgstr[1] "àààààà àààà àààààà"
 #. * 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:1155
+#: ../mail/e-mail-reader-utils.c:1562
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "àààààà"
 msgstr[1] "àààààààà"
 
-#: ../mail/e-mail-reader-utils.c:1610
-#| msgid "Saving %d message"
-#| msgid_plural "Saving %d messages"
+#: ../mail/e-mail-reader-utils.c:2017
 msgid "Parsing message"
 msgstr "ààààà àààààà"
 
-#: ../mail/e-mail-request.c:151
+#: ../mail/e-mail-request.c:152
 #, c-format
 msgid "Failed to load part '%s'"
 msgstr "'%s' àààà  àààà àààààààà àààààààààààà"
@@ -12075,7 +11692,7 @@ msgstr "àààààààààààà àààààà"
 #. * 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:1286
+#: ../mail/em-composer-utils.c:1282
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12083,27 +11700,27 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone} àààà, ${Sender} àààààààà:"
 
-#: ../mail/em-composer-utils.c:1292
+#: ../mail/em-composer-utils.c:1288
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ààààààà ààààààààààààà --------"
 
-#: ../mail/em-composer-utils.c:1297
+#: ../mail/em-composer-utils.c:1293
 msgid "-----Original Message-----"
 msgstr "-----àààààà àààààà-----"
 
-#: ../mail/em-composer-utils.c:2577
+#: ../mail/em-composer-utils.c:2573
 msgid "an unknown sender"
 msgstr "ààààààà àààààààà"
 
-#: ../mail/em-composer-utils.c:2995
+#: ../mail/em-composer-utils.c:2991
 msgid "Posting destination"
 msgstr "ààààààààà ààààààààààààààààà"
 
-#: ../mail/em-composer-utils.c:2996
+#: ../mail/em-composer-utils.c:2992
 msgid "Choose folders to post the message to."
 msgstr "àààààààààà ààààààààààààà àààààààà àààààààààà."
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:158
 msgid "Select Folder"
 msgstr "ààààààààà ààààààààààààààà"
 
@@ -12157,7 +11774,6 @@ msgid "does not exist"
 msgstr "ààààààààà"
 
 #: ../mail/em-filter-i18n.h:19
-#| msgid "does not end with"
 msgid "does not have words"
 msgstr "ààààà àààà"
 
@@ -12229,7 +11845,7 @@ msgstr "ààààà àààà"
 msgid "is set"
 msgstr "ààààà àààààà"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "àààààààààà"
 
@@ -12278,7 +11894,7 @@ msgid "Play Sound"
 msgstr "ààààà àà ààààààà"
 
 #. 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 "ààààààà"
 
@@ -12355,7 +11971,6 @@ msgid "Stop Processing"
 msgstr "àààààààààààààà ààààà"
 
 #: ../mail/em-filter-i18n.h:78
-#| msgid "Unselected Column"
 msgid "Unset Color"
 msgstr "ààààààààà àààà"
 
@@ -12364,11 +11979,11 @@ msgid "Unset Status"
 msgstr "ààààààà àààààà"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:527
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "ààààààà"
 
-#: ../mail/em-filter-rule.c:558
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "àààààà àààààààà(_t)"
 
@@ -12410,41 +12025,41 @@ msgstr "ààààààààààà (_r)"
 msgid "Folder _name:"
 msgstr "ààààà àààà(_n):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "àààààààààà '/' àà àààààààààààà"
 
-#: ../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:1608
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "àààààà ààààà àààààà"
 
-#: ../mail/em-folder-tree.c:2134 ../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 "àààààààààà ààààà %s"
 
-#: ../mail/em-folder-tree.c:2137 ../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 "ààààààààààààà ààààà %s"
 
-#: ../mail/em-folder-tree.c:2144 ../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 "ààààààààà ààààà %s àààà àààààààààààà"
 
-#: ../mail/em-folder-tree.c:2148 ../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 "ààààààààà ààààà %s àààà àààààààààààà"
 
-#: ../mail/em-folder-tree.c:2167
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ààààààà(à)àà àààààààà ààààààà àààààààà"
@@ -12458,107 +12073,97 @@ msgstr "àààààà"
 msgid "Loading..."
 msgstr "àààààààààààà..."
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Move Folder To"
 msgstr "ààààààà  àààààààà  ààààààà"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Copy Folder To"
 msgstr "àààà àààààà ààààààààà àààààààà "
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "ààààààà ààààààààà"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "ààààààà ààààà ààààààààààà ààààààààààà:"
 
 #: ../mail/em-subscription-editor.c:869
-#| msgid "Subscribed"
 msgid "_Subscribe"
 msgstr "àààààààààà(_S)"
 
 #: ../mail/em-subscription-editor.c:878
-#| msgid "Subscribed"
 msgid "Su_bscribe To Shown"
 msgstr "àààààààààà àààààà  àààààà (_b)"
 
 #: ../mail/em-subscription-editor.c:886
-#| msgid "_Subscribe to list"
 msgid "Subscribe To _All"
 msgstr "ààààà àààààààààààà àààààà(_A)"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "_Unsubscribe"
 msgstr "àààààààààààààà(_U)"
 
 #: ../mail/em-subscription-editor.c:995
-#| msgid "Unsubscribe Folders"
 msgid "Unsu_bscribe From Hidden"
 msgstr "àààà àààà   ààààààààà àààààààààààà àààààààà"
 
 #: ../mail/em-subscription-editor.c:1003
-#| msgid "Unsubscribe from \"%s\""
 msgid "Unsubscribe From _All"
 msgstr "ààààà ààààà àààààààààààà àààààààààà (_A)"
 
-#: ../mail/em-subscription-editor.c:1679
+#: ../mail/em-subscription-editor.c:1682
 msgid "Folder Subscriptions"
 msgstr "àààà àààààà"
 
-#: ../mail/em-subscription-editor.c:1719
+#: ../mail/em-subscription-editor.c:1722
 msgid "_Account:"
 msgstr "àààà(_A):"
 
-#: ../mail/em-subscription-editor.c:1734
-#| msgid "Clear the search"
+#: ../mail/em-subscription-editor.c:1737
 msgid "Clear Search"
 msgstr "àààààààààà àààà"
 
-#: ../mail/em-subscription-editor.c:1752
-#| msgid "does not contain"
+#: ../mail/em-subscription-editor.c:1755
 msgid "Sho_w items that contain:"
 msgstr "ààààà àààà  ààààààà àààà:(_w)"
 
-#: ../mail/em-subscription-editor.c:1797
+#: ../mail/em-subscription-editor.c:1800
 msgid "Subscribe to the selected folder"
 msgstr "ààààà ààààà ààààààààà àààààààààààà àààààà"
 
-#: ../mail/em-subscription-editor.c:1798
-#| msgid "Subscribed"
+#: ../mail/em-subscription-editor.c:1801
 msgid "Su_bscribe"
 msgstr "àààààààààààà (_b)"
 
-#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../mail/em-subscription-editor.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Unsubscribe from the selected folder"
 msgstr "ààààààààà ààààààà ààààà àààààààààààà àààààààà"
 
-#: ../mail/em-subscription-editor.c:1883
+#: ../mail/em-subscription-editor.c:1886
 msgid "Collapse all folders"
 msgstr "ààààà àààààààààà àààààààà"
 
-#: ../mail/em-subscription-editor.c:1884
+#: ../mail/em-subscription-editor.c:1887
 msgid "C_ollapse All"
 msgstr "ààààààààààà ààààààààà(_o) "
 
-#: ../mail/em-subscription-editor.c:1894
+#: ../mail/em-subscription-editor.c:1897
 msgid "Expand all folders"
 msgstr "ààààà àààààààààà àààààààààààà"
 
-#: ../mail/em-subscription-editor.c:1895
+#: ../mail/em-subscription-editor.c:1898
 msgid "E_xpand All"
 msgstr "ààààà àààààààààà àààààààààààà(_x)"
 
-#: ../mail/em-subscription-editor.c:1905
-#| msgid "Refresh the folder"
+#: ../mail/em-subscription-editor.c:1908
 msgid "Refresh the folder list"
 msgstr "ààààààà àààààààà àààààààà àààààààà"
 
-#: ../mail/em-subscription-editor.c:1917
-#| msgid "Cancel the current mail operation"
+#: ../mail/em-subscription-editor.c:1920
 msgid "Stop the current operation"
 msgstr "àààààààà àààààà àààààààààà"
 
@@ -12582,7 +12187,7 @@ msgstr "à àààààààààà ààààà ààààààà
 msgid "Message Filters"
 msgstr "àààààà ààààààà"
 
-#: ../mail/em-utils.c:1000
+#: ../mail/em-utils.c:1067
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ààààà àààààààà"
@@ -12591,16 +12196,46 @@ msgstr "%s ààààà àààààààà"
 msgid "Search _Folders"
 msgstr "àààààààà ààààààààà(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:340
+#: ../mail/em-vfolder-editor-rule.c:391
 msgid "Add Folder"
 msgstr "ààààààààà ààààààààà"
 
+#: ../mail/em-vfolder-editor-rule.c:517
+msgid "Search Folder Sources"
+msgstr "ààààààà ààààààà ààààààà"
+
+#: ../mail/em-vfolder-editor-rule.c:549
+msgid "Automatically update on any _source folder change"
+msgstr ""
+
+#: ../mail/em-vfolder-editor-rule.c:561
+msgid "All local folders"
+msgstr "ààààà ààààààà ààààààà"
+
+#: ../mail/em-vfolder-editor-rule.c:562
+msgid "All active remote folders"
+msgstr "ààààà ààààààààà àààààà ààààààà"
+
+#: ../mail/em-vfolder-editor-rule.c:563
+msgid "All local and active remote folders"
+msgstr "ààààà ààààààà ààààà ààààààààà àààààà àààààààà"
+
+#: ../mail/em-vfolder-editor-rule.c:564
+msgid "Specific folders"
+msgstr "ààààààààà ààààààà"
+
+#: ../mail/em-vfolder-editor-rule.c:602
+#, fuzzy
+#| msgid "Create subfolders"
+msgid "include subfolders"
+msgstr "àààààààààà ààààààààààà"
+
 #: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "Elm àààààà àààààààààààààààà"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1069
+#: ../modules/mail/e-mail-shell-view.c:1074
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "àààààà"
@@ -12630,22 +12265,22 @@ msgstr "ààààààà ààààààààààààààà"
 msgid "Select folder to import into"
 msgstr "àààààààà àààààààààààààà ààààààà ààààààààààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:439
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ààààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:444
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ààààà"
 
-#: ../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 "àààààààà ààààààâàààààà (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:489
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ààààààààààà àààààààà ààààààâàààààà àààà ààààààà"
 
@@ -12724,7 +12359,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../mail/mail-config.ui.h:1
-#| msgid "Add Custom Junk Header"
 msgid "Set custom junk header"
 msgstr "àààààà àààààà ààààààà àààà àààààà"
 
@@ -12735,12 +12369,10 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail-config.ui.h:3
-#| msgid "Header Name:"
 msgid "Header name"
 msgstr "ààààà  àààà"
 
 #: ../mail/mail-config.ui.h:4
-#| msgid "Sender contains"
 msgid "Header content"
 msgstr "ààààà  ààààà"
 
@@ -12749,7 +12381,6 @@ msgid "Default Behavior"
 msgstr "ààààààà àààààààà"
 
 #: ../mail/mail-config.ui.h:6
-#| msgid "Format messages in _HTML"
 msgid "For_mat messages in HTML"
 msgstr "HTML àà àààààààà àààààààà(_m)"
 
@@ -12762,17 +12393,14 @@ msgid "Always request rea_d receipt"
 msgstr "ààààààà àààààà ààààà àà ààààààààààààà(_d)"
 
 #: ../mail/mail-config.ui.h:9
-#| msgid "Encode file names in an Outlook/GMail way"
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "_Outlook/GMailàààààà ààààà àààààà àààààààààà "
 
 #: ../mail/mail-config.ui.h:10
-#| msgid "Ch_aracter Encoding"
 msgid "Ch_aracter encoding:"
 msgstr "ààààà ààààààà(_a)"
 
 #: ../mail/mail-config.ui.h:11
-#| msgid "Replies and parents"
 msgid "Replies and Forwards"
 msgstr "àààààààààààààà ààààà ààààààààà àà"
 
@@ -12789,13 +12417,12 @@ msgid "Start _typing at the bottom on replying"
 msgstr "àààààààààààààààààà ààààààà ààààààààà ààààààààààààà (_t)"
 
 #: ../mail/mail-config.ui.h:15
-#| msgid "_Keep Signature above the original message on replying"
 msgid "_Keep signature above the original message on replying"
 msgstr "ààààààààààààà àààààààààààà ààààààààà  àààààà ààààààààà àààààà(_K)"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
-msgstr ""
+msgstr "ààààààààà àààààà àà: ààààààà àààààààààààà (_n) "
 
 #: ../mail/mail-config.ui.h:17
 msgid "Gro_up Reply goes only to mailing list, if possible"
@@ -12853,13 +12480,11 @@ msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:32
-#| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Sending a message with an _empty subject line"
 msgstr "ààààààààà àààà ààààààààààà àà ààààààààààààààà ààààààà(_e)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:34
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "ààààààààà Bcc àààààààààààààà àààààààààà àààààààààààààà ààààààà(_B)"
 
@@ -12884,7 +12509,6 @@ msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "ààààààààà àààààààààà ààààààààà àààààà àààààààààà àà ààààà ààààààà(_r)"
 
 #: ../mail/mail-config.ui.h:43
-#| msgid "Configuration"
 msgid "Confirmations"
 msgstr "àààààààààà"
 
@@ -12897,8 +12521,6 @@ msgid "b"
 msgstr "àà"
 
 #: ../mail/mail-config.ui.h:51
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "ààààààà"
@@ -12948,7 +12570,6 @@ msgid "_Secure HTTP Proxy:"
 msgstr "àààààà HTTP àààààààà (_S):"
 
 #: ../mail/mail-config.ui.h:62
-#| msgid "SOCKS proxy port"
 msgid "SOC_KS Proxy:"
 msgstr "SOC_KS àààààààà :"
 
@@ -12974,17 +12595,14 @@ msgid "Pass_word:"
 msgstr "àààààààà (_w):"
 
 #: ../mail/mail-config.ui.h:68
-#| msgid "Start: "
 msgid "Start up"
 msgstr "ààààààààààà"
 
 #: ../mail/mail-config.ui.h:69
-#| msgid "Check for _new messages every"
 msgid "Check for new _messages on start"
 msgstr "ààààà ààààààà ààààà àààààààà (_m)"
 
 #: ../mail/mail-config.ui.h:70
-#| msgid "Check for _new messages every"
 msgid "Check for new messa_ges in all active accounts"
 msgstr "ààààà ààààààà àààà ààààààà àà  ààààà ààààààà àààà ààààà àààààààà (_g)"
 
@@ -13009,162 +12627,143 @@ msgid "Select HTML variable width font"
 msgstr "HTML ààààààààà ààààààà ààààààà ààààààààààà"
 
 #: ../mail/mail-config.ui.h:76
-#| msgid "Fix_ed width Font:"
 msgid "Fix_ed Width Font:"
 msgstr "ààààà ààààààà ààààà:(_e)"
 
 #: ../mail/mail-config.ui.h:77
+msgid "_Mark messages as read after"
+msgstr "àààààààààà ààààààààà àààààààààà àààààààà(_M)"
+
+#: ../mail/mail-config.ui.h:79
 msgid "Highlight _quotations with"
 msgstr "àààààààààà àààààà àààààààààààààà(_q)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "color"
 msgstr "àààààà"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Default character e_ncoding:"
 msgstr "ààààààà ààààà àààààààààà(_n):"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Apply the same _view settings to all folders"
-msgstr ""
+msgstr "ààààà àààààààààà ààà ààààà àààààààààà àààààààààààà àààààà (_v) "
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "F_all back to threading messages by subject"
 msgstr "ààààà àààààà ààààààà ààààààààà àààààààààààààà (_a)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Delete Mail"
 msgstr "àààààà àà àààààààà"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Empty trash folders on e_xit"
 msgstr "ààààà àààààààààààà àààààààààà àààààààà àààààààààà"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
 msgstr "àà ààààààààà àààààààààààààààààààà ààààààààààààààààà(_w)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:86
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:88
 msgid "_Show animated images"
 msgstr "àààààààààà ààààààààà àààààà.(_S)"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ààààààààà àààààà ààààà ààààààààà ààààààààààààààà ààààààà (_P)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Loading Images"
 msgstr " àààààààà àààà ààààààààààà"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "_Never load images from the Internet"
 msgstr "ààààààààà ààààààààà ààààà ààààààà ààààààààà(_N)"
 
-#: ../mail/mail-config.ui.h:90
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:92
 msgid "_Load images only in messages from contacts"
 msgstr "ààààààà ààààà  ààààààà àààààààà àà ààààààààà àààà àààààà (_L)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "_Always load images from the Internet"
 msgstr "àààààààààà ààààààààà ààààààààà ààààà àààààààààà(_A)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "HTML Messages"
 msgstr "HTML àààààààà"
 
-#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "àààààààà"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "Sender Photograph"
 msgstr "ààààààààà àààààààààà"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "_Show the photograph of sender in the message preview"
 msgstr "àààààà àààààààààà ààààààààà ààààà àààààààààààà àààààà (_S)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ààààààà àààààààà àààààààààààà ààààààààà àààààààààààà ààààà ààààààà ààààààààà (_e)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "ààààààààààààà ààààà ààààààààà"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:100
 msgid "Mail Headers Table"
 msgstr "àààààà àààààà àààààà"
 
-#: ../mail/mail-config.ui.h:99
+#: ../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 "àààààà/àààà àààààààà"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:103
 msgid "Check incoming _messages for junk"
 msgstr "ààààà àààààààà ààààààààà àààààààà ààààà àààààààààààà"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:104
 msgid "Delete junk messages on e_xit"
 msgstr "àààààààààààààààà ààààààà ààààààààà àààààààààà (_x)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
 msgstr "àààààààà ààààà ààààààààààà àààààààà àààààààààààà (_s)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:106
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ààààààààà àààààààààà àààààààààà ààààà ààààààààà àààààààààà ààààààààààààà (_k)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:107
 msgid "_Lookup in local address book only"
 msgstr "ààààààà àààààààà ààààààààààà ààààààà àààààà (_L)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:108
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "àààààààààà àààààààà àààààààà àààà àààààààààààà à ààààààà àààààààààààààà."
 
-#: ../mail/mail-config.ui.h:108 ../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:160
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "àààààààààààà àààà"
 
-#: ../mail/mail-config.ui.h:109 ../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 àààààààààààà"
 
-#: ../mail/mail-config.ui.h:110 ../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 àààààààààààà"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "ààààààà ààààààà ààààààà"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "ààààà ààààààà ààààààà"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "ààààà ààààààààà àààààà ààààààà"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "ààààà ààààààà ààààà ààààààààà àààààà àààààààà"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "ààààààààà ààààààà"
-
-#: ../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."
@@ -13172,72 +12771,72 @@ msgstr ""
 "àààààààààààà àààà ààààààààà àààààààà ààààààà àààààà ààààààààà.\n"
 "\"àààààà\" àààà ààààà àààààààààààààà àààààà àààààà ààààààààààà."
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "àààààà(_F):"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "ààààà àààààààà(_D):"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ààààààààà(_m)"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Call"
 msgstr "àà"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "ààààààà àààààààà"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "ààààààààà"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "àà ààààààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "ààààà"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "à ààààààààààà ààààààààà"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "ààààààààààà ààààààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
 msgstr "àààààààààà"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "àààààààà ààààààà"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "àààààààà ààààààààààà ààààààààààà àààààà ààààâàààààà(_T)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "àààààààà àà àààààààà(_A)"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ààààà ààààààà"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "ààààààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "ààààààààà"
 
@@ -13422,7 +13021,7 @@ msgid ""
 msgstr "àààààààààà ààààà ààààààààà ààààààààà àààà ààààààààà àààààààààààààààààààààààà?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "_Empty Trash"
 msgstr "àààààààààààà àààààààààà(_E)"
 
@@ -13504,14 +13103,26 @@ msgstr ""
 "ààààààààààà."
 
 #: ../mail/mail.error.xml.h:60
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "ààààà àààà &quot;{0}&quot; àà àààààààààààààà."
+
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "ààààà àààà &quot;{0}&quot; àà àààààààààààààà."
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ààààààà ààààà \"{0}\"àà àààààààààà ààààààà àààà ààààààààà."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "àààààà ààààà \"{0}\" ààààà ààààààààà ààààà àààààààààà àààààààààà?"
 
-#: ../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."
@@ -13519,25 +13130,20 @@ msgstr ""
 "àààà ààààààà àà ààààààààà, àààà ààààààà ààààà àààà àà àààààààààà'ààààà ààààààààà  ààààààààà "
 "ààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "àààààà ààààààà \"{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 "àààà ààààààà àà ààààààààà, àààà ààààà àààààààààà ààààààààà àààààààààààààà."
 
-#: ../mail/mail.error.xml.h:66
-#| msgid "Text message part limit"
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "à àààààààà àààà àààààà."
 
-#: ../mail/mail.error.xml.h:67
-#| msgid ""
-#| "Warning: Deleting messages from a Search Folder will delete the actual "
-#| "message from one of your local or remote folders.\n"
-#| "Do you really want to do this?"
+#: ../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 "
@@ -13547,65 +13153,65 @@ msgstr ""
 "àààààààààààà àààààà ààààààà àààà àààààààààà ààààà àààà ààààààààà àààààààààààà. àààà àààààà à ààààààààà "
 "ààààààààààà àààà àààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"àà \"{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 "\"{1}\" àààààà ààààà ààààààààà ààààà. àààààà ààààà àààààà àààààààààààà."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ààààà \"{0}\"àà \"{1}\"àà àààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "àààà \"{2}\"àà àààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "ààààààà \"{2}\"àà àààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ààààà \"{0}\"àà \"{1}\"àà àààààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "ààààà \"{0}\"àà àààààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "\"{1}\" ààààà àààààààà."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "àààà àà ààààà ààààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "ààààààà ààààààà ààààààà àààà àààààààà."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "àààà ààà àààààà ààààà ààààààà ààààààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "àààà ààààààààà à àààààà ààààààààààààà àààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "àààà ààààààààà, àààà ààààààà ààààààààà ààààààààààààààà."
 
-#: ../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 ""
 "àààà ààààààààà à àààà àà ààààà\n"
 "àààà ààààà ààààààààààà àààààààààààààààààààààààà?"
 
-#: ../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."
@@ -13613,31 +13219,31 @@ msgstr ""
 "àààà ààààààààà, àààà ààààààà ààààà\n"
 "àààààààà ààààààà àààà ààààààààà ààààààààààààààà."
 
-#: ../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 ""
 "àààà ààààààààà à àààààà àààààà ààààà\n"
 "àààà ààààà ààààààààààà ààààààààààààà àààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "àààà ààààààààà, ààààà àààààààà àààààà ààààààààà ààààààààààààà."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "ààààà àààààààà(_N)"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:628
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:626
 msgid "_Disable"
 msgstr "àààààààààààà(_D)"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ààààààà ààààà \"{0}\"àà ààààààààààà ààààààà ààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:89
+#: ../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."
@@ -13645,39 +13251,39 @@ msgstr ""
 "à ààààà ààààààààà ààààààà àààààààà,\n"
 "àààààààààà àààààààà ààààààà ààààà ààààààààà àààààààà, àààààààà."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ààààààà ààààà \"{0}\"àà àààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "\"{0}\" àààààà ààààà àààààààààààààà. àààààà ààààà àààààà àààààààààààà."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "ààààààà ààààààà àààààààààààà àààààààààààààà."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "àààààà ààààààà àààààààààààà àààààààààààààà."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "àààààà ààààà"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "àààà ààààà àà ààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "àààà à ààààààà ààààààà ààààààà àààààà."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "à ààààààà àààààààààà"
 
-#: ../mail/mail.error.xml.h:100
+#: ../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 "
@@ -13687,11 +13293,11 @@ msgstr ""
 "àààààààà àààààààà ààààààààààà àààà, ààààà/àààà ààààà ààààààà àààààààà ààààààààààà, ààààà àààààà "
 "àààààààà ààààà àààààà,àààà ààààà."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ààà àààààà ààààà \"{0}\"àà àààààààààààààààààà ààààà."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13703,23 +13309,23 @@ msgstr ""
 "àààà à ààààààà àààààààààà ààààààààààààà, àààà ààààààà àààààààààààààààà àààà ààààààààà, àààà "
 "àààààààààààààà."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "ààààààààà"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "àààààààààààà(_O)"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "àààààààà(_A)"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../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 "
@@ -13730,21 +13336,19 @@ msgid ""
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
-#| msgid "Evolution"
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "ààààààààà ààààà àààààààààààà(_E)"
 
-#: ../mail/mail.error.xml.h:114
-#| msgid "Migration"
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "ààààààà ààààà àààààààà(_M)"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "àààààààà àààààà ààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:116
+#: ../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."
@@ -13752,246 +13356,222 @@ msgstr ""
 "àààààààà àààà \"{0}\"àà ààààààà ààààààà, ààààààààà àààààààà. àààà à ààààààààààà àààà àààààààà "
 "ààààààààààààààà àààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "àààààà ààààà"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "àààààààààààààààààà ààààààà àààààààà àààààà ààààà ààààààà àààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:119
-#| msgid "Querying server for a list of supported authentication mechanisms."
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "àààààà ààààààààààà ààààààà àààààà àààà ààààà ààààààààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:120
-msgid "Unable to connect to the GroupWise server."
-msgstr "àààààààà ààààààà ààààààààààààà àààààààààà."
-
-#: ../mail/mail.error.xml.h:121
-msgid "Please check your account settings and try again."
-msgstr "àààààà àà àààà àààààààà àààààààà àààà ààààààààààààà"
-
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
 msgstr "àààààààà àààààààààà àààâàààà àààààààààà àààààààà àààààà?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "àààâàààà àààààààààà àààààààààààà àààààààà àààà àààààààààà àààààààà àààààààààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
 msgstr "àààààààà àààààààà(_N)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "_Synchronize"
 msgstr "àààààààà(_S)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid "Do you want to mark all messages as read?"
 msgstr "àààà ààààà ààààààààà àààààà àààààà àààààààààààààà àààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:128
 msgid "This will mark all messages as read in the selected folder."
 msgstr "ààààààààà ààààààààà àààààààààààà à ààààà ààààààààà àààààààààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "ààà ààààààààà ààààààààà ààààà àààà àààààààààààà ààààà ààààààààà àààààààààà àààààààààààààà."
 
-#: ../mail/mail.error.xml.h:129
-#| msgid "Close this window"
+#: ../mail/mail.error.xml.h:130
 msgid "Close message window."
 msgstr "ààààà ààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:130
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:131
 msgid "Would you like to close the message window?"
 msgstr "àààà ààààà ààààààà àààààààààààààà àààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:131
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:132
 msgid "_Yes"
 msgstr "ààààà(_Y)"
 
-#: ../mail/mail.error.xml.h:132
-#| msgid "No"
+#: ../mail/mail.error.xml.h:133
 msgid "_No"
 msgstr "àààà(_N)"
 
-#: ../mail/mail.error.xml.h:133
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:134
 msgid "_Always"
 msgstr "ààààààààààà(_A)"
 
-#: ../mail/mail.error.xml.h:134
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:135
 msgid "N_ever"
 msgstr "ààààààààààààà(_e)"
 
-#: ../mail/mail.error.xml.h:135
-#| msgid "Copying folder %s"
+#: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
 msgstr "ààààààààààààà ààààà "
 
-#: ../mail/mail.error.xml.h:136
-#| msgid "Are you sure you want to delete the memo '{0}'?"
+#: ../mail/mail.error.xml.h:137
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "àààà ààààààà '{1}' àà ààààààà '{0}' àààà ààààààààààà àààààààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:137
-#| msgid "Moving folder %s"
+#: ../mail/mail.error.xml.h:138
 msgid "Move folder in folder tree."
 msgstr "ààààààà àààààà àààà ààààààà ààààààà."
 
-#: ../mail/mail.error.xml.h:138
-#| msgid "Are you sure you want to delete the '{0}' task?"
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "àààà ààààààà '{1}' àà ààààààà '{0}' àààààààààà àààààààààààààààààà?"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "à àààààà ààààààà àààààààà ààààààà ààààààààà àààà ààààààà àààà"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Please enable the account or send using another account."
 msgstr "àààààà àààààà ààààà àààààà àààà àààà àààà àà ààààààààà àààààà."
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid "Mail Deletion Failed"
 msgstr "àààààà àà ààààààààà ààààààààà"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "à àààààà àà ààààààààààà àààà àààààààààà ààààààààà ààààààààà."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid "\"Check Junk\" Failed"
 msgstr "\"àààààà ààààà àààà\" àààààààààà"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Junk\" Failed"
 msgstr "\"ààààààà àààààà\" àààààààààà"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"ààààààààà àààààà ààààààà\" àààààààààà"
 
-#: ../mail/mail.error.xml.h:146
-#| msgid "Remove the delegate %s?"
+#: ../mail/mail.error.xml.h:147
 msgid "Remove duplicate messages?"
 msgstr "ààààààà ààààà àààààààààà?"
 
-#: ../mail/mail.error.xml.h:147
-#| msgid "Unfinished messages found"
+#: ../mail/mail.error.xml.h:148
 msgid "No duplicate messages found."
 msgstr "ààààà ààààààààà àààààààà."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:149
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:150
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ààààààà '{0}' à ààààà àààààà ààààà àààà."
 
-#: ../mail/mail.error.xml.h:150
-#| msgid "Really unsubscribe from folder \"%s\"?"
-msgid "Failed to unsubscribe from folder."
+#: ../mail/mail.error.xml.h:151
+#, fuzzy
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "ààààààààààà àààà àààà &quot;{0}&quot; àà ààààààààààààà."
+
+#: ../mail/mail.error.xml.h:153
+#, fuzzy
+#| msgid "Failed to unsubscribe from folder."
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "ààààààà ààààà ààààààààààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:152
-#| msgid "Unable to retrieve message"
+#: ../mail/mail.error.xml.h:154
 msgid "Unable to retrieve message."
 msgstr "àààààà ààààààààààà  àààààààààà."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:155
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:154
-#| msgid "failed to open book"
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to open folder."
 msgstr "ààààààà àààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:155
-#| msgid "Failed to send %d of %d messages"
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to find duplicate messages."
 msgstr "ààààà ààààààààà àààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:156
-#| msgid "Unable to retrieve message"
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
 msgstr "ààààààààà ààààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
 msgstr "ààààààà ààààà àààààààààà ààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:158
-#| msgid "_Download Messages for Offline Usage"
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to download messages for offline viewing."
 msgstr "ààà ààààà àààààààà ààààààà àààààààààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:159
-#| msgid "Failed to send %d of %d messages"
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to save messages to disk."
 msgstr "àààààààà ààààààààà àààà ààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:162
 msgid "Hidden file is attached."
 msgstr "àààààà ààààà ààààààààààààààààààà."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:163
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:162
-#| msgid "Print this calendar"
+#: ../mail/mail.error.xml.h:164
 msgid "Printing failed."
 msgstr "àààààà àààààààààà."
 
-#: ../mail/mail.error.xml.h:163
-#| msgid "The reported error was &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:165
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "àààààààà &quot;{0}&quot; ààà ààààààààààà."
 
-#: ../mail/mail.error.xml.h:164
-#| msgid "Cannot perform the operation."
+#: ../mail/mail.error.xml.h:166
 msgid "Could not perform this operation on {0}."
 msgstr "{0} à ààààààààà àààààà àààààà."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "àààààààààààààà..."
 
-#: ../mail/mail-send-recv.c:518
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "àààààà àà àààà & àààààààààà"
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "ààààààààà ààààààààà(_A)"
 
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:1003
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "ààààààààààà..."
 
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:708
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "àààààààà..."
 
-#: ../mail/mail-send-recv.c:983
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "ààààà àààààà ààààà àààààààààààààà"
@@ -14004,96 +13584,95 @@ msgstr "àààààààà ààààààààà"
 msgid "Edit Search Folder"
 msgstr "ààààààà ààààààààà àààààààààààà"
 
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "ààààà ààààààà ààààà"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1262
 msgid "Unseen"
 msgstr "ààààà"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1263
 msgid "Seen"
 msgstr "àààà"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1264
 msgid "Answered"
 msgstr "ààààààààààààà"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1265
 msgid "Forwarded"
 msgstr "ààààààà"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1266
 msgid "Multiple Unseen Messages"
 msgstr "àààààààààà àààà àààààààà"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1267
 msgid "Multiple Messages"
 msgstr "àààà àààààààà"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1271
 msgid "Lowest"
 msgstr "ààààààààà"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1272
 msgid "Lower"
 msgstr "àààààà"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1276
 msgid "Higher"
 msgstr "àààààà"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1277
 msgid "Highest"
 msgstr "ààààààààà"
 
-#: ../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 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "à ààààÂ%l:%MÂ%p"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1916
 msgid "Yesterday %l:%M %p"
 msgstr "àààààÂ%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 "%bÂ%dÂ%l:%MÂ%p"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1938
 msgid "%b %d %Y"
 msgstr "%bÂ%dÂ%Y"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2769
 msgid "Select all visible messages"
 msgstr "ààààà ààààààààààààààà àààààààààà"
 
-#: ../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 "àààààààà"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4107
-#| msgid "Follow-Up"
+#: ../mail/message-list.c:4132
 msgid "Follow-up"
 msgstr "ààààààààà "
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4666 ../mail/message-list.c:5086
+#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
 msgid "Generating message list"
 msgstr "ààààà àààààààà àààààààààààà"
 
-#: ../mail/message-list.c:4900
+#: ../mail/message-list.c:4868
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -14101,7 +13680,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:4905
+#: ../mail/message-list.c:4873
 msgid "There are no messages in this folder."
 msgstr "à ààààààààà àààààààà àààà."
 
@@ -14138,38 +13717,37 @@ msgid "Subject or Addresses contains"
 msgstr "ààà àààààààààà ààààà àààà àààààààààà"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Recipients contain"
 msgstr "ààààààààààààà ààààààààà"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Message contains"
 msgstr "àààààà àààààààà"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Subject contains"
 msgstr "ààààà ààààààààà"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Sender contains"
 msgstr "ààààààààà ààààààààà"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Body contains"
 msgstr "àààààààààà àààààààà"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Table column:"
 msgstr "àààààà àààààààààà:(_T)"
 
 #: ../modules/addressbook/autocompletion-config.c:99
-#| msgid "Free/Busy information"
 msgid "Address formatting"
 msgstr "àààààààà ààààààààààà"
 
@@ -14206,7 +13784,7 @@ msgid "Contact information for %s"
 msgstr "%s ààààà àààààààà ààààààà"
 
 #: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:119
+#: ../modules/addressbook/e-book-shell-view-actions.c:131
 msgid "New Address Book"
 msgstr "ààà àààààààà ààààààà"
 
@@ -14216,7 +13794,7 @@ msgid "_Contact"
 msgstr "àààààà (_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "Create a new contact"
 msgstr "ààààà àààààààààà ààààààààà"
 
@@ -14226,7 +13804,7 @@ msgid "Contact _List"
 msgstr "ààààààà àààààà (_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Create a new contact list"
 msgstr "ààààà ààààà àààààààà ààààààààà"
 
@@ -14236,12 +13814,12 @@ msgid "Address _Book"
 msgstr "àààààààà ààààààà (_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:834
 msgid "Create a new address book"
 msgstr "ààà àààààààà ààààààààààà ààààààààà"
 
 #: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:356
 msgid "Contacts"
 msgstr "àààààààà"
 
@@ -14249,277 +13827,273 @@ msgstr "àààààààà"
 msgid "Certificates"
 msgstr "ààààààà àààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:192
+#: ../modules/addressbook/e-book-shell-view-actions.c:204
 msgid "Address Book Properties"
 msgstr "ààààààà ààààààà àààààààà"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:374
-#: ../modules/addressbook/e-book-shell-view-actions.c:670
+#: ../modules/addressbook/e-book-shell-view-actions.c:386
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Save as vCard"
 msgstr "vCard àà àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "Co_py All Contacts To..."
 msgstr "ààààà ààààààààà àààààààààà(p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:813
 msgid "Copy the contacts of the selected address book to another"
 msgstr "àààà ààààààààà àààààààà ààààààà ààààà ààààààààà àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:806
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "D_elete Address Book"
 msgstr "àààààààà ààààààààààà àààààààà(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "Delete the selected address book"
 msgstr "ààààààààà àààààààà ààààààà àààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Mo_ve All Contacts To..."
 msgstr "ààààà ààààààààà ààààààà(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:815
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Move the contacts of the selected address book to another"
 msgstr "àààà ààààààààà àààààààà ààààààà ààààà ààààààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "_New Address Book"
 msgstr "ààà àààààààà ààààààà(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Address _Book Properties"
 msgstr "àààààààà ààààààà àààààààà(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:829
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show properties of the selected address book"
 msgstr "ààààààààà àààààààà ààààààà ààààà àààààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
-#| msgid "Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Address Book _Map"
 msgstr "àààààààà àààààà ààà(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:836
+#: ../modules/addressbook/e-book-shell-view-actions.c:848
 msgid "Show map with all contacts from selected address book"
 msgstr "ààààààààà àààààààà ààààààà ààààà ààààà ààààààààà àà àààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../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 "àààààààààà(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "Rename the selected address book"
 msgstr "ààààààààà àààààààà ààààààà àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:850
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Stop loading"
 msgstr "àààà àààààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "_Copy Contact To..."
 msgstr "àààààààààà   àààààààààà(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Copy selected contacts to another address book"
 msgstr "àààà àààààààà ààààààààààà ààààààààà ààààààààà àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "_Delete Contact"
 msgstr "àààààààààà àààààààà(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "_Find in Contact..."
 msgstr "àààààààà àààààààà ...(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Search for text in the displayed contact"
 msgstr "ààààààààààààà ààààà àà àààààààà àààà ààààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "_Forward Contact..."
 msgstr "àààààààààà ààààààà àààààà(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Send selected contacts to another person"
 msgstr "ààààààààà ààààààààà àààà ààààààààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "_Move Contact To..."
 msgstr "àààààààààà ààààààà (_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
 msgid "Move selected contacts to another address book"
 msgstr "àààà àààààààà ààààààààààà ààààààààà ààààààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "_New Contact..."
 msgstr "ààààà àààààà(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "New Contact _List..."
 msgstr "ààààà ààààààààà àààààà(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "_Open Contact"
 msgstr "àààààà àààààà (_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "View the current contact"
 msgstr "àààààààà àààààààààà àààààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "_Send Message to Contact..."
 msgstr "àààààààààà àààààà àààààà(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Send a message to the selected contacts"
 msgstr "ààààààààà ààààààààà àààààààààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1603
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../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 "ààààààà(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../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 "àààààààà(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../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 "àààààààà(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "_Properties"
 msgstr "àààààààà(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#| msgid "Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Address Book Map"
 msgstr "àààààààà àààààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Contact _Preview"
 msgstr "àààààà àààààààà(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show contact preview window"
 msgstr "ààààà ààààààà ààààààààààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
-#| msgid "Show as list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Show _Maps"
 msgstr "ààà ààààààà(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
-#| msgid "Show contact preview window"
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Show maps in contact preview window"
 msgstr "ààààà àààààààààà ààààà àà àààà àààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1005
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../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 "ààààààààààààà àààààà(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "Show contact preview below the contact list"
 msgstr "ààààààà àààààà àààààà àààà àààààà àààààààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1012
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../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 "àààààà àààààà(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "Show contact preview alongside the contact list"
 msgstr "ààààààà àààààà ààààà ààààà àààààààààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1759
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../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 "àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-cal-shell-view-actions.c:1780
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c: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 "àààààààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../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 "àààààààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1084
 msgid "Print all shown contacts"
 msgstr "ààààà ààààààààààà ààààààààà ààààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1091
 msgid "Preview the contacts to be printed"
 msgstr "ààààààààà àààààààààààààà àààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1086
+#: ../modules/addressbook/e-book-shell-view-actions.c:1098
 msgid "Print selected contacts"
 msgstr "ààààààààà ààààààààà ààààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "S_ave Address Book as vCard"
 msgstr "ààààààà ààààààààààà  Vàààààà àà àààààà(_a)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "àà vCard àà ààààààààà àààààààà ààààààà ààààà ààààààààà àààà àààààà"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1109
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1131
 msgid "_Save as vCard..."
 msgstr "Vàààààà àààààà(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
 msgid "Save selected contacts as a vCard"
 msgstr "àà vCard ààààààààà ààààààààà àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view.c:295
+#: ../modules/addressbook/e-book-shell-view.c:300
 msgid "_Forward Contacts"
 msgstr "ààààààààààà ààààààà àààà(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:297
+#: ../modules/addressbook/e-book-shell-view.c:302
 msgid "_Forward Contact"
 msgstr "àààààààààààà ààààààààààà(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:328
+#: ../modules/addressbook/e-book-shell-view.c:333
 msgid "_Send Message to Contacts"
 msgstr "ààààààààààà àààààà àààà(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:330
+#: ../modules/addressbook/e-book-shell-view.c:335
 msgid "_Send Message to List"
 msgstr "àààààààà àààààà àààà(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:332
+#: ../modules/addressbook/e-book-shell-view.c:337
 msgid "_Send Message to Contact"
 msgstr "àààààààààà àààààà àààà(_S)"
 
@@ -14553,17 +14127,15 @@ msgstr "àààààà àààà àààààà àààààà"
 
 #: ../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:112
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
 msgid "_Port:"
 msgstr "àààààà(_P):"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
-#| msgid "_Server:"
 msgid "Ser_ver:"
 msgstr "ààààà(_v):"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
-#| msgid "_Use secure connection:"
 msgid "Use secure _connection:"
 msgstr "àààààà àààààààà ààààààààààà(_c):"
 
@@ -14588,7 +14160,6 @@ msgid "_Find Possible Search Bases"
 msgstr "àààààààà àààààà ààààààà ààààààààààà(_F)"
 
 #: ../modules/addressbook/ldap-config.ui.h:21
-#| msgid "Search _filter:"
 msgid "S_earch filter:"
 msgstr "ààààààà ààààà(_e):"
 
@@ -14616,8 +14187,6 @@ msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-#| msgid "contact"
-#| msgid_plural "contacts"
 msgid "contacts"
 msgstr "àààààààà"
 
@@ -14635,7 +14204,6 @@ msgid "B_rowse this book until limit reached"
 msgstr "ààààààààà àààààààà àààààààààà àààààààààààà (_r)"
 
 #: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
-#| msgid "Audio Inline"
 msgid "Audio Player"
 msgstr "ààààà ààààààà"
 
@@ -14644,10 +14212,6 @@ msgid "Play the attachment in embedded audio player"
 msgstr ""
 
 #: ../modules/backup-restore/e-mail-config-restore-page.c:167
-#| 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."
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14658,12 +14222,10 @@ msgstr ""
 "à ààààà àà ààààààààà àààààà, ààààààààààà àààààà ààààààà, ààààààààà àààààààààààààààààà ààààààààà"
 
 #: ../modules/backup-restore/e-mail-config-restore-page.c:182
-#| msgid "Restore from backup"
 msgid "_Restore from a backup file:"
 msgstr "ààààààààà ààààà ààààààààààààààààà(_R)"
 
 #: ../modules/backup-restore/e-mail-config-restore-page.c:193
-#| msgid "Choose a file to restore"
 msgid "Choose a backup file to restore"
 msgstr "àààààààààààààààààà ààààà ààààààà ààààààààà"
 
@@ -14671,7 +14233,6 @@ msgstr "àààààààààààààààààà ààààà 
 #. * 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"
 msgid "Restore from Backup"
 msgstr "ààààààà ààààà ààààààààààààà"
 
@@ -14692,7 +14253,6 @@ msgid "_Restart Evolution after restore"
 msgstr "àààààààààà àà ààààààààààà ààààààààààà àààààààààààààààà(_R)"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:308
-#| msgid "Backing up Evolution Data"
 msgid "_Back up Evolution Data..."
 msgstr "ààààààà ààààààààà ààààààà ...(_B)"
 
@@ -14701,7 +14261,6 @@ msgid "Back up Evolution data and settings to an archive file"
 msgstr "ààààààà ààààààà ààààààà ààààààààà àààà ààààà ààààààààààà"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:315
-#| msgid "Restoring Evolution Data"
 msgid "R_estore Evolution Data..."
 msgstr "àààààààààà àààààà àààààààààààààààà(_e)"
 
@@ -14709,112 +14268,108 @@ msgstr "àààààààààà àààààà ààààààà
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "àà ààààààà ààààà ààààà ààààààààà àààà ààààà ààààààààààà ààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
-#| msgid "Backup Evolution directory"
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "ààààààà ààààààààà àààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "àààààààààà ààààààààà ààààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
-#| msgid "Check Evolution Backup"
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "ààààààààà ààààààà ààààà àààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "ààààààààà àà ààà:ààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "àààààààààà ààààààààààà àààààâàààà àà"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:312
-#: ../modules/backup-restore/evolution-backup-tool.c:441
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:469
 msgid "Shutting down Evolution"
 msgstr "ààààààààà àà àààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:324
 msgid "Backing Evolution accounts and settings"
 msgstr "àààààààààà ààààààà ààààà àààààààà àààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
+#: ../modules/backup-restore/evolution-backup-tool.c:341
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "àààààààààà àààààà ààààààà ààààààààà (àààààààà, àààààààà, àààààààààà, àààààààààà, àààààà)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:354
-#| msgid "Backup complete"
+#: ../modules/backup-restore/evolution-backup-tool.c:357
 msgid "Back up complete"
 msgstr "àààààà ààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:361
-#: ../modules/backup-restore/evolution-backup-tool.c:608
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
 msgid "Restarting Evolution"
 msgstr "àààààààààà àà ààààààààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:447
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Back up current Evolution data"
 msgstr "ààààààà àààààààààà àààààààààà àààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:455
-#| msgid "Extracting files from backup"
+#: ../modules/backup-restore/evolution-backup-tool.c:483
 msgid "Extracting files from back up"
 msgstr "ààààààà ààààà ààààààààààà ààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "àààààààààà àààààààà àààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:624
 #, fuzzy
 #| msgid "Removing temporary backup files"
 msgid "Removing temporary back up files"
 msgstr "àààààààààààà ààààààà àààààààààà àààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:590
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Reloading registry service"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:815
+#: ../modules/backup-restore/evolution-backup-tool.c:861
 #, fuzzy
 #| msgid "Evolution Backup"
 msgid "Evolution Back Up"
 msgstr "àààààààààà ààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:816
+#: ../modules/backup-restore/evolution-backup-tool.c:862
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ààààààà %sàà ààààààààà ààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:820
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Restore"
 msgstr "ààààààààà ààààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:821
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s ààààà ààààà àààààààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:935
 msgid "Backing up Evolution Data"
 msgstr "àààààààààà àààààà ààààààààà ààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:936
 msgid "Please wait while Evolution is backing up your data."
 msgstr "àààààààà àààààààààà ààààààààà ààààààààààààààà àààààà ààààààààààà."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:892
+#: ../modules/backup-restore/evolution-backup-tool.c:938
 msgid "Restoring Evolution Data"
 msgstr "àààààààààà àààààà àààààààààààààààà"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:893
+#: ../modules/backup-restore/evolution-backup-tool.c:939
 msgid "Please wait while Evolution is restoring your data."
 msgstr "àààààààààà àààààààà ààààààààààààààààààààà àààààà ààààààààààà."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:957
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "àà ààààààààà ààààààààààààà ààààààà àààà àààààààà àààààààààààà."
 
@@ -14944,7 +14499,7 @@ msgstr "ààààààààààà"
 
 #: ../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:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "Authentication"
 msgstr "ààààààààààà"
 
@@ -14980,7 +14535,7 @@ msgid "Using LDAP"
 msgstr ""
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:58
+#: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "ààààààààààààà"
 
@@ -15054,7 +14609,7 @@ msgid "Browse until limit is reached"
 msgstr "ààààààààà àààààààà àààààààààà àààààààààààà (_r)"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:133
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
 msgid "URL:"
 msgstr "URL:"
 
@@ -15064,35 +14619,35 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch àààààààààà ( apache < 2.2.8 àààà ààààà) (_A)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
 #, fuzzy, c-format
 #| msgid "GConf error: %s"
 msgid "HTTP Error: %s"
 msgstr "GConf ààààà: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 #, fuzzy
 msgid "Could not parse response"
 msgstr "PGP àààààààààà àààààà ààààààààààààà"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
 #, fuzzy
 #| msgid "Empty message"
 msgid "Empty response"
 msgstr "àààà àààààà"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
 #, fuzzy
 #| msgid "Send _reply to sender"
 msgid "Unexpected reply from server"
 msgstr "ààààààààààà ààààààààààààà àààààà(_r)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
 #, fuzzy
 msgid "Could not locate user's calendars"
 msgstr "à ààààààààààààà àààààààààààààààà"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
 #, fuzzy
 #| msgid "_Path:"
 msgid "Path"
@@ -15203,20 +14758,6 @@ msgstr "àààà(_F):"
 msgid "Allow Evolution to update the file"
 msgstr "àààààà ààààààà ààààà ààààà ààààààà àààààààààààààà àààààààààà àà ààààààààà"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
-msgid "Metric (Celsius, cm, etc)"
-msgstr "àààààààà (Celsius, cm, etc)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "ààààààààà (ààààààâàààà, àààààààà, ààà.)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
-#, fuzzy
-#| msgid "_Units:"
-msgid "Units:"
-msgstr "àààààààààà(_U):"
-
 #: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
@@ -15238,18 +14779,18 @@ msgstr "ààààààààààâàà àààààààààà
 msgid "I_mport to Tasks"
 msgstr "àààààààààààà ààààààà àààààà (_m)"
 
-#: ../modules/calendar/e-calendar-preferences.c:406
+#: ../modules/calendar/e-calendar-preferences.c:407
 #, fuzzy
 #| msgid "Selected Calendars for Reminders"
 msgid "Selected Calendars for Alarms"
 msgstr "ààààààà ààààà àààààààààà àààààààààààà"
 
-#: ../modules/calendar/e-calendar-preferences.c:828
+#: ../modules/calendar/e-calendar-preferences.c:829
 #, fuzzy
 msgid "Ti_me and date:"
 msgstr "àààà ààààà àààà:"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:830
 #, fuzzy
 msgid "_Date only:"
 msgstr "àààà ààààààà:"
@@ -15324,7 +14865,7 @@ msgid "_24 hour"
 msgstr "_24ààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Work Week"
 msgstr "ààà àààà"
 
@@ -15491,7 +15032,7 @@ msgid "Publishing Information"
 msgstr "àààààààààà àààààààààààààà"
 
 #: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
+#: ../modules/calendar/e-cal-shell-view-actions.c:192
 msgid "New Calendar"
 msgstr "ààààà àààààààààà"
 
@@ -15501,7 +15042,7 @@ msgid "_Appointment"
 msgstr "ààààààà (_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
 msgid "Create a new appointment"
 msgstr "ààààà àààààààààà ààààààààà"
 
@@ -15529,7 +15070,7 @@ msgid "Cale_ndar"
 msgstr "àààààààààà (_n)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Create a new calendar"
 msgstr "ààààà àààààààààà àà ààààààààà"
 
@@ -15537,26 +15078,26 @@ msgstr "ààààà àààààààààà àà àààààà
 msgid "Calendar and Tasks"
 msgstr "àààààààààà ààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:209
+#: ../modules/calendar/e-cal-shell-sidebar.c:211
 #, fuzzy
 msgid "Loading calendars"
 msgstr "àààààààààà àà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:715
+#: ../modules/calendar/e-cal-shell-sidebar.c:731
 #, fuzzy
 msgid "Calendar Selector"
 msgstr "àààààààààà àààà ààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1066
+#: ../modules/calendar/e-cal-shell-sidebar.c:1090
 #, fuzzy, c-format
 msgid "Opening calendar '%s'"
 msgstr "ààààààààààâàà ààààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:292
 msgid "Calendar Properties"
 msgstr "àààààààààà àààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../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 "
@@ -15567,401 +15108,401 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:340
 msgid "Purge events older than"
 msgstr "ààààààààà àààààà àààààà àààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:590
+#: ../modules/calendar/e-cal-shell-view-actions.c:591
 #, fuzzy
 msgid "Copying Items"
 msgstr "ààààà ààààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:885
 #, fuzzy
 msgid "Moving Items"
 msgstr "ààààààà àààààààààà"
 
 #. 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:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1218
 #, fuzzy
 msgid "event"
 msgstr "ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1219
+#: ../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:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:549
+#: ../modules/calendar/e-task-shell-view-actions.c:666
 #, fuzzy
 msgid "Save as iCalendar"
 msgstr "ààààààààààâàà ààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "_Copy..."
 msgstr "àààààààà(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 #, fuzzy
 msgid "D_elete Calendar"
 msgstr "ààààààààààâàà ààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #, fuzzy
 msgid "Delete the selected calendar"
 msgstr "ààààààààà ààààààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 #, fuzzy
 msgid "Go Back"
 msgstr "ààààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 #, fuzzy
 msgid "Go Forward"
 msgstr "ààààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Select today"
 msgstr "à àààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "Select _Date"
 msgstr "àààààààààààààààà(_D) "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Select a specific date"
 msgstr "àààààààààààà àààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "_New Calendar"
 msgstr "ààààà àààààààààà(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Purg_e"
 msgstr "àààààààààààà(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Purge old appointments and meetings"
 msgstr "ààà àààààààààà ààààà àààààààààà àààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../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 "àààààààà(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "ààààààààà ààààààààà ààà:ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 #, fuzzy
 msgid "Rename the selected calendar"
 msgstr "ààààààààà ààààààààà ààà:ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Find _next"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 #, fuzzy
 #| msgid "Find the next occurrence of the phrase"
 msgid "Find next occurrence of the current search string"
 msgstr "àààà ààààà ààààààà àààààààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 #, fuzzy
 #| msgid "_Previous"
 msgid "Find _previous"
 msgstr "àààààà(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 #, fuzzy
 #| msgid "Find the previous occurrence of the phrase"
 msgid "Find previous occurrence of the current search string"
 msgstr "ààààààààà ààààààà ààààààààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Stop _running search"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "Stop currently running search"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 #, fuzzy
 msgid "Show _Only This Calendar"
 msgstr "à àààààààààà ààààààà àààààà(_o)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Cop_y to Calendar..."
 msgstr "àààààààààà àà àààààààà(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "_Delegate Meeting..."
 msgstr "àààààààà àààààààà àààààààà(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 #, fuzzy
 msgid "_Delete Appointment"
 msgstr "ààààààààààà àààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 #, fuzzy
 msgid "Delete selected appointments"
 msgstr "ààààààààààà àààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 #, fuzzy
 msgid "Delete This _Occurrence"
 msgstr "à ààààààààà àààààààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Delete this occurrence"
 msgstr "à ààààààààà àààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 #, fuzzy
 msgid "Delete All Occ_urrences"
 msgstr "ààààààààààààà àààààààà(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Delete all occurrences"
 msgstr "ààààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 #, fuzzy
 msgid "New All Day _Event..."
 msgstr "ààààà àààà ààà(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 #, fuzzy
 msgid "Create a new all day event"
 msgstr "ààààà àààààààààà ààààààààààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../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:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "_Forward as iCalendar..."
 msgstr "iàààààààààà àà ààààààà àààà(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 #, fuzzy
 msgid "New _Meeting..."
 msgstr "ààààà ààààààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 #, fuzzy
 msgid "Create a new meeting"
 msgstr "ààààà àààààà àààààààà àà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "Mo_ve to Calendar..."
 msgstr "àààààààààà àà àààà(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
 msgid "New _Appointment..."
 msgstr "ààààà ààààààà(_A)..."
 
 #
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Make this Occurrence _Movable"
 msgstr "à ààààààààà àààààààààà àà àààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "_Open Appointment"
 msgstr "ààààààààààà àààààààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "View the current appointment"
 msgstr "àààààààà ààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "_Reply"
 msgstr "ààààààààààààà(_R):"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "_Schedule Meeting..."
 msgstr "àààààààà àààààààà àààààààà(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1582
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "ààà àààààààààà ààààà àààààààààà àààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "ààààà ààààààà(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1589
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "%s ààààààà àààààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 #, fuzzy
 msgid "Quit"
 msgstr "àààààààà(_Q)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Day"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one day"
 msgstr "àà àààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1722
 msgid "List"
 msgstr "àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Show as list"
 msgstr "àààààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1729
 msgid "Month"
 msgstr "ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Show one month"
 msgstr "àà ààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1736
 msgid "Week"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 msgid "Show one week"
 msgstr "àà àààààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 #, fuzzy
 msgid "Show one work week"
 msgstr "àà àààààààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1752
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Active Appointments"
 msgstr "ààààààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Next 7 Days' Appointments"
 msgstr "ààààààà 7ààààà' ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1773
+#: ../modules/calendar/e-cal-shell-view-actions.c:1774
 msgid "Occurs Less Than 5 Times"
 msgstr "5 ààààààà  àààà àààààà àààààà àààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
+#: ../modules/calendar/e-memo-shell-view-actions.c:820
+#: ../modules/calendar/e-task-shell-view-actions.c:1019
 msgid "Description contains"
 msgstr "ààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1811
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1812
+#: ../modules/calendar/e-memo-shell-view-actions.c:827
+#: ../modules/calendar/e-task-shell-view-actions.c:1026
 msgid "Summary contains"
 msgstr "ààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Print this calendar"
 msgstr "à àààààààààà àà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1830
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "àààààààààààààà àààààààààà àà àààààààààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1852
+#: ../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:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../modules/calendar/e-memo-shell-view-actions.c:868
+#: ../modules/calendar/e-task-shell-view-actions.c:1067
 #, fuzzy
 msgid "_Save as iCalendar..."
 msgstr "iàààààààààà àà ààààààà àààà(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1929
+#: ../modules/calendar/e-cal-shell-view-actions.c:1930
 msgid "Go To"
 msgstr "àààààààà"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-memo-shell-view-actions.c:547
 #, fuzzy
 msgid "memo"
 msgstr "àààà"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 #, fuzzy
 msgid "New _Memo"
 msgstr "ààààà àààà"
 
 #: ../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:680
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
 msgid "Create a new memo"
 msgstr "ààààà àààààà ààààààààà"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "_Open Memo"
 msgstr "àààààà àààààààà(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-memo-shell-view-actions.c:688
 msgid "View the selected memo"
 msgstr "àààààààààà ààààààà àààààààà"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:831
 msgid "Open _Web Page"
 msgstr "ààààà ààààà àààààà(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-memo-shell-view-actions.c:853
 #, fuzzy
 msgid "Print the selected memo"
 msgstr "àààààààààà ààààààà àààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1457
+#: ../modules/calendar/e-cal-shell-view-private.c:1477
 #, fuzzy
 #| msgid "Print this event"
 msgid "Searching next matching event"
 msgstr "à ààààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1458
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
 msgid "Searching previous matching event"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1476
+#: ../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] ""
 msgstr[1] ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#: ../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] ""
 msgstr[1] ""
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1500
+#: ../modules/calendar/e-cal-shell-view-private.c:1528
 msgid "Cannot search with no active calendar"
 msgstr ""
 
@@ -15970,23 +15511,23 @@ msgstr ""
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:664
 #, fuzzy
 msgid "task"
 msgstr "àààààà"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_Assign Task"
 msgstr "àààààààààààà ààààààààààà(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "_Mark as Complete"
 msgstr "àààààààààààà àà àààààààààààà(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Mark selected tasks as complete"
 msgstr "àààààààààààà ààààààààà ààààààààààà àààààà àààààààà"
 
@@ -15995,40 +15536,40 @@ msgid "_Mark as Incomplete"
 msgstr "ààààààààààà àààààààààààà(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "àààààààààààà ààààààààà ààààààààààà àààààà àààààààà"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "New _Task"
 msgstr "ààààà àààààà(_T)"
 
 #: ../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:818
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 msgid "Create a new task"
 msgstr "ààààà àààààààààà ààààààààà"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Open Task"
 msgstr "àààààààààààà àààààààà(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:826
 msgid "View the selected task"
 msgstr "ààààààààà àààààààààààà àààààà"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:1052
 #, fuzzy
 msgid "Print the selected task"
 msgstr "ààààààààà àààààààààààà àààààà"
 
 #: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:216
+#: ../modules/calendar/e-memo-shell-view-actions.c:217
 msgid "New Memo List"
 msgstr "ààààà àààà àààààà"
 
@@ -16055,132 +15596,132 @@ msgid "Memo Li_st"
 msgstr "àààà àààààà"
 
 #: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "Create a new memo list"
 msgstr "ààààà àààààààààà àà ààààààààà"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:204
+#: ../modules/calendar/e-memo-shell-sidebar.c:206
 msgid "Loading memos"
 msgstr "ààààààà àààààààààà"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:647
+#: ../modules/calendar/e-memo-shell-sidebar.c:663
 #, fuzzy
 msgid "Memo List Selector"
 msgstr "àààà àààààà àààààààààààà"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:951
+#: ../modules/calendar/e-memo-shell-sidebar.c:975
 #, fuzzy, c-format
 #| msgid "Opening memos at %s"
 msgid "Opening memo list '%s'"
 msgstr "%s àààà ààààààà ààààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:248
 msgid "Print Memos"
 msgstr "ààààààà ààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:288
+#: ../modules/calendar/e-memo-shell-view-actions.c:289
 msgid "Memo List Properties"
 msgstr "àààà àààààà àààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
 #, fuzzy
 msgid "_Delete Memo"
 msgstr "àààààààààà àààààààààà(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 #, fuzzy
 msgid "_Find in Memo..."
 msgstr "àààààààà ààààààààà(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 #, fuzzy
 msgid "Search for text in the displayed memo"
 msgstr "àààààààààààààà àààààà àààààààààààà ààààààààà àààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 #, fuzzy
 msgid "D_elete Memo List"
 msgstr "ààààà àààààà àààààà(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 #, fuzzy
 msgid "Delete the selected memo list"
 msgstr "àààààààààà àààààà àààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_New Memo List"
 msgstr "ààààà àààààà àààààà(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "àààààààààà àààààà àààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "ààààààààà ààààààààà ààà:ààààààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "à àààà àààààà ààààààà àààààà(_o)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 #, fuzzy
 msgid "Memo _Preview"
 msgstr "àààààààà(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:753
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "ààààààà àààààààà ààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
 msgid "Print the list of memos"
 msgstr "ààààà àààààààà ààààààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "àààààààààààààà ààààààààààààà ààààààààààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view.c:233
+#: ../modules/calendar/e-memo-shell-view.c:236
 #, fuzzy
 msgid "Delete Memos"
 msgstr "àààààààààà àààààààààà(_D)"
 
-#: ../modules/calendar/e-memo-shell-view.c:235
+#: ../modules/calendar/e-memo-shell-view.c:238
 #, fuzzy
 msgid "Delete Memo"
 msgstr "àà ààààààààààà"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:427
+#: ../modules/calendar/e-memo-shell-view-private.c:428
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d àààà"
 msgstr[1] "%d àààààà"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:431
-#: ../modules/calendar/e-task-shell-view-private.c:612
+#: ../modules/calendar/e-memo-shell-view-private.c:432
+#: ../modules/calendar/e-task-shell-view-private.c:613
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr ", %d ààààààààààààà"
 
 #: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:239
+#: ../modules/calendar/e-task-shell-view-actions.c:240
 msgid "New Task List"
 msgstr "ààààà àààààààààààààà"
 
@@ -16205,35 +15746,35 @@ msgid "Tas_k List"
 msgstr "àààààààà àààààà"
 
 #: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Create a new task list"
 msgstr "ààààà ààààààààààà àà ààààààààà"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:204
+#: ../modules/calendar/e-task-shell-sidebar.c:206
 msgid "Loading tasks"
 msgstr "àààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:647
+#: ../modules/calendar/e-task-shell-sidebar.c:663
 #, fuzzy
 msgid "Task List Selector"
 msgstr "àààààààà ààà ààààààààà"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:951
+#: ../modules/calendar/e-task-shell-sidebar.c:975
 #, fuzzy, c-format
 #| msgid "Opening tasks at %s"
 msgid "Opening task list '%s'"
 msgstr "%s àààà àààààààààààà ààààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:271
 msgid "Print Tasks"
 msgstr "àààààààà ààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:311
+#: ../modules/calendar/e-task-shell-view-actions.c:312
 msgid "Task List Properties"
 msgstr "ààààà àààààà àààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:607
+#: ../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"
@@ -16245,132 +15786,132 @@ msgstr ""
 "\n"
 "à ààààààààààààà ààààààà ààààààààààà?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 #, fuzzy
 msgid "Do not ask me again"
 msgstr "ààààà ààààà àààààààà."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 #, fuzzy
 msgid "_Delete Task"
 msgstr "àààààààà(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 #, fuzzy
 msgid "_Find in Task..."
 msgstr "àààààààà ààààààààà(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 #, fuzzy
 msgid "Search for text in the displayed task"
 msgstr "àààààààààààààà àààààà àààààààààààà ààààààààà àààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 #, fuzzy
 msgid "Copy..."
 msgstr "àààààààà(_C)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 #, fuzzy
 msgid "D_elete Task List"
 msgstr "àààààààà àààààààà ààààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "ààààààààà ààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_New Task List"
 msgstr "ààààà àààààààààààààà(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "ààààààààà ààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "ààààààààà ààààààààà ààà:ààààààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "à ààààààà àààààà ààààààà àààààà(_o)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 #, fuzzy
 msgid "Mar_k as Incomplete"
 msgstr "ààààààààààà àààààààààààà(_M)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:840
 msgid "Delete completed tasks"
 msgstr "àààààààà ààààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Task _Preview"
 msgstr "ààààààà àààààààà(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:917
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "ààààààà àààààààà ààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Active Tasks"
 msgstr "ààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Completed Tasks"
 msgstr "àààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Next 7 Days' Tasks"
 msgstr "ààààààà 7 ààààà' àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Overdue Tasks"
 msgstr "àààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Tasks with Attachments"
 msgstr "àààààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1038
 msgid "Print the list of tasks"
 msgstr "ààààààààà àààààààà ààààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "àààààààààààààà ààààààààà àààààààà àààààààààààààààà "
 
-#: ../modules/calendar/e-task-shell-view.c:368
+#: ../modules/calendar/e-task-shell-view.c:371
 #, fuzzy
 msgid "Delete Tasks"
 msgstr "àààààààà àààààààààà"
 
-#: ../modules/calendar/e-task-shell-view.c:370
+#: ../modules/calendar/e-task-shell-view.c:373
 #, fuzzy
 msgid "Delete Task"
 msgstr "àà ààààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-private.c:501
+#: ../modules/calendar/e-task-shell-view-private.c:502
 msgid "Expunging"
 msgstr "ààààààààààààààààà"
 
-#: ../modules/calendar/e-task-shell-view-private.c:608
+#: ../modules/calendar/e-task-shell-view-private.c:609
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -16424,13 +15965,13 @@ msgid ""
 "headers selected above."
 msgstr ""
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
 #, fuzzy
 #| msgid "II"
 msgid "ITIP"
 msgstr "II"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
 msgid "Display part as an invitation"
 msgstr ""
 
@@ -16803,7 +16344,7 @@ msgid "Start day:"
 msgstr "ààààààà àààà(_r):"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1414
+#: ../modules/itip-formatter/itip-view.c:1461
 msgid "Start time:"
 msgstr "ààààààà àààà:"
 
@@ -16813,268 +16354,268 @@ msgid "End day:"
 msgstr "%d àààà"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1415
+#: ../modules/itip-formatter/itip-view.c:1462
 msgid "End time:"
 msgstr "ààààààà àààà:"
 
-#: ../modules/itip-formatter/itip-view.c:1008
+#: ../modules/itip-formatter/itip-view.c:1010
 msgid "_Open Calendar"
 msgstr "ààààààààààâàà àààààààà(_O)"
 
-#: ../modules/itip-formatter/itip-view.c:1011
+#: ../modules/itip-formatter/itip-view.c:1013
 msgid "_Decline all"
 msgstr "ààààà ààààààààààà(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "_Decline"
 msgstr "ààààààààààà(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Tentative all"
 msgstr "ààààààààà àààààààààà(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Tentative"
 msgstr "àààààààààà(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 #, fuzzy
 msgid "A_ccept all"
 msgstr "ààààà àààààààà(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 #, fuzzy
 msgid "A_ccept"
 msgstr "àààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "_Send Information"
 msgstr "ààààààààààà àààà(_S)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "_Update Attendee Status"
 msgstr "àààààààààà àààààààà ààààààààààà(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "_Update"
 msgstr "ààààààààààà(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1417
-#: ../modules/itip-formatter/itip-view.c:1459
-#: ../modules/itip-formatter/itip-view.c:1525
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1512
+#: ../modules/itip-formatter/itip-view.c:1581
 msgid "Comment:"
 msgstr "ààààààà:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1448
+#: ../modules/itip-formatter/itip-view.c:1500
 #, fuzzy
 #| msgid "Send _reply to sender"
 msgid "Send reply to sender"
 msgstr "ààààààààààà ààààààààààààà àààààà(_r)"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Send _updates to attendees"
 msgstr "àààààààààààà ààààààààà àààààà(_u)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1465
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "_Apply to all instances"
 msgstr "ààààà àààâààààààààààà àààààààààà(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1466
+#: ../modules/itip-formatter/itip-view.c:1519
 msgid "Show time as _free"
 msgstr "àààà àà ààààààà àààààà(_f)"
 
-#: ../modules/itip-formatter/itip-view.c:1467
+#: ../modules/itip-formatter/itip-view.c:1520
 msgid "_Preserve my reminder"
 msgstr "àààà àààààààààààààààà àààààààààààà (_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1468
+#: ../modules/itip-formatter/itip-view.c:1521
 msgid "_Inherit reminder"
 msgstr "ààààààààà ààààààààààààà (_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1789
+#: ../modules/itip-formatter/itip-view.c:1845
 msgid "_Tasks:"
 msgstr "àààààààààà(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1792
+#: ../modules/itip-formatter/itip-view.c:1848
 msgid "_Memos:"
 msgstr "àààààà (_M):"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3437
+#: ../modules/itip-formatter/itip-view.c:3493
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "àààààààààà '%s'àà ààààààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3594
+#: ../modules/itip-formatter/itip-view.c:3652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "àààààààààà '%s' ààààà àà ààààààà à ààààààà àà ààààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3618
+#: ../modules/itip-formatter/itip-view.c:3679
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "àààààààààà '%s' àààà àà ààààààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3713
+#: ../modules/itip-formatter/itip-view.c:3774
 msgid "Unable to find any calendars"
 msgstr "à ààààààààààààà àààààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3721
+#: ../modules/itip-formatter/itip-view.c:3782
 msgid "Unable to find this meeting in any calendar"
 msgstr "à ààààààààààà à àààààààààà àààà àààààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3726
+#: ../modules/itip-formatter/itip-view.c:3787
 msgid "Unable to find this task in any task list"
 msgstr "à ààààààà àààààààààà à ààààààààààà àààààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:3731
+#: ../modules/itip-formatter/itip-view.c:3792
 msgid "Unable to find this memo in any memo list"
 msgstr "à àààààà à àààà àààààààààà ààààààààà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4071
+#: ../modules/itip-formatter/itip-view.c:4132
 #, fuzzy
 #| msgid "Opening the calendar. Please wait.."
 msgid "Opening the calendar. Please wait..."
 msgstr "ààààààààààâàà ààààààààààààà. àààààà ààààààààà..."
 
-#: ../modules/itip-formatter/itip-view.c:4076
+#: ../modules/itip-formatter/itip-view.c:4137
 msgid "Searching for an existing version of this appointment"
 msgstr "à ààààààà ààààà àààà àààààà ààààà ààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4458
+#: ../modules/itip-formatter/itip-view.c:4523
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ààààààà àààààààààà '%s' àà ààààààààààààà.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4473
+#: ../modules/itip-formatter/itip-view.c:4538
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ààààààààààààààà àààààààààà '%s' àà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4478
+#: ../modules/itip-formatter/itip-view.c:4543
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ààààààààààààààààà àààààààààà '%s' àà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4484
+#: ../modules/itip-formatter/itip-view.c:4549
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "àààààààààààààààààà àààààààààà '%s' àà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4490
+#: ../modules/itip-formatter/itip-view.c:4555
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "àààààààààààààààà àààààààààà '%s' àà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4560
-#: ../modules/itip-formatter/itip-view.c:4994
-#: ../modules/itip-formatter/itip-view.c:5101
+#: ../modules/itip-formatter/itip-view.c:4576
+#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:5123
 #, fuzzy
 #| msgid "Opening the calendar. Please wait.."
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "ààààààààààâàà ààààààààààààà. àààààà ààààààààà..."
 
-#: ../modules/itip-formatter/itip-view.c:4599
+#: ../modules/itip-formatter/itip-view.c:4617
 msgid "Unable to parse item"
 msgstr "ààààààà ààààà ààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4788
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ààààààààà ààààààààà %s àà ààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4803
+#: ../modules/itip-formatter/itip-view.c:4822
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ààààààààààà ààààà àààààààà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4826
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ààààà àààààààà ààààààààààà àààààà ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4856
+#: ../modules/itip-formatter/itip-view.c:4874
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ààààààààààààààà àà àààààààààààà. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4863
+#: ../modules/itip-formatter/itip-view.c:4882
 msgid "Attendee status updated"
 msgstr "àààààààààààà àààààà àààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:4886
+#: ../modules/itip-formatter/itip-view.c:4905
 #, fuzzy
 #| msgid "Object is invalid and cannot be updated\n"
 msgid "The meeting is invalid and cannot be updated"
 msgstr "àààà ààààààààà àààà àààààààààà ààààààààà\n"
 
-#: ../modules/itip-formatter/itip-view.c:4959
+#: ../modules/itip-formatter/itip-view.c:4981
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "àààààààààà àààààà àààààààààààààà àààààààà à àààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5031
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../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 "àààà ààààààà ààààààààààà àààààà ààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5134
+#: ../modules/itip-formatter/itip-view.c:5156
 msgid "Meeting information sent"
 msgstr " àààààà ààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5139
+#: ../modules/itip-formatter/itip-view.c:5161
 msgid "Task information sent"
 msgstr "ààààààà ààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5144
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "Memo information sent"
 msgstr "àààà ààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5155
+#: ../modules/itip-formatter/itip-view.c:5177
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ààààààà ààààààààààà àààààà ààààààà, ààààààà àààà"
 
-#: ../modules/itip-formatter/itip-view.c:5160
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "Unable to send task information, the task does not exist"
 msgstr "àààààààà ààààààààààà ààààààààààààà, àààààààà àààà"
 
-#: ../modules/itip-formatter/itip-view.c:5165
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "àààà àààààààààà ààààààààààààà, àààà àààà"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5230
+#: ../modules/itip-formatter/itip-view.c:5252
 #, fuzzy
 msgid "calendar.ics"
 msgstr "àààààààààà àà"
 
-#: ../modules/itip-formatter/itip-view.c:5235
+#: ../modules/itip-formatter/itip-view.c:5257
 #, fuzzy
 msgid "Save Calendar"
 msgstr "ààààà àààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5287
-#: ../modules/itip-formatter/itip-view.c:5299
+#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "The calendar attached is not valid"
 msgstr "ààààààààààà àààààààààà ààààààààà àààà"
 
-#: ../modules/itip-formatter/itip-view.c:5288
-#: ../modules/itip-formatter/itip-view.c:5300
+#: ../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 "àààààààààà àààààààààààà àààààà àààà, ààààà àààààààààà ààààààà ààààààààààà àààà."
 
-#: ../modules/itip-formatter/itip-view.c:5341
-#: ../modules/itip-formatter/itip-view.c:5370
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../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 "àààààààààà àààà àààà ààààà ààààààààà àààà"
 
-#: ../modules/itip-formatter/itip-view.c:5342
-#: ../modules/itip-formatter/itip-view.c:5371
-#: ../modules/itip-formatter/itip-view.c:5469
+#: ../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"
@@ -17082,35 +16623,35 @@ msgstr ""
 "àààààà àààààààààààà ààààààààà, ààààà àààààààààà à àààààà, ààààààààààà àààà àààà/ààààààààà ààààààààà "
 "ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5385
+#: ../modules/itip-formatter/itip-view.c:5412
 msgid "The calendar attached contains multiple items"
 msgstr "ààààààààààà àààààààààà àààà àààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5386
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "à ààààààààààààààà àààààààà, àààà ààààà àààààà ààààà àààààààààà ààààààà àààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5912
+#: ../modules/itip-formatter/itip-view.c:5937
 #, fuzzy
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:5928
+#: ../modules/itip-formatter/itip-view.c:5953
 msgid "Tentatively Accepted"
 msgstr "àààààààààààààà ààààààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:6071
+#: ../modules/itip-formatter/itip-view.c:6096
 msgid "This meeting recurs"
 msgstr "ààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:6074
+#: ../modules/itip-formatter/itip-view.c:6099
 msgid "This task recurs"
 msgstr "àààààààà ààààààààà"
 
-#: ../modules/itip-formatter/itip-view.c:6077
+#: ../modules/itip-formatter/itip-view.c:6102
 msgid "This memo recurs"
 msgstr "àààà ààààààààà"
 
@@ -17235,45 +16776,45 @@ msgid "Choose a mbox spool directory"
 msgstr "àààààààààààààààààààààà àà àààààà àààààààààà"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
 #: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "àààààààà"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "ààààà(_S):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
 msgid "User_name:"
 msgstr "ààààààààààà àààà(_n):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
 #, fuzzy
 msgid "Encryption _method:"
 msgstr "ààààààààààà"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
 #, fuzzy
 #| msgid "_Secure connection"
 msgid "STARTTLS after connecting"
 msgstr "ààààà ààààà(_S)"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
 msgid "SSL on a dedicated port"
 msgstr ""
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
 msgid "Ser_ver requires authentication"
 msgstr "ààààààà ààààààà ààààà(_v)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
 msgid "T_ype:"
 msgstr "àààà (_T):"
 
@@ -17297,459 +16838,463 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d ààààààààààà ààààààààà"
 msgstr[1] "%d ààààààààààà ààààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:244
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ààààà àààààà (_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgid "Compose a new mail message"
 msgstr "ààààà àààààà àààààà àà àààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:258
+#: ../modules/mail/e-mail-shell-backend.c:254
 #, fuzzy
 #| msgid "Mail Accounts"
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "àààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:260
+#: ../modules/mail/e-mail-shell-backend.c:256
 #, fuzzy
 #| msgid "Create a new mail folder"
 msgid "Create a new mail account"
 msgstr "ààààà àààààà ààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:265
+#: ../modules/mail/e-mail-shell-backend.c:261
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "àààààà ààààààà (_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:267
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgid "Create a new mail folder"
 msgstr "ààààà àààààà ààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:478
+#: ../modules/mail/e-mail-shell-backend.c:561
 msgid "Mail Accounts"
 msgstr "àààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:487
+#: ../modules/mail/e-mail-shell-backend.c:570
 msgid "Mail Preferences"
 msgstr "àààààà ààààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:496
+#: ../modules/mail/e-mail-shell-backend.c:579
 msgid "Composer Preferences"
 msgstr "ààààààà ààààààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:588
 msgid "Network Preferences"
 msgstr "àààààààààâ ààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view.c:970
+#. 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
+#, fuzzy
+#| msgid "None"
+msgctxt "label"
+msgid "None"
+msgstr "ààààààà"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view.c:975
 #, fuzzy
 msgid "_Disable Account"
 msgstr "àààààà àààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
 #, fuzzy
 msgid "Disable this account"
 msgstr "àààààà àààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ààààààààà ààààààààà ààààà àààààà ààààà ààààààààà àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 #, fuzzy
 #| msgid "Change the properties of this folder"
 msgid "Edit properties of this account"
 msgstr "à àààà ààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Download Messages for Offline Usage"
 msgstr "àààâàààà ààààààààà ààààà ààààààà àà ààààààààààààà (_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1274
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "àààâàààà ààààà àààààààààà ààààà/àààààà ààààà ààààààààà ààààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Fl_ush Outbox"
 msgstr "àààààâàààààà  àà àààààààààààà(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "_Copy Folder To..."
 msgstr "ààààààààà àààààààà àààà àààààà(_C)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Copy the selected folder into another folder"
 msgstr "ààààààààà ààààààààà àààà ààààààààà àààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Permanently remove this folder"
 msgstr "ààààààààà à ààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "E_xpunge"
 msgstr "àààààààààààà(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ààààààààà ààààààààà à àààààà ààààà ààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Mar_k All Messages as Read"
 msgstr "ààààà ààààààààà àààààààààà àààààà àààààààà(_k)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Mark all messages in the folder as read"
 msgstr "àààààààààààààà ààààààààà àààààààààà àààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Move Folder To..."
 msgstr "ààààà àà àààààààà ààààààà(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Move the selected folder into another folder"
 msgstr "ààààààààà ààààààààà àààà ààààà àààà ààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_New..."
 msgstr "ààààà(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Create a new folder for storing mail"
 msgstr "àààààà ààààààà ààààà ààààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Change the properties of this folder"
 msgstr "à àààà ààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Refresh the folder"
 msgstr "ààààààààà ààààààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Change the name of this folder"
 msgstr "à àààà àààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Select Message _Thread"
 msgstr "àààààà àààààà ààààààààààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Select all messages in the same thread as the selected message"
 msgstr "àààààààààà àààààà àààà ààà àààààààà ààààà ààààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Select Message S_ubthread"
 msgstr "àààààà àààààààà ààààààààààà(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "Select all replies to the currently selected message"
 msgstr "ààààààààà àààààààààà àààààààà ààààà àààààààààààààààà àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Empty _Trash"
 msgstr "ààààààà àààà àààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ààààààààà ààààààààà ààààà àààààà ààààà ààààààààà àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "_New Label"
 msgstr "ààààà àààààà(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 #, fuzzy
 msgid "N_one"
 msgstr "ààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 #, fuzzy
 #| msgid "_Subscriptions..."
 msgid "_Manage Subscriptions"
 msgstr "àààààà... (_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1402
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../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 "àààààà àààààà àààààà àà àààààààààààà àààà ààààààààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
-#: ../modules/mail/e-mail-shell-view-actions.c:1428
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Send / _Receive"
 msgstr "àààààà/àààààààààà(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Send queued items and retrieve new items"
 msgstr "àààààààààà ààààààà àààà ààààà ààààà ààààààà àààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 #, fuzzy
 #| msgid "Received"
 msgid "R_eceive All"
 msgstr "àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 #, fuzzy
 msgid "Receive new items from all accounts"
 msgstr "ààààààààà ààààààààà ààààà àààààà ààààà ààààààààà àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 #, fuzzy
 #| msgid "_Send"
 msgid "_Send All"
 msgstr "àààààà(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 #, fuzzy
 #| msgid "Send queued items and retrieve new items"
 msgid "Send queued items in all accounts"
 msgstr "àààààààààà ààààààà àààà ààààà ààààà ààààààà àààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "ààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
 msgid "Cancel the current mail operation"
 msgstr "àààààààà àààààà  ààààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse All _Threads"
 msgstr "ààààà ààààààà ààààààààààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Collapse all message threads"
 msgstr "ààààà ààààà ààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "E_xpand All Threads"
 msgstr "ààààà ààààààà àààààààààààà(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Expand all message threads"
 msgstr "àààààà ààààà ààààààà ààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "_Message Filters"
 msgstr "àààààà ààààààà(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
 msgid "Create or edit rules for filtering new mail"
 msgstr "ààààà àààààà àà ààààààààà àààààààà ààààààààààà àààà ààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "_Subscriptions..."
 msgstr "àààààà... (_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
 msgid "F_older"
 msgstr "ààààà(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
 msgid "_Label"
 msgstr "àààààà(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "C_reate Search Folder From Search..."
 msgstr "ààààààà ààààà ààààààà ààààààààà ààààààààààà(_r)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Search F_olders"
 msgstr "àààààààà àààààààà(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 #, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "àààààà ààààà ààààààààààà ààààààààà àààà ààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "_New Folder..."
 msgstr "ààààà ààààà(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show Message _Preview"
 msgstr "ààààà àààààààààààà àààààà(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "ààààà ààààààà ààààààààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 #, fuzzy
 msgid "Show _Deleted Messages"
 msgstr "ààààààààà ààààààààà ààààààààààààà(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 #, fuzzy
 msgid "Show deleted messages with a line through them"
 msgstr "ààààà-àààààà àààà ààààààààà ààààààààà (ààààààààà àà) àààààà."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Group By Threads"
 msgstr "ààààà àààààà àààààà(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 #, fuzzy
 msgid "Threaded message list"
 msgstr "ààààààà ààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 #, fuzzy
 #| msgid "Toggles whether the From chooser is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "ààààààààà ààààà ààààààààààààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Show message preview below the message list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "ààààà àààààà àààà ààààà àààààààààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
 msgid "All Messages"
 msgstr "ààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
 msgid "Important Messages"
 msgstr "àààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
 msgid "Last 5 Days' Messages"
 msgstr "àà 5 ààààà' àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Messages Not Junk"
 msgstr "ààààààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Messages with Attachments"
 msgstr "ààààààààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "No Label"
 msgstr "àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Read Messages"
 msgstr "àààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
-msgid "Recent Messages"
-msgstr "àààààà àààààààà"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Unread Messages"
 msgstr "àààààà àààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "ààà àààààààààà ààààà àààà àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "All Accounts"
 msgstr "ààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "Current Account"
 msgstr "àààààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Current Folder"
 msgstr "àààààààà ààààà"
 
-#: ../modules/mail/e-mail-shell-view.c:562
+#: ../modules/mail/e-mail-shell-view.c:613
 msgid "All Account Search"
 msgstr "ààààà ààààà ààààààà"
 
-#: ../modules/mail/e-mail-shell-view.c:723
+#: ../modules/mail/e-mail-shell-view.c:710
 msgid "Account Search"
 msgstr "àààà ààààààà"
 
-#: ../modules/mail/e-mail-shell-view.c:968
+#: ../modules/mail/e-mail-shell-view.c:973
 msgid "Proxy _Logout"
 msgstr "àààààààà ààààààààà(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d ààààààààààààà, "
 msgstr[1] "%d ààààààààààààà, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d àààààààààààà"
 msgstr[1] "%d àààààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:985
+#: ../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 àààààààààà"
 msgstr[1] "%d àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:991
+#: ../modules/mail/e-mail-shell-view-private.c:992
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d àààààààààà"
 msgstr[1] "%d àààààààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d ààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1003
+#: ../modules/mail/e-mail-shell-view-private.c:1004
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d ààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1016
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ààààà, "
 msgstr[1] "%d ààààà, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d àààààà"
 msgstr[1] "%d àààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1042
 #, fuzzy
 #| msgid "Task"
 msgid "Trash"
 msgstr "àààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1386
+#: ../modules/mail/e-mail-shell-view-private.c:1458
 msgid "Send / Receive"
 msgstr "àààààà/àààààààààà"
 
@@ -17773,21 +17318,21 @@ msgstr "àààààààà àà àààà"
 msgid "Once per month"
 msgstr "ààààà àà àààà"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:318
 msgid "Header"
 msgstr "ààààà"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:322
 msgid "Contains Value"
 msgstr "ààààààààà ààààà"
 
 #. 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:1071
+#: ../modules/mail/em-mailer-prefs.c:1145
 #, fuzzy
 msgid "_Date header:"
 msgstr "àààà ààààà:"
 
-#: ../modules/mail/em-mailer-prefs.c:1072
+#: ../modules/mail/em-mailer-prefs.c:1146
 #, fuzzy
 msgid "Show _original header value"
 msgstr "àààààà ààààààààà àààààà(_O)"
@@ -17799,25 +17344,25 @@ msgstr "àààà àààààààààà àà àà àààà
 
 #. 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:318
+#: ../modules/mdn/evolution-mdn.c:323
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:385
+#: ../modules/mdn/evolution-mdn.c:390
 #, fuzzy, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "àààààà àààààà àààààààà"
 
-#: ../modules/mdn/evolution-mdn.c:540
+#: ../modules/mdn/evolution-mdn.c:543
 #, fuzzy, c-format
 #| msgid "S_end message receipts:"
 msgid "Send a read receipt to '%s'"
 msgstr "ààààà àààààààà àààààà(_e):"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:545
+#: ../modules/mdn/evolution-mdn.c:548
 #, fuzzy
 msgid "_Notify Sender"
 msgstr "àààààà ààààà(_n)"
@@ -17902,172 +17447,450 @@ msgstr "àààààààààà(_P)"
 msgid "Enable and disable plugins"
 msgstr "àààààààààà àà ààààà ààààà àààààà àààààà"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#, fuzzy
+#| msgid "Display the next message"
+msgid "Display plain text version"
+msgstr "ààààààà àààààààààà ààààààààààààà"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#, fuzzy
+#| msgid "Display the next important message"
+msgid "Display plain text version of multipart/alternative message"
+msgstr "ààààààà ààààà àààààààààà ààààààààààààà"
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+msgid "Display HTML version"
+msgstr ""
+
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#, fuzzy
+#| msgid "Display the previous important message"
+msgid "Display HTML version of multipart/alternative message"
+msgstr "ààààààà ààààà àààààààààà ààààààààààààà"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:46
 msgid "Show HTML if present"
 msgstr "àààààààààà HTML àà àààààà"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../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 ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
 #: ../modules/prefer-plain/plugin/config-ui.c:50
 #, fuzzy
 msgid "Show plain text if present"
 msgstr "àààààààààà HTML àà àààààà"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../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 ""
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
 #: ../modules/prefer-plain/plugin/config-ui.c:55
 #, fuzzy
 msgid "Only ever show plain text"
 msgstr "ààààààà àààààà ààààààà àààààà"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../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 ""
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
-msgid "Show s_uppressed HTML parts as attachments"
+#: ../modules/prefer-plain/plugin/config-ui.c:107
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../modules/prefer-plain/plugin/config-ui.c:129
+msgid "HTML _Mode"
+msgstr "HTML àààà (_M)"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "àààà ààààààààà àààààààààààà"
+
+#. 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 "àààà ààààààà àààà"
+
+#: ../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 "àààààà àààààààààà àààà ààààààà ààà àààààààààà, ààà HTML ààààààà ààààààààààà àààà."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:192
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:215
+#, fuzzy
+#| msgid "Filter junk messages using SpamAssassin."
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "SpamAssassin àààààààààà ààààààà àààààààààà àààààààà."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:234
+#, fuzzy, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "%2$d ààààà %1$d ààààààààà ààààààà ààààààààà"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:262
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:317
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:885
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin ààààààààà"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:900
+msgid "I_nclude remote tests"
+msgstr "àààààà àààààààààà ààààààààààà(_n)"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:914
+#, fuzzy
+#| msgid "This will make SpamAssassin more reliable, but slower"
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ààà ààààààâààààààààààâàà àààààààààààà ààààààààà, ààààà àààààààààà"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#, fuzzy
+#| msgid "SpamAssassin Options"
+msgid "SpamAssassin"
+msgstr "SpamAssassin ààààààààà"
+
+#: ../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 "àààà ààààààà ààààààà ààààààà ààààààààààà àààààà àààààààààà:"
+
+#: ../modules/startup-wizard/e-mail-config-import-page.c:233
+#: ../widgets/misc/e-import-assistant.c:559
+#, c-format
+msgid "From %s:"
+msgstr "%s ààààà:"
+
+#. 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
+#, fuzzy
+msgid "Importing Files"
+msgstr "àààààààààà àààààààààààààààà"
+
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#, fuzzy
+#| msgid "I_mportance: "
+msgid "Import cancelled."
+msgstr "àààààààààà(_m)..."
+
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#, fuzzy
+#| msgid "Update complete\n"
+msgid "Import complete."
+msgstr "àààààààààà ààààààààààà\n"
+
+#: ../modules/startup-wizard/e-startup-assistant.c:154
+#, fuzzy
+#| msgid ""
+#| "Welcome to Evolution. The next few screens will allow Evolution to "
+#| "connect to your email accounts, and to import files from other "
+#| "applications. \n"
+#| "\n"
+#| "Please click the \"Forward\" button to continue. "
+msgid ""
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
+msgstr ""
+"àààààààààà àà ààààààà. ààààààà àààààà ààààà àààààààààà àà àà ààààààà ààààààà ààààààààààààààà "
+"àààààààààààà, ààààà ààà àààààààààà ààààà àààààààààà ààààààààà.\n"
+"\n"
+"àààààà \"ààààààààààà\" àààà àà ààààààààààààà àààààààà. "
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loading accounts..."
+msgstr "àààààààààààà..."
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#, fuzzy
+#| msgid "Format Column_s..."
+msgid "_Format as..."
+msgstr "àààààà àààààààà àààààààààà àààààà"
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#, fuzzy
+#| msgid "_Languages"
+msgid "_Other languages"
+msgstr "ààààà(_L)"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#, fuzzy
+#| msgid "Text height"
+msgid "Text Highlight"
+msgstr "ààààà ààààà"
+
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+msgid "Syntax highlighting of mail parts"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:32
+#, fuzzy
+#| msgid "Plain Text"
+msgid "_Plain text"
+msgstr "àààààà àààààààà"
+
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:87
+#, fuzzy
+#| msgid "_Script:"
+msgid "_JavaScript"
+msgstr "àààà(_S):"
+
+#: ../modules/text-highlight/languages.c:93
+#, fuzzy
+#| msgid "_Path:"
+msgid "_Patch/diff"
+msgstr "àààà(_P):"
+
+#: ../modules/text-highlight/languages.c:99
+#, fuzzy
+#| msgid "_Personal"
+msgid "_Perl"
+msgstr "ààààààààà(_P)"
+
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:123
+#, fuzzy
+#| msgid "Hello Python"
+msgid "_Python"
+msgstr "àààààà àààààà"
+
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:152
+#, fuzzy
+#| msgid "Visual"
+msgid "_Visual Basic"
+msgstr "àààààààà"
+
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:177
+#, fuzzy
+#| msgid "_Actions"
+msgid "_ActionScript"
+msgstr "ààààààà(_A)"
+
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
 msgstr ""
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
-msgid "HTML _Mode"
-msgstr "HTML àààà (_M)"
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr ""
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "àààà ààààààààà àààààààààààà"
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr ""
 
-#. 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 "àààà ààààààà àààà"
+#: ../modules/text-highlight/languages.c:235
+#, fuzzy
+#| msgid "_No"
+msgid "_Go"
+msgstr "àààà(_N)"
 
-#: ../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 "àààààà àààààààààà àààà ààààààà ààà àààààààààà, ààà HTML ààààààà ààààààààààà àààà."
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
-#, c-format
-msgid "Failed to spawn SpamAssassin (%s): "
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/text-highlight/languages.c:250
 #, fuzzy
-#| msgid "Filter junk messages using SpamAssassin."
-msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "SpamAssassin àààààààààà ààààààà àààààààààà àààààààà."
+#| msgid "_List:"
+msgid "_Lisp"
+msgstr "àààààà (_L):"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
-#, fuzzy, c-format
-#| msgid "Failed to send %d of %d messages"
-msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "%2$d ààààà %1$d ààààààààà ààààààà ààààààààà"
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
-msgid "Failed to read output from SpamAssassin: "
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
-msgid "SpamAssassin either crashed or failed to process a mail message"
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin ààààààààà"
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
-msgid "I_nclude remote tests"
-msgstr "àààààà àààààààààà ààààààààààà(_n)"
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
-#, fuzzy
-#| msgid "This will make SpamAssassin more reliable, but slower"
-msgid "This will make SpamAssassin more reliable, but slower."
-msgstr "ààà ààààààâààààààààààâàà àààààààààààà ààààààààà, ààààà àààààààààà"
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/text-highlight/languages.c:288
 #, fuzzy
-#| msgid "SpamAssassin Options"
-msgid "SpamAssassin"
-msgstr "SpamAssassin ààààààààà"
+#| msgid "Object Signer"
+msgid "_Objective C"
+msgstr "àààààààà àààààààààààà"
 
-#: ../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 "àààà ààààààà ààààààà ààààààà ààààààààààà àààààà àààààààààà:"
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr ""
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "%s ààààà:"
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr ""
 
-#. 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
+#: ../modules/text-highlight/languages.c:304
 #, fuzzy
-msgid "Importing Files"
-msgstr "àààààààààà àààààààààààààààà"
+#| msgid "Object Signer"
+msgid "_Object Script"
+msgstr "àààààààà àààààààààààà"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/text-highlight/languages.c:309
 #, fuzzy
-#| msgid "I_mportance: "
-msgid "Import cancelled."
-msgstr "àààààààààà(_m)..."
+#| msgid "_Paste"
+msgid "_Pascal"
+msgstr "àààààààà(_P)"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:319
 #, fuzzy
-#| msgid "Update complete\n"
-msgid "Import complete."
-msgstr "àààààààààà ààààààààààà\n"
+#| msgid "_Program:"
+msgid "_Prolog"
+msgstr "ààààààààààà(_P):"
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
+#: ../modules/text-highlight/languages.c:324
 #, fuzzy
-#| msgid ""
-#| "Welcome to Evolution. The next few screens will allow Evolution to "
-#| "connect to your email accounts, and to import files from other "
-#| "applications. \n"
-#| "\n"
-#| "Please click the \"Forward\" button to continue. "
-msgid ""
-"Welcome to Evolution.\n"
-"\n"
-"The next few screens will allow Evolution to connect to your email accounts, "
-"and to import files from other applications."
+#| msgid "_Script:"
+msgid "_PostScript"
+msgstr "àààà(_S):"
+
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
 msgstr ""
-"àààààààààà àà ààààààà. ààààààà àààààà ààààà àààààààààà àà àà ààààààà ààààààà ààààààààààààààà "
-"àààààààààààà, ààààà ààà àààààààààà ààààà àààààààààà ààààààààà.\n"
-"\n"
-"àààààà \"ààààààààààà\" àààà àà ààààààààààààà àààààààà. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:259
-#, fuzzy
-#| msgid "Loading..."
-msgid "Loading accounts..."
-msgstr "àààààààààààà..."
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr ""
 
-#: ../modules/text-highlight/text-highlight.c:242
-#, fuzzy
-#| msgid "_Path:"
-msgid "Patch"
-msgstr "àààà(_P):"
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr ""
+
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr ""
 
-#: ../modules/text-highlight/text-highlight.c:248
-msgid "Format part as a patch"
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
 msgstr ""
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
@@ -18104,7 +17927,7 @@ msgstr[1] "ààààà %d ààààà àààààààààà à
 #: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
 #, fuzzy
 #| msgid "Address book source"
-msgid "Addressbok Contact"
+msgid "Addressbook Contact"
 msgstr "ààààààààà  àààààà àààà "
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
@@ -18132,7 +17955,7 @@ msgid "_Do not show this message again."
 msgstr "à àààààààà ààààà àààààààà (_D)."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:470
+#: ../plugins/templates/templates.c:469
 msgid "Keywords"
 msgstr "ààààààà"
 
@@ -18309,7 +18132,7 @@ msgid "Key"
 msgstr "àà"
 
 #: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:477
 msgid "Values"
 msgstr "ààààààà"
 
@@ -18783,43 +18606,43 @@ msgstr ""
 "àààààààààà àààà àààààààà ààààààà, àààà ààààà àààààà àààààààààààà. àààà àààààààà ààààààààààà, "
 "àààààà."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1187
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 #, fuzzy
 #| msgid "No description available."
 msgid "No writable calendar is available."
 msgstr "ààààà àààààààààà àààà"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 #, fuzzy
 #| msgid "Create a new appointment"
 msgid "Create an _Appointment"
 msgstr "ààààà àààààààààà ààààààààà"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a new event from the selected message"
 msgstr "àààààààààà àààààààààààà ààààà ààààà ààààààààààà"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "àààààà ààààààààààà (_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a new memo from the selected message"
 msgstr "àààààààààà àààààààààààà ààààà àààààà ààààààààààà"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "àààààààààààà ààààààààààà (_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a new task from the selected message"
 msgstr "ààààààààà àààààà ààààà ààààà àààààààààààà ààààààààààà"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "ààààààààààà ààààààààààà (_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1297
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new meeting from the selected message"
 msgstr "àààààààààà àààààààààààà ààààà àààààààààà ààààààààààà"
 
@@ -18914,7 +18737,7 @@ msgid "Publish calendars to the web."
 msgstr "ààààààààààà ààààâààà àààààààààààà."
 
 #: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:465
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "%sàà àààààààà ààààààà:"
@@ -18939,23 +18762,23 @@ msgstr "%sààà ààààààààààà àààààààà
 msgid "Mount of %s failed:"
 msgstr "%sààààà àààààà ààààààààà:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:628
+#: ../plugins/publish-calendar/publish-calendar.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "ààààà(_n)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:776
+#: ../plugins/publish-calendar/publish-calendar.c:774
 msgid "Are you sure you want to remove this location?"
 msgstr "àààà ààààààààà à ààààààààà àààààààààààà ààààààààààààààà?"
 
 #. 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:1106
+#: ../plugins/publish-calendar/publish-calendar.c:1104
 msgid "Could not create publish thread."
 msgstr "ààààààà àààà ààààààààààààà ààààààà."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1114
+#: ../plugins/publish-calendar/publish-calendar.c:1112
 msgid "_Publish Calendar Information"
 msgstr "àààààààààà ààààààààà ààààààààààà(_P)"
 
@@ -19214,16 +19037,16 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1113
+#: ../plugins/templates/templates.c:1112
 #, fuzzy
 msgid "No Title"
 msgstr "ààààààà àààà"
 
-#: ../plugins/templates/templates.c:1225
+#: ../plugins/templates/templates.c:1221
 msgid "Save as _Template"
 msgstr "àààààààà àààààà (_T)"
 
-#: ../plugins/templates/templates.c:1227
+#: ../plugins/templates/templates.c:1223
 msgid "Save as Template"
 msgstr "àààààààà àààààà"
 
@@ -19584,7 +19407,7 @@ msgstr "àààààààà ààààààààààà: %s"
 msgid "Execute these search parameters"
 msgstr "à ààààààà àààààààààà àààà ààààà "
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:497
 msgid "New"
 msgstr "ààààà"
 
@@ -19595,7 +19418,7 @@ msgid "%s - Evolution"
 msgstr "%s - àààààààààà"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19630,7 +19453,7 @@ msgstr ""
 "àààà àà àààà ààààà àààààààà àààààààààààà ààààààààààààà, ààààà àààà\n"
 "àà àààààà ààààà ààààààààààààààà!\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19638,62 +19461,62 @@ msgstr ""
 "ààààààààààà\n"
 "ààààààààà ààà\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "àààà ààààà àààààààààà"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:305
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:312
+#: ../shell/main.c:309
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:316
+#: ../shell/main.c:313
 msgid "Start in online mode"
 msgstr "ààààààààà àààààààààà ààààààààààà"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:315
 msgid "Ignore network availability"
 msgstr "ààààààààà ààààà àààààààààà "
 
-#: ../shell/main.c:320
+#: ../shell/main.c:317
 #, fuzzy
 msgid "Start in \"express\" mode"
 msgstr "ààààààààà àààààààààà ààààààààààà"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "ààààààààà ààààààà àààààààà àààààààààà"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:323
 msgid "Disable loading of any plugins."
 msgstr "ààààààààà àà àààààààààààà àààààààààà àààààà."
 
-#: ../shell/main.c:328
+#: ../shell/main.c:325
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "àààààà ààààà àààààààà àààààààà, ààààààààà ààààà ààààààààààà àààààà àààààà."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:329
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:334
+#: ../shell/main.c:331
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "àààààààààà àà ààààààààààààààààààààà"
 
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ààààààààà PIM ààààà à àààààà ààààààà"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:569
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -19705,7 +19528,7 @@ msgstr ""
 "%s: --àààâàààà ààààà àààâàààà ààààà àààààààààààà.\n"
 "  àààà ààààààà ààààà %s --ààààà àà ààààààààààà.\n"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:575
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -19756,27 +19579,6 @@ msgid ""
 "upgrading to Evolution 3."
 msgstr ""
 
-#: ../shell/test/e-test-shell-backend.c:52
-#, fuzzy
-msgctxt "New"
-msgid "_Test Item"
-msgstr "àààààà (_T)"
-
-#: ../shell/test/e-test-shell-backend.c:54
-msgid "Create a new test item"
-msgstr "ààààà ààààààà àààààààà ààààààààààà"
-
-#: ../shell/test/e-test-shell-backend.c:62
-#, fuzzy
-msgctxt "New"
-msgid "Test _Source"
-msgstr "àààà"
-
-#: ../shell/test/e-test-shell-backend.c:64
-#, fuzzy
-msgid "Create a new test source"
-msgstr "ààààà ààààààà àààààààà ààààààààààà"
-
 #: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -20592,54 +20394,54 @@ msgstr "àààààà àààààà"
 #. * 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 "ààààààààààà ààààààà"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2371
+#: ../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:1869 ../widgets/misc/e-attachment.c:2673
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "àààà ààààààà ààààààààà ààààààààà ààààà"
 
-#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2681
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "àààà ààààààà ààààààààà àààààààààààààà"
 
-#: ../widgets/misc/e-attachment.c:1976
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' àààà àààààà ààààààà"
 
-#: ../widgets/misc/e-attachment.c:1979
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "àààààààààà àààà àààààà ààààààà"
 
-#: ../widgets/misc/e-attachment.c:2252
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s'àà àààààààà ààààààà"
 
-#: ../widgets/misc/e-attachment.c:2255
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "àààààààààà àààààààà ààààààà"
 
-#: ../widgets/misc/e-attachment.c:2689
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "àààààààà ààààààà àààà àààààà"
 
-#: ../widgets/misc/e-attachment.c:2765
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s'àà àààààà ààààààà"
 
-#: ../widgets/misc/e-attachment.c:2768
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "àààààààààà àààààà ààààààà"
@@ -21049,10 +20851,16 @@ msgstr "àààà àà  àààààààààà"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "àààààà àààààààààà àà àààààààààààà ààààààààààààà \"ààààààà\" àààààààà. "
 
-#: ../widgets/misc/e-mail-signature-combo-box.c:327
+#: ../widgets/misc/e-mail-signature-combo-box.c:378
 msgid "Autogenerated"
 msgstr "àààààààààààààààààààààà"
 
+#: ../widgets/misc/e-mail-signature-editor.c:287
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "àààààà(_C)"
+
 #: ../widgets/misc/e-mail-signature-editor.c:292
 msgid "_Save and Close"
 msgstr "àààà ààààà àààààà (_S)"
@@ -21340,32 +21148,36 @@ msgstr "<b>àààààààà ààààààà àààààà</b>
 msgid "Sta_tus Tracking"
 msgstr "àààààààààà  àààààààà(_t)"
 
-#: ../widgets/misc/e-source-config.c:669 ../widgets/misc/e-source-config.c:673
+#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
 msgid "Type:"
 msgstr "àààà:"
 
+#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
+msgid "Name:"
+msgstr "àààà: "
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1276
+#: ../widgets/misc/e-source-config.c:1289
 #, fuzzy
 #| msgid "Refresh the folder"
 msgid "Refresh every"
 msgstr "ààààààààà ààààààààààààààà"
 
-#: ../widgets/misc/e-source-config.c:1306
-#: ../widgets/misc/e-source-config.c:1334
+#: ../widgets/misc/e-source-config.c:1319
+#: ../widgets/misc/e-source-config.c:1347
 #, fuzzy
 #| msgid "_Use secure connection:"
 msgid "Use a secure connection"
 msgstr "àààààà àààààààà ààààààààààà(U):"
 
-#: ../widgets/misc/e-source-config.c:1348
+#: ../widgets/misc/e-source-config.c:1361
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Ignore invalid SSL certificate"
 msgstr "ààààààà àààà ààààààààààààà"
 
-#: ../widgets/misc/e-source-config.c:1385
+#: ../widgets/misc/e-source-config.c:1398
 msgid "User"
 msgstr "ààààààààààà"
 
@@ -21402,60 +21214,60 @@ msgstr ""
 msgid "Click here to go to URL"
 msgstr "URL àà ààààààààà ààààà àààààààà"
 
-#: ../widgets/misc/e-web-view.c:278 ../widgets/misc/e-web-view-gtkhtml.c:407
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "ààààà àààààààààà àààà àààààà(_C)"
 
-#: ../widgets/misc/e-web-view.c:280 ../widgets/misc/e-web-view-gtkhtml.c:409
+#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "ààààààâààààààààà ààààààààà àààààààà."
 
-#: ../widgets/misc/e-web-view.c:288 ../widgets/misc/e-web-view-gtkhtml.c:417
+#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
 msgstr "ààààààà àà ààààààà àààààààà(_O)"
 
-#: ../widgets/misc/e-web-view.c:290 ../widgets/misc/e-web-view-gtkhtml.c:419
+#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
 #, fuzzy
 msgid "Open the link in a web browser"
 msgstr "ààààààà àà ààààààà àààààààà(_O)"
 
-#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:427
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 #, fuzzy
 msgid "_Copy Email Address"
 msgstr "ààààààà àààààààààààà àààà àààààà(_E)"
 
-#: ../widgets/misc/e-web-view.c:315 ../widgets/misc/e-web-view-gtkhtml.c:444
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 #, fuzzy
 #| msgid "_No image"
 msgid "_Copy Image"
 msgstr "ààààààààà àààà(_N)"
 
-#: ../widgets/misc/e-web-view.c:317 ../widgets/misc/e-web-view-gtkhtml.c:446
+#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
 #, fuzzy
 msgid "Copy the image to the clipboard"
 msgstr "ààààààâààààààààà ààààààààà àààààààà."
 
-#: ../widgets/misc/e-web-view.c:337 ../widgets/misc/e-web-view.c:1425
+#: ../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
 #, fuzzy
 msgid "Select all text and images"
 msgstr "àà ààààààààà  ààààààààààà àààààààààà"
 
-#: ../widgets/misc/e-web-view.c:1089 ../widgets/misc/e-web-view.c:1091
-#: ../widgets/misc/e-web-view.c:1093 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../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 "%s àà ààààâààààààà àààààààà"
 
-#: ../widgets/misc/e-web-view.c:1095 ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "ààààààààààà àààààààààààà/ààààààààààà ààààààà"
 
-#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ààààààààà àààààà"
@@ -21771,6 +21583,317 @@ msgstr "ààààààààà àààààààààà"
 msgid "Input Methods"
 msgstr "àààààà àààààààà"
 
+#~ msgid "Some features may not work properly with your current server"
+#~ msgstr "àà àààààààà  ààààààà àààààà àààààààà ààààààà àààààààà"
+
+#~ 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 ""
+#~ "àààà ààààààààà àààààààà ààààààà àààààààààààààààààààààà ààààà àààààààààà àà àààààààààààà "
+#~ "àààààààà àààààààààààà. àààà ààààààààààà ààààà àààààààààà àààààà àà àààààààààààààà"
+
+#~ msgid "GroupWise Address book creation:"
+#~ msgstr "ààààààà àààààà  àààààààà àààààà àààààà:"
+
+#~ 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 ""
+#~ "ààààààààà àààà àààààààààà ààààà àààààààà àààààààà ààààààà àà ààààààà àààààààààà. àà àààà "
+#~ "àààààààà ààààààààà ààààà àààààààà ààààààààà ààààààà àààààààà àààààààà, àààààà ààààà "
+#~ "àààààààà àààààà ààààààààààà àààààà àààààààààààà."
+
+#~ msgid "Some features may not work properly with your current server."
+#~ msgstr "àà àààààààà ààààààà àààààà àààààààà ààààààà àààààààà"
+
+#~ 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 ""
+#~ "àààà ààààààààà àààààààà ààààààà àààààààààààààààààààààà ààààà àààààààààà àààààààààààà ààààààà "
+#~ "àààààààààààà. àààà àààààà ààààà, ààààà ààààà àààààààààààà àààààà àà àààààààààààà."
+
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "ààààààààààààààà àààààà ààààà ID "
+
+#~ msgid "socket"
+#~ msgstr "àààààà "
+
+#~ msgid "Please enter your full name."
+#~ msgstr "àààààà àà àààààà àààààà ààààà àààààà "
+
+#~ msgid "Please enter your email address."
+#~ msgstr "àààààà  àà ààààààà àààààà ààààà àààààà."
+
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "àààà ààààà ààààà ààààààà àààààààà ààààààà."
+
+#~ msgid "Please enter your password."
+#~ msgstr "àààààà àà àààààààààà àààààààààààààà."
+
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
+
+#~ msgid "Google"
+#~ msgstr "Google"
+
+#~ msgid "Always (SSL)"
+#~ msgstr "ààààààààààà (SSL) "
+
+#~ msgid "When possible (TLS)"
+#~ msgstr "àààààààààààà (TLS) "
+
+#~ msgid "Personal details:"
+#~ msgstr "ààààààààà ààààààà "
+
+#~ msgid "Email address:"
+#~ msgstr "à àààààà ààààààà: "
+
+#~ msgid "Details:"
+#~ msgstr "ààààààà: "
+
+#~ msgid "Server type:"
+#~ msgstr "ààààà ààà  "
+
+#~ msgid "Server address:"
+#~ msgstr "ààààà àààààààà:â"
+
+#~ msgid "Use encryption:"
+#~ msgstr "àààààààààààà àà ààààààààààà: "
+
+#~ 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 ""
+#~ "ààààààà àààààààààààààà àààà àà àààà ààààà ààààààà. àààààà àà ààààààà àààààààà ààààà ààààà àààà  àà "
+#~ "àààààà ààààà àààà ààààà àààààààààààà ààààààààààà ààààà ààà àààààààà. àààà ààààààààààà àààààà àààààààààà "
+#~ "àààà ààààà àà àààààà àààààààà  ààààà  ààààààà."
+
+#~ 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 ""
+#~ "àààààààààà, àààà ààààààààààà àà àààààà àààààààà ààààààààà àààààààààà. àààààà  àààààà àààààà ààààà "
+#~ "àààààààà. àààà ààààà ààààà ààààà ààààààà àà àà ààààààà ààààà ààààààààààààà àààà àààà àààààà "
+#~ "ààààààààààà ààààà ààààààà. "
+
+#~ msgid "You can specify more options to configure the account."
+#~ msgstr "àààà àààà àààààààààààààà ààààààà ààààààà àààààààààààà."
+
+#~ 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 ""
+#~ "ààààààà àààà àààààààà ààààààà àààà àà àààààààààààà ààààà. àààà àààààà ààààààà ààààà "
+#~ "ààààààààà ààààààààààààà àààà àààà ààààààààà àààààà  ààààà àààààà. "
+
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "àààà àà àààààà àà àààààààà àààààààààààà àààààààààààà. "
+
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr ""
+#~ "àààà ààààààààààà ààààà  ààààààà ààààà àààà àààààààààà   ààààà àààààààà ààààààà àààààààààà "
+#~ "ààààà àà àààààà àààààààààà àààà àààààààààà. "
+
+#~ msgid "Next - Receiving mail"
+#~ msgstr "àààààà àààààà àà- àààààààààààà"
+
+#~ msgid "Receiving mail"
+#~ msgstr "àààààà àà àààààààààààà "
+
+#~ msgid "Next - Sending mail"
+#~ msgstr "ààààààà  àààààà ààààààààààààà"
+
+#~ msgid "Back - Identity"
+#~ msgstr "ààààààà - ààààààààà"
+
+#~ msgid "Next - Receiving options"
+#~ msgstr "ààààààà àààààààààà  - àààààààààààà "
+
+#~ msgid "Receiving options"
+#~ msgstr "àààààààààà àààààààààààà "
+
+#~ msgid "Back - Receiving mail"
+#~ msgstr "ààààààà - àààààà àà àààààààààààà"
+
+#~ msgid "Sending mail"
+#~ msgstr "ààààààà ààààààààààààà "
+
+#~ msgid "Next - Review account"
+#~ msgstr "àààààà - àààààà àààà "
+
+#~ msgid "Next - Defaults"
+#~ msgstr "ààààààà -  àààààààààà"
+
+#~ msgid "Back - Receiving options"
+#~ msgstr "ààààààà  - àààààààààà àààààààààà "
+
+#~ msgid "Back - Sending mail"
+#~ msgstr "ààààààà - àààààà ààààààààààààà"
+
+#~ msgid "Review account"
+#~ msgstr "àààà àààààà "
+
+#~ msgid "Finish"
+#~ msgstr "ààààààà "
+
+#~ msgid "Back - Sending"
+#~ msgstr "àààààà - ààààààààààà "
+
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "ààààààààà àà  àààààà  àààààààà ààààà "
+
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "ààààààààààâàà àààààà àààààààààà ààààà àààààà."
+
+#~ msgid "You may need to enable IMAP access."
+#~ msgstr "àààà IMAP àààà àà ààààààà àààààààà."
+
+#~ msgid "Google account settings:"
+#~ msgstr "àààààà àààà ààààààààààà:â"
+
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "ààààààààà àà  àààà  àààààààààà ààààà àààààà "
+
+#~ 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 ""
+#~ "àààà àààààààààààà ààààà àààà_ààààààààà(_l) ààààààààààà. àààà àààààààààà àààà ààààààà ààààààààà "
+#~ "ààààààààààààà. ààà ààààààà àààà àààà àààààààààà àààà ààààààààààà ààààà àààààà ààààà àààààà. "
+
+#~ msgid "Yahoo account settings:"
+#~ msgstr "àààà àààà ààààààààààà:â"
+
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "àààà  àààààààààà àààà:"
+
+#~ msgid "Password:"
+#~ msgstr "àààààààà :"
+
+#~ msgid "Close Tab"
+#~ msgstr "àààà àààààà"
+
+#~ msgid "Account Wizard"
+#~ msgstr "àààà ààààààà "
+
+#~ msgid "Evolution account assistant"
+#~ msgstr "àààààààààà àààà àààààààà "
+
+#~ msgid "Modify %s..."
+#~ msgstr "%s... ààààààà"
+
+#~ msgid "Add a new account"
+#~ msgstr "àà ààààà àààààà ààààààààà "
+
+#~ msgid "Account management"
+#~ msgstr "àààà ààààààà "
+
+#~ msgid "Settings"
+#~ msgstr "ààààààààà "
+
+#~ msgid "Undo the last action"
+#~ msgstr "ààààà àààààà ààààà "
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "àààààà ààààà ààààà àààààààààà ààààààààààààà "
+
+#~ msgid "Search for text"
+#~ msgstr "àààà  ààààà àààààààà."
+
+#~ msgid "Search for and replace text"
+#~ msgstr "àààà àààà ààààà àààààààà ààààà àààààà "
+
+#~ msgid "Configuration version"
+#~ msgstr "àààààààà àààààà"
+
+#~ msgid ""
+#~ "The configuration version of Evolution, with major/minor/configuration "
+#~ "level (for example \"2.6.0\")."
+#~ msgstr ""
+#~ "àààààààààà ààààà àààààààà àààààà, ààààà/ààààà/àààààààà àààààà àà (àààààà àà \"2.6.0\")."
+
+#
+#~ msgid "Last upgraded configuration version"
+#~ msgstr "ààààààà àààààààààààà àààààààà àààààà"
+
+#~ msgid ""
+#~ "The last upgraded configuration version of Evolution, with major/minor/"
+#~ "configuration level (for example \"2.6.0\")."
+#~ msgstr ""
+#~ "ààààààà àààààààààà àààààààààà ààààà àààààààà, ààààà/ààààà/àààààààà àààààà àà (àààààààà "
+#~ "\"2.6.0\")."
+
+#~ msgid "If all conditions are met"
+#~ msgstr "ààààà ààààà ààààààà ààààààààà"
+
+#~ msgid "If any conditions are met"
+#~ msgstr "à ààààààà ààààà ààààààààà"
+
+#~| msgid "Expunging and storing account '%s'"
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "àààà '% s' àààà ààààà àààààààà"
+
+#~| msgid "Unsubscribing from folder \"%s\""
+#~ msgid "Unsubscribing from folder '%s'"
+#~ msgstr "ààààààà '% s' ààààà ààààààààààààààà ààààààààà"
+
+#~ msgid "Refreshing folder '%s'"
+#~ msgstr "àààààààààààààà ààààààà '%s'"
+
+#~ msgid "Expunging folder '%s'"
+#~ msgstr "ààààààààààààààà ààààààà '%s'"
+
+#~ msgid "Disconnecting %s"
+#~ msgstr "%s ààààà ààààààààààààà ààààààààà"
+
+#~ msgid "Unable to connect to the GroupWise server."
+#~ msgstr "àààààààà ààààààà ààààààààààààà àààààààààà."
+
+#~ msgid "Please check your account settings and try again."
+#~ msgstr "àààààà àà àààà àààààààà àààààààà àààà ààààààààààààà"
+
+#~ msgid "Metric (Celsius, cm, etc)"
+#~ msgstr "àààààààà (Celsius, cm, etc)"
+
+#~ msgid "Imperial (Fahrenheit, inches, etc)"
+#~ msgstr "ààààààààà (ààààààâàààà, àààààààà, ààà.)"
+
+#, fuzzy
+#~| msgid "_Units:"
+#~ msgid "Units:"
+#~ msgstr "àààààààààà(_U):"
+
+#~ msgid "Recent Messages"
+#~ msgstr "àààààà àààààààà"
+
+#, fuzzy
+#~ msgctxt "New"
+#~ msgid "_Test Item"
+#~ msgstr "àààààà (_T)"
+
+#~ msgid "Create a new test item"
+#~ msgstr "ààààà ààààààà àààààààà ààààààààààà"
+
+#, fuzzy
+#~ msgctxt "New"
+#~ msgid "Test _Source"
+#~ msgstr "àààà"
+
+#, fuzzy
+#~ msgid "Create a new test source"
+#~ msgstr "ààààà ààààààà àààààààà ààààààààààà"
+
 #~ msgid "Couldn't get list of address books: %s"
 #~ msgstr "àààààààà àààààààà àààààà àààààààààààààà: %s"
 
@@ -22216,9 +22339,6 @@ msgstr "àààààà àààààààà"
 #~ "à àààà ààààà àààààâàààà àà ààààààààà\n"
 #~ "àààààààààààààààà. àààà ààààààà àààà àààààààà àààààààààààà ààààààà àààààààààààààààà."
 
-#~ msgid "_Script:"
-#~ msgstr "àààà(_S):"
-
 #~ msgid "Drafts _Folder:"
 #~ msgstr "àààààààà  ààààà(_F):"
 
@@ -22588,9 +22708,6 @@ msgstr "àààààà àààààààà"
 #~ msgid "Python Plugin Loader tests"
 #~ msgstr "àààààà àààààààà ààààà ààààààààà"
 
-#~ msgid "Hello Python"
-#~ msgstr "àààààà àààààà"
-
 #~ msgid "Evolution Setup Assistant"
 #~ msgstr "àààààààààà àààààà àààààà"
 
@@ -23762,9 +23879,6 @@ msgstr "àààààà àààààààà"
 #~ msgid "_Default junk plugin:"
 #~ msgstr "ààààààà ààààààà àààààààà(_D):"
 
-#~ msgid "_Mark messages as read after"
-#~ msgstr "àààààààààà ààààààààà àààààààààà àààààààà(_M)"
-
 #~ msgid "_Show image animations"
 #~ msgstr "ààààààà àààààààààâààà àààààà(_S)"
 
@@ -25148,9 +25262,6 @@ msgstr "àààààà àààààààà"
 #~ msgid "C_ut"
 #~ msgstr "àààààà(_u)"
 
-#~ msgid "_Paste"
-#~ msgstr "àààààààà(_P)"
-
 #~ msgid "_Mark Selected Tasks as Complete"
 #~ msgstr "ààààà ààààà àààààààà àààààààààààà àà àààààààààààà(_M)"
 
@@ -26079,9 +26190,6 @@ msgstr "àààààà àààààààà"
 #~ msgid "Create items"
 #~ msgstr "àààààààà ààààààààà"
 
-#~ msgid "Create subfolders"
-#~ msgstr "àààààààààà ààààààààààà"
-
 #~ msgid "Delete Any Items"
 #~ msgstr "à àààààààà àààààààààà"
 
@@ -27192,9 +27300,6 @@ msgstr "àààààà àààààààà"
 #~ msgid "Text width"
 #~ msgstr "ààààà àààààààà"
 
-#~ msgid "Text height"
-#~ msgstr "ààààà ààààà"
-
 #~ msgid "Use ellipsis"
 #~ msgstr "ààààààààà àà ààààààààààà"
 



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