[evolution] update Punjabi Translation



commit 399664104361c4a4d98f4ca97d47d2c88a8ade88
Author: A S Alam <aalam users sf net>
Date:   Sat Aug 20 22:58:00 2011 +0530

    update Punjabi Translation

 po/pa.po |11469 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 6075 insertions(+), 5394 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index e0c9f42..8d11666 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,23 +2,25 @@
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:615
+#: ../shell/main.c:569
 # Punjab Linux Technology <punjablinux netscape net>, 2004.
 # A S Alam <aalam users sf net>, 2004, 2005, 2006, 2007, 2009, 2010, 2011.
 # Amanpreet Singh Alam <aalam users sf net>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-12-30 00:23+0000\n"
-"PO-Revision-Date: 2011-01-01 09:27+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-08-19 13:31+0000\n"
+"PO-Revision-Date: 2011-08-20 22:56+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: pa\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -26,7 +28,8 @@ 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."
 msgstr ""
-"'{0}' àààà ààààà àà àààààà àààà àààà àà ààà ààààà àààà àà ààààà ààààà ààà àààà àààà ààààà "
+"'{0}' àààà ààààà àà àààààà àààà àààà àà ààà ààààà àààà àà ààààà ààààà ààà "
+"àààà àààà ààààà "
 "ààà àààààà-àààà àààà ààà"
 
 #: ../addressbook/addressbook.error.xml.h:3
@@ -34,201 +37,256 @@ 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:4
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"'{0}' ààà àà ààààà àààà àààààà àà àà ààààà àààà àààà ààààà ààà àà ààààà àà "
+"ààà ààààà "
+"àà ààààà àààà ààààààà àà?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "àààààààà ààà àààà"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "àààààà '{0}' àààààà àà ààààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "àààà ààààà ààààà àààà àààà àà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "ààààà ààààà àààà àà àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "ààààààà ààààà àààààà àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
-"àààà ààà àààààà àààààà ààà àààà ààààà ààà àà ààà ààààà ààààà àà ààààà ààà ààààà àà, ààà "
-"àààà àà àààà àààààà àààà àààà àà àààààà ààààà àà;àààààà àààà ààà àààà àà àààà ààà"
+"àààà ààà àààààà àààààà ààà àààà ààààà ààà àà ààà ààààà ààààà àà ààààà ààà "
+"ààààà àà, ààà "
+"àààà àà àààà àààààà àààà àààà àà àààààà ààààà àà;àààààà àààà ààà àààà àà àààà "
+"ààà"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP àààà ààà ààààà ààààààà àààààà àààà àààà àà ààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "àààààà-àààà ààà ààààà àààà ààààà"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"àà àààà ààààà àààààààà ààà ààààà àààààààààà ààààà àààààà-àààà àà àà ààààà àà àààà ààà ààààà àààà "
-"ààà ààà àààààààààà àààà ààààà àà ààà ààààà ààà ààà àà ààààà àààààààààà àààààààà ààààà ààà "
+"àà àààà ààààà àààààààà ààà ààààà àààààààààà ààààà àààààà-àààà àà àà ààààà àà "
+"àààà ààà ààààà àààà "
+"ààà ààà àààààààààà àààà ààààà àà ààà ààààà ààà ààà àà ààààà àààààààààà "
+"àààààààà ààààà ààà "
 "àààààààààà ààààà ààààà ààààà àààààà àà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "àà àààààà-àààà '{0}' àààààà àà?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "àà àààà(_N)"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ààà {1} àààààà àà àààà: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP àààà ààà àààààààà ààà àààà ààààà"
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "ààààà ààààà ààààà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "àààààààààà àààààà-àààà àààààà:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP àààà ààà ààààà àààààààà àààààà ààà àààà ààààà"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+#| msgid "{0} is already in the list"
+msgid "List '{0}' is already in this contact list."
+msgstr "àà ààààà àààà àààà àààà '{0}' àààààà àà ààà"
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "àààààààà àààà"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "ààà ààààà àààààà àà àà ààààà àààà àààà ààààà ààà"
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "àààààà àààààà àààà ààà ààà àààà ààà àààà ààà àààà àà àààà àà"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "àààààààà àààààà-àààà ààà ààà ààà ààà àà àà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "ààààà, àà ààààà ààààà àà, àààà ààà àà ààààà àà àà àààà àààà àààà ààààààà ààààààà àà?"
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"ààààà, àà ààààà ààààà àà, àààà ààà àà ààààà àà àà àààà àààà àààà ààààààà "
+"ààààààà àà?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
-"àà LDAP àààà LDAP àà àààààà àààà ààà àààà àà, àà àà àà àààààà àà ààààà àààà àà ààà "
+"àà LDAP àààà LDAP àà àààààà àààà ààà àààà àà, àà àà àà àààààà àà ààààà àààà "
+"àà ààà "
 "ààà àààà àààààà àààà àà, àààà ààààà àààààààà ààà àààà àà ààààà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "àààààà-àààà ààà ààààààà àààà àà àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "àà àààààà-àààà àààà àà ààà ààà àààà àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
-msgstr "àààààà-àààà àààà àààààà àààà àà ààà àààà ààà ààà àà ààà àààààà ààààààà ààà àà àààà ààà"
+msgstr ""
+"àààààà-àààà àààà àààààà àààà àà ààà àààà ààà ààà àà ààà àààààà ààààààà ààà àà "
+"àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "àà àààààà-àààà ààà ààààà àà ààààà ààààààà"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "àà àààà LDAPv3 ààààà ààààààà àà ààààà àààà ààà"
 
 #  addressbook:load-error title
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "àààààà-àààà ààà àààààà àààà àààà"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "ààà ààà àààà ààààà"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "{0} àààààà àà ààààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "àà ààààà àààààààà àààààààà ààààààà àà?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"ààààà àààà ààà ààààà ààà ààà ààààà ààà àààà àààà àààà àà ààààà àà ààà àà, àà àà àààà àààà àààà "
+"ààààà àààà ààà ààààà ààà ààà ààààà ààà àààà àààà àààà àà ààààà àà ààà àà, àà "
+"àà àààà àààà àààà "
 "àààà àà, àà ààààà àà àà àààà àà àà àààà ààààà àààààà?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 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:34
+#: ../addressbook/addressbook.error.xml.h:39
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"ààààà àà ààààà ààà ààà à-ààà àààààà ààààà àààà àààààà àà\n"
+"ààààà ààà àà ààààà àà ààà àààà àà àààà ààààà àààà ààààààà àà?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ààààààà àà àààààà-àààà àààà ààààà ààààà àà àààààà àààà ààà"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "ààààà àààà ààààà àààà àààààààà àààààà àà, àà ààààà ààààà ààà ààààààà àààààà?"
+msgstr ""
+"ààààà àààà ààààà àààà àààààààà àààààà àà, àà ààààà ààààà ààà ààààààà àààààà?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "àààààà ààààà {0} àà àààà ààà àààààà àààà àà àààà àà, àààà ààà àà ààààààà ààà àààà àààà àààààà"
+#: ../addressbook/addressbook.error.xml.h:43
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"àààààà ààààà {0} àà àààà ààà àààààà àààà àà àààà àà, àààà ààà àà ààààààà ààà "
+"àààà àààà àààààà"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ààààà(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "ààà ààà(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "àà àààààà(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "ààà-àààà(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "àà ààà àà ààààà(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2084
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "ààààà ààà"
 
@@ -238,9 +296,9 @@ 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:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:124
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "ààà-ààà"
 
@@ -250,7 +308,7 @@ msgid "Blog:"
 msgstr "àààà:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ààààààà(_t)..."
@@ -260,24 +318,24 @@ msgid "Calendar:"
 msgstr "àààààà:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:957
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "ààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "àààà àààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:298
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "à-ààà"
 
@@ -290,8 +348,10 @@ msgid "Full _Name..."
 msgstr "àààà ààà(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1306
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "àà"
 
@@ -325,18 +385,14 @@ msgid "Nic_kname:"
 msgstr "àà ààà(_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "ààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:408
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "ààà"
 
@@ -361,9 +417,11 @@ msgid "Web addresses"
 msgstr "àààà àààààà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:1303
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "ààà"
 
@@ -388,9 +446,9 @@ msgid "_Blog:"
 msgstr "àààà(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:887
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:708
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "àààààà(_C):"
 
@@ -468,74 +526,74 @@ msgstr "ààààà(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "ààà/ààà ààà(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Jabber"
 msgstr "àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Yahoo"
 msgstr "àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Gadu-Gadu"
 msgstr "ààà-ààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "GroupWise"
 msgstr "àààààààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Skype"
 msgstr "àààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "ààààà àààà àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "àààà àààààà - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "àà ààààà àà ààààà àààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "ààà ààààà àààà(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -543,43 +601,43 @@ msgstr ""
 "ààààà àààà ààà àà:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ààà ààà àààààà àà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' àà ààà àààààà àà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' àààà àà"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "ààà ààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "ààààà ààà-ààààà"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "àààà àààà(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "àààà ààà(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "à-ààà(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "àààààà-àààà àààà(_S)"
 
@@ -649,7 +707,7 @@ msgid "_Suffix:"
 msgstr "àààààà(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "ààààà àààà àààààà"
 
@@ -666,7 +724,7 @@ msgid "_List name:"
 msgstr "àààà ààà(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "àààà(_S)..."
 
@@ -674,47 +732,51 @@ msgstr "àààà(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "àààà àààà ààààà ààààà ààà à-ààà àààà ààà àààààà(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "ààààà àààà ààààà"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
-msgid "_Members"
-msgstr "ààààà(_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "ààààà àààà àààà"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "ààà àààà àààà"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "ààààà àààà àààà"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
+msgid "_Members"
+msgstr "ààààà(_M)"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ààààà ààààà:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "ààààà àààà:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "àààààààà ààààà àààà"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
-"ààààà àà ààà ààà à-ààà àààààà ààààà àààà àààààà àà ààààà ààà àà ààààà àà ààà àààà àà àààà "
-"ààààà àààà ààààààà àà?"
+"ààààà àà ààà ààà à-ààà àààààà ààààà àààà àààààà àà ààààà ààà àà ààààà ààààà "
+"ààà àààà àà àààà "
+"ààààààà ààààààà àà?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -733,116 +795,107 @@ msgstr ""
 "ààààà ààà àà ààààà àà ààà àààà àà àààà ààààà àààà ààààààà àà?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "ààààà(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "ààà àààà"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:227
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "ààààà ààààà"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1691
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "ààà àààà ààààà"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "à-ààà àà ààà àààà ààà"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "ààà ààààà àà"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "ààà ààààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d ààààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "àààà ààà ààà àààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
+#: ../addressbook/gui/widgets/e-addressbook-model.c:768
 msgid "Search Interrupted"
 msgstr "ààà àààà àà"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "ààààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "àààà ààààà ààààààààà àààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "àààà ààààà ààààààààà àààà àààà ààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "ààààààààà ààà ààààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "àààà àààààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "àà ààààà ààààà ààààà àààà"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "àà ààààà àà ààààà àààààà ààà àààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
 msgstr "àà ààààà àà ààààà àààà àààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "àà ààààà ààààà àààà (%s)ààà àààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "àà ààààà àà àà ààààà àààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 msgid "Are you sure you want to delete this contact?"
 msgstr "àà ààààà àà ààààà àààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "àà ààààà àà ààààà (%s) ààà àààààà ààààààà àà?"
 
-#. Translators: This is shown for more than 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 #, c-format
-#| msgid ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -856,16 +909,16 @@ msgstr[1] ""
 "%d ààààà àààààà ààà %d ààààààà ààààà àààààààà\n"
 "àà ààààà àà àà ààààà ààààà ààààààà àà?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "àà ààààà(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "àà ààààà àààà(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Assistant"
 msgstr "ààààà"
 
@@ -894,7 +947,7 @@ msgid "Car Phone"
 msgstr "ààà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -902,7 +955,7 @@ msgid "Categories"
 msgstr "ààààààààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Company"
 msgstr "ààààà"
 
@@ -951,22 +1004,22 @@ msgid "Journal"
 msgstr "àààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Manager"
 msgstr "àààààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Nickname"
 msgstr "àà ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:733
 msgid "Note"
 msgstr "ààà"
 
@@ -995,13 +1048,13 @@ msgid "Radio"
 msgstr "ààààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "ààà"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Spouse"
 msgstr "àààà"
 
@@ -1031,7 +1084,7 @@ msgstr "ààààà"
 msgid "Web Site"
 msgstr "ààà àààà"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1041,7 +1094,7 @@ msgstr ""
 "\n"
 "ààààà àà ààà àààà..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1055,7 +1108,7 @@ msgstr ""
 "\n"
 "ààà ààà ààààà ààààà àà àà ààà ààààà"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1069,7 +1122,7 @@ msgstr ""
 "\n"
 "ààà ààààà ààààà àà àà ààà ààààà"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1079,7 +1132,7 @@ msgstr ""
 "\n"
 "ààààà àà àààà"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1089,146 +1142,140 @@ msgstr ""
 "\n"
 "àà ààà àààà ààààà àà ààà àààà àààà ààà"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "ààààààà à-ààà"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "àà à-ààà"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#: ../addressbook/gui/widgets/e-minicard.c:808
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "ààà à-ààà"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "àààààààà àààààà-àààà"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "àààà ààààà"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "àààà ààààà àààà"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "àààààà àààààà-àààà ààààà %s àààà %d àààà"
 msgstr[1] "1àààààà àààààà-àààà ààààà %s àààà %d àààà"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "àààààà"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "ààààà àààà: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "ààààà:  "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "àààààààà ààààà-àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "à-ààà àààààà ààà(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:395
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "àààà àààààà ààààààààà àààà àààà ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "àà ààà àààà àààààà àààà(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "àà àààààà ààà ààà àààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:258
-#: ../addressbook/gui/widgets/eab-contact-display.c:260
-msgid "(map)"
-msgstr "(ààààà)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-msgid "map"
-msgstr "ààààà"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#| msgid "Open"
+msgid "Open map"
+msgstr "ààààà àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
-msgid "List Members"
-msgstr "àààà ààààà"
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#| msgid "List Members"
+msgid "List Members:"
+msgstr "àààà ààààà:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Department"
 msgstr "ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Profession"
 msgstr "ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 msgid "Position"
 msgstr "ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Video Chat"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ààààà/ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
 msgstr "ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Fax"
 msgstr "àààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Address"
 msgstr "àààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Home Page"
 msgstr "àààà ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Web Log"
 msgstr "ààà ààà"
 
@@ -1236,77 +1283,86 @@ msgstr "ààà ààà"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:366
-#: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:132
-#: ../modules/calendar/e-cal-shell-migrate.c:159
-#: ../modules/calendar/e-memo-shell-backend.c:116
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
-#: ../modules/calendar/e-task-shell-migrate.c:126
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:971
+msgid "List Members"
+msgstr "àààà ààààà"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:989
 msgid "Job Title"
 msgstr "ààà ààààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:1026
 msgid "Home page"
 msgstr "àààà ààà"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:1035
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "àààà %s àà àààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 msgstr ""
-"àà àààààà-àààà àààààà àààà àà ààààà àà àà àààà àà àààà àà àà àà ààààà àààààà ààààà àà "
-"àààà àà àààà àà àààà ààà àààà ààààààà àà ààà ààààà ààààà àààà àààààà ààà ààà àààà ààà "
+"àà àààààà-àààà àààààà àààà àà ààààà àà àà àààà àà àààà àà àà àà ààààà àààààà "
+"ààààà àà "
+"àààà àà àààà àà àààà ààà àààà ààààààà àà ààà ààààà ààààà àààà àààààà ààà ààà "
+"àààà ààà "
 "ààààà àààààà-àààà ààààààà ààà ààà àà ààà ààààààà àààà àà ààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"àà àààààà-àààà àààààà àààà àà àààà ààààà àààà àààà ààà àà àà àààà %s àà ààà àààààà ààà "
+"àà àààààà-àààà àààààà àààà àà àààà ààààà àààà àààà ààà àà àà àààà %s àà ààà "
+"àààààà ààà "
 "àààààà ààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
-"ààààààà àà àà àààà àààà LDAP àààà ààààà àààà ààà àààà ààààà ààààààà àààà LDAP àààà ààààààà àà, "
+"ààààààà àà àà àààà àààà LDAP àààà ààààà àààà ààà àààà ààààà ààààààà àààà LDAP "
+"àààà ààààààà àà, "
 "ààààààà ààààààà ààààà LDAP-enabled àààààà àààà àààààà ààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
-"àà àààààà-àààà ààà àààààà àààà ààààà àà àà ààà àà àà àà ààà ààà ààààà ààà URI ààààà àààà àà "
+"àà àààààà-àààà ààà àààààà àààà ààààà àà àà ààà àà àà àà ààà ààà ààààà ààà URI "
+"ààààà àààà àà "
 "ààà àààà ààààà ààà àààà àà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "ààààà àààà àààà àààààà:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1318,7 +1374,7 @@ msgstr ""
 "ààà àààààà-àààà àà ààààààààà àààà àààà àààààà àààà ààà\n"
 "ààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1331,211 +1387,207 @@ msgstr ""
 "ààà"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "àà àààààà-àààà àà àààààà àà àààà ààà àààà ààà ààà àààà: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "àà àààààà-àààà àà àààààà àà àà àààà ààà àààà ààà ààà àààààà àà: %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "àà ààààà ààà ààààààààà àààà ààà àààà àà àààà ààà %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "àààààà-àààà àààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "àààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "ààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "ààààà àà ààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "ààààà àààà"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "ààààà àà ààà"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "àààà ààààà"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:741
+#: ../addressbook/importers/evolution-ldif-importer.c:539
+#: ../addressbook/importers/evolution-vcard-importer.c:282
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "àààà àààà àà àààà àà...."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1021
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ààààààà CSV ààà ààà (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1022
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
 msgstr "ààààààà CSV àà ààà ààààààà"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1030
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "àààààà CSV ààà ààà (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1031
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
 msgstr "àààààà CSV ààà ààà ààààààà"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1039
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "àààààààà CSV ààà ààà (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1040
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
 msgstr "àààààààà CSV ààà ààà ààààààà"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:757
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP àààà àààà àààààà àààààà (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:758
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
 msgstr "ààààààà LDIF ààààààà"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:646
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:647
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
 msgstr "ààààààà vCard ààààààà"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:746
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
 msgstr "%d àààà"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "àààà àààà àààà àà ààà àà"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "àààààà-àààà àà àààà ààà àààààà àààà àààà àà ààà"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+#| msgid "Couldn't get list of address books"
+msgid "Couldn't get list of address books: %s"
+msgstr "àààààà-àààà àà àààà ààà àààààà àààà àààà àà ààà: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/memo-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:695 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:312
+msgid "Unknown error"
+msgstr "àààààà àààà"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "ààààà ààà àààà àààà àààà"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+#| msgid "Failed to load the calendar '%s' (%s)"
+msgid "Failed to open client '%s': %s"
+msgstr "'%s' ààààà àààààà àà ààààà: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "ààààààà ààààààà àààà àà àààà ààààààà àààà àààààààà ààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "ààààà àààààà ààààààà àà àààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "àààà vcard ààà csv àààà àààà ààààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcardàcsv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "ààààààààààà ààà àààà àààààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
-msgstr "ààà ààààààà àààà àààà ààààààà ààà àààà àààààà àà ààààà, àààààà àààà 100 ààà"
+msgstr ""
+"ààà ààààààà àààà àààà ààààààà ààà àààà àààààà àà ààààà, àààààà àààà 100 ààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "àààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:138
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "ààààà àààà àààààààà àààà, ààààà àààà àààà àà--help ààààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "àààà csv ààà vcard àààààà àààààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
 msgstr "ààààààààààà ààà àààà ààààààà ààà àààà àààà ààààà ààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:169
 msgid "In normal mode, there is no need for the size option."
 msgstr "ààààà ààà àààà, àààà ààà àà ààà àààà ààà"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:200
 msgid "Unhandled error"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP àààà ààà ààààààà àà àààà àà"
-
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:526
-msgid "Failed to authenticate.\n"
-msgstr "àààààààà ààà àààà àààà à\n"
-
-#: ../addressbook/util/addressbook.c:222
-#: ../plugins/groupwise-features/camel-gw-listener.c:506
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (ààààà %s) àà àààààà ààà"
-
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1770
-#: ../plugins/caldav/caldav-browse-server.c:922
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "àààààà ààà"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' àààà ààààà àà àààààà àà, ààà ààààà àààà àà àààà ààà àààààà ààà àà àààà ààààààààààà "
+"'{0}' àààà ààààà àà àààààà àà, ààà ààààà àààà àà àààà ààà àààààà ààà àà àààà "
+"ààààààààààà "
 "àààààà àààà ààà"
 
 #. For Translators: {0} is the name of the calendar source
@@ -1544,7 +1596,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' àààà ààààà àà àà àààààà àààà ààà àààààà ààà àà ààààà ààà ààà ààà àààààà ààààààà ààà "
+"'{0}' àààà ààààà àà àà àààààà àààà ààà àààààà ààà àà ààààà ààà ààà ààà àààààà "
+"ààààààà ààà "
 "ààà àà ààààààà àààààà àààààà àà àààà"
 
 #: ../calendar/calendar.error.xml.h:5
@@ -1552,7 +1605,8 @@ msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 msgstr ""
-"àààà àààààà àà ààààà àààà ààà ààà àààà ààààààà àààà ààà ààààà àààà ààààààà àààà àààà àààààà "
+"àààà àààààà àà ààààà àààà ààà ààà àààà ààààààà àààà ààà ààààà àààà ààààààà "
+"àààà àààà àààààà "
 "ààà àààà ààà"
 
 #: ../calendar/calendar.error.xml.h:6
@@ -1560,42 +1614,58 @@ 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:7
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr "ààààà àà àààà àààà àààà ààààààà ààà ààààà àààààà ààà ààà-àààà àààà àààà àà àààààà"
+msgstr ""
+"ààààà àà àààà àààà àààà ààààààà ààà ààààà àààààà ààà ààà-àààà àààà àààà àà "
+"àààààà"
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr "àà àààà àààààà àà ààààààà ààà ààààà àààààà ààà àà ààà ààà àààà àààà àààà àà àààààà"
+msgstr ""
+"àà àààà àààààà àà ààààààà ààà ààààà àààààà ààà àà ààà ààà àààà àààà àààà àà "
+"àààààà"
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "ààààà àààààààà àààà àààà ààààààà ààà ààààà àààààà ààà ààààà àààààà àààà àààà àà àààààà"
+msgstr ""
+"ààààà àààààààà àààà àààà ààààààà ààà ààààà àààààà ààà ààààà àààààà àààà àààà "
+"àà àààààà"
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "ààààà ààààà àààà àààà ààààààà ààà ààààà àààààà ààà ààààà àààààà àààà àààà àà àààààà"
+msgstr ""
+"ààààà ààààà àààà àààà ààààààà ààà ààààà àààààà ààà ààààà àààààà àààà àààà àà "
+"àààààà"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "àààà ààààààà àààà ààààààà ààà ààààà àààààà ààà àà ààà ààà àààààà àààà àààà àà àààààà"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"àààà ààààààà àààà ààààààà ààà ààààà àààààà ààà àà ààà ààà àààààà àààà àààà àà "
+"àààààà"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
-msgstr "àà àààààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààààà àààà àààà àà àààààà"
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+"àà àààààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààààà àààà àààà àà àààààà"
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "àà àààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààà àààà àààà àà àààààà"
+msgstr ""
+"àà àààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààà àààà àààà àà àààààà"
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "àà ààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààààà àààà àààà àà àààààà"
+msgstr ""
+"àà ààà àà àààà ààààààà ààà ààààà àààààà ààà ààà àààààà àààà àààà àà àààààà"
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -1703,12 +1773,16 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"àà ààà ààà àààààà ààà àà ààà àààà àààà ààààà ààà àà ààà ààààà ààà àà ààà àààààà ààà àà "
+"àà ààà ààà àààààà ààà àà ààà àààà àààà ààààà ààà àà ààà ààààà ààà àà ààà "
+"àààààà ààà àà "
 "àààààà àà ààà"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "à-ààà àààà àà ààà ààà àààààà ààà àààà àààààà ààà ààààà ààà àààà ààà àà ààààà ààà"
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"à-ààà àààà àà ààà ààà àààààà ààà àààà àààààà ààà ààààà ààà àààà ààà àà ààààà "
+"ààà"
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1733,7 +1807,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
-"àààà ààààà ààà ààà àà ààààà àà àààà ààà, ààà ààà ààà àààà àààààà àà ààà ààà àààà ààà àààà "
+"àààà ààààà ààà ààà àà ààààà àà àààà ààà, ààà ààà ààà àààà àààààà àà ààà ààà "
+"àààà ààà àààà "
 "àààààà"
 
 #: ../calendar/calendar.error.xml.h:48
@@ -1741,7 +1816,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
-"àààà ààààà ààà ààà àà ààààà àà ààààà ààà ààà ààà àààààà ààà ààà àààà àààààà àà àààà ààà ààà "
+"àààà ààààà ààà ààà àà ààààà àà ààààà ààà ààà ààà àààààà ààà ààà àààà àààààà "
+"àà àààà ààà ààà "
 "ààààà ààà ààà"
 
 #: ../calendar/calendar.error.xml.h:49
@@ -1749,7 +1825,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"àààà ààààà ààà ààà àà ààààà àà ààààà ààà ààà ààà àààààà ààà ààà àààà àààààà àà ààà ààà ààà "
+"àààà ààààà ààà ààà àà ààààà àà ààààà ààà ààà ààà àààààà ààà ààà àààà àààààà "
+"àà ààà ààà ààà "
 "ààààà ààà ààà"
 
 #: ../calendar/calendar.error.xml.h:50
@@ -1769,7 +1846,8 @@ msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-"ààà àààààà ààà ààààààà àààà àà àààà ààà ààààààà ààà àààà àààààà ààà àà àààà àààà ààà àà àààà "
+"ààà àààààà ààà ààààààà àààà àà àààà ààà ààààààà ààà àààà àààààà ààà àà àààà "
+"àààà ààà àà àààà "
 "àà àààà ààà"
 
 #: ../calendar/calendar.error.xml.h:53
@@ -1777,7 +1855,8 @@ msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-"ààà àààààà ààà ààààààà àààà àà àààà ààà ààà ààà àààà àààààà ààà àà àààà àààà ààà àà àààà àà "
+"ààà àààààà ààà ààààààà àààà àà àààà ààà ààà ààà àààà àààààà ààà àà àààà àààà "
+"ààà àà àààà àà "
 "àààà ààà"
 
 #: ../calendar/calendar.error.xml.h:54
@@ -1870,16 +1949,20 @@ msgid ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
-"ààààà ààà àà-ààààà àààààààààà (GroupWise) àààà ààà àààà àà ààà àà ààà àààààààà àà ààààà ààà "
-"ààà àààààà à àààà ààà àààà ààààààà àà àààà ààà ààààà àààà àà ààààààà àààà àààààà ààà"
+"ààààà ààà àà-ààààà àààààààààà (GroupWise) àààà ààà àààà àà ààà àà ààà "
+"àààààààà àà ààààà ààà "
+"ààà àààààà à àààà ààà àààà ààààààà àà àààà ààà ààààà àààà àà ààààààà àààà "
+"àààààà ààà"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "àà ààààààà àààà ààààà àààààààà ààà àààààà àààà àà, àà àààààààà àààà ààààà"
+msgstr ""
+"àà ààààààà àààà ààààà àààààààà ààà àààààà àààà àà, àà àààààààà àààà ààààà"
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "àà àààààà àààà ààààà àààààààà àààààà àààà àà, àà àààààààà àààà àààà ààà"
+msgstr ""
+"àà àààààà àààà ààààà àààààààà àààààà àààà àà, àà àààààààà àààà àààà ààà"
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
@@ -1887,11 +1970,14 @@ msgstr "àà ààà àààà ààààà àààààààà 
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "àà ààà àààà ààààà àààààààà ààà àààààà àààà àà, àà àààààààà àààà àààà ààà"
+msgstr ""
+"àà ààà àààà ààààà àààààààà ààà àààààà àààà àà, àà àààààààà àààà àààà ààà"
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "àààààà àààààà àààà ààà àààààà àààà àà ààààà, àà ààà àà ààààààà ààà ààà àààà àààà ààààà"
+msgstr ""
+"àààààà àààààà àààà ààà àààààà àààà àà ààààà, àà ààà àà ààààààà ààà ààà àààà "
+"àààà ààààà"
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
@@ -1902,11 +1988,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "àààààà ààà ààààààà àà ààà àààà ààà ààà àààààà àààà àààààà"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "àààààààà ààà(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "àààààà(_S)"
 
@@ -1915,7 +2001,7 @@ msgid "_Save Changes"
 msgstr "àààààààà àààààà(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "àààà(_S)"
@@ -1924,24 +2010,34 @@ msgstr "àààà(_S)"
 msgid "_Send Notice"
 msgstr "ààààà àààà(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "àààà"
 msgstr[1] "àààà"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "àààà"
 msgstr[1] "àààà"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#| msgid "day"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "ààà"
+msgstr[1] "ààà"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "ààààà àààà"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ààààààà"
 
@@ -1951,9 +2047,9 @@ msgstr "àà ààààà(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "àààààà:"
 
@@ -1961,7 +2057,7 @@ msgstr "àààààà:"
 msgid "Snooze _time:"
 msgstr "àààààà àààà(_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:887
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "ààààà(_D)"
@@ -1970,54 +2066,66 @@ msgstr "ààààà(_D)"
 msgid "_Snooze"
 msgstr "ààààà(_S)"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "ààà"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 msgid "hours"
 msgstr "àààà"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ààààààà àà àààààà"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:374
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "àààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "ààà ààààà ààààààà àààààà ààà ààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "ààà ààààà àààààà ààà ààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 msgid "No location information available."
 msgstr "ààà àààààà ààààààà àààààà ààà ààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "àààààà àà %d ààààà"
-msgstr[1] "àààààà àà %d ààààà"
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "àààààà àà %d ààààààà"
+msgstr[1] "àààààà àà %d ààààààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "ààààààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1706
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2029,7 +2137,7 @@ msgstr ""
 "ààààààà ààà ààààà ààà-àààà àààààààà àààà àà\n"
 "àààà àààààà"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2039,13 +2147,14 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"ààààààà àààààà ààà àààà àààà àà àààà ààà àà ààààààà ààà àààà àààà ààà ààààà àà àààààà àà:\n"
+"ààààààà àààààà ààà àààà àààà àà àààà ààà àà ààààààà ààà àààà àààà ààà ààààà "
+"àà àààààà àà:\n"
 "\n"
 "        %s\n"
 "\n"
 "àà ààààà àà àààà ààà àààààà ààààààà àà?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1756
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "àà àààà àààà ààààà ààà àà àààààà"
 
@@ -2054,7 +2163,7 @@ msgid "invalid time"
 msgstr "ààà àààà"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2063,7 +2172,7 @@ msgstr[0] "%d àààà"
 msgstr[1] "%d àààà"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2074,7 +2183,7 @@ msgstr[1] "%d àààà"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2082,23 +2191,19 @@ msgid_plural "%d seconds"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d ààààà"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "ààà àààààà"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "ààà ààà"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "ààà àààà ààà"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "àààà ààà"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "ààààà ààà"
 
@@ -2128,15 +2233,15 @@ msgid "Classification"
 msgstr "ààààààà"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "àààà"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ààààà"
@@ -2160,7 +2265,7 @@ msgstr "àààà"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "àààààà"
 
@@ -2170,20 +2275,20 @@ msgid "Organizer"
 msgstr "ààààààà"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ààààà"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
 #: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "àààààà"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "àààààà"
@@ -2193,7 +2298,7 @@ msgstr "àààààà"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "ààààà"
 
@@ -2223,54 +2328,58 @@ msgid "is not"
 msgstr "àà àààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "ààààà ààà"
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "ààààààà ààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Pop up an alert"
 msgstr "ààààààà ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:434
 msgid "Play a sound"
 msgstr "àààà àààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Run a program"
 msgstr "àààà àààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Send an email"
 msgstr "ààà à-ààà àààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "ààààà ààààà"
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "ààààààà ààààà"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
-msgid "Alarm"
-msgstr "ààààà"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "ààà àààààà(_m)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "ààààà àààà ààà"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
+msgstr "ààààààà ààààààà ààààà"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "àààààà(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "ààà"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "ààààààà"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "àààààà"
@@ -2289,11 +2398,12 @@ msgstr "àààààààà(_A):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
-msgstr "àààà(_P):"
+msgstr "àààààààà(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "ààààà àààààà(_R)"
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
+msgstr "ààààààà àààààà(_R)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2311,20 +2421,11 @@ msgstr "àààààà"
 msgid "day(s)"
 msgstr "ààà"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "ààà"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "ààààààà àà ààà"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "àà àààà àààà"
@@ -2341,7 +2442,7 @@ msgstr "àààà"
 msgid "start of appointment"
 msgstr "ààààààà ààààà"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "àààààà/ààààà"
 
@@ -2350,86 +2451,87 @@ msgid "A_dd"
 msgstr "ààààà(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "ààààà"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "àààà:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:513
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "àààà(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:285
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "ààà(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ààà àààààà ààààà àààààà ààà àààà ààà(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "àààààà àààààà àà ààà-àààà ààààà ààà ààààà àààà ààà(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "àààààà àààààà àà àààà àààà ààààà ààà ààààà àààà ààà(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "ààà(_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1015
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ààààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "ààà àààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "àààà àààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "àààààà ààààààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "àààà àààààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "ààà àààà ààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
 msgstr "àààà ààà àààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "àààà àààà ààààààààà"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
 msgstr "àààà àààà àààà"
 
@@ -2448,7 +2550,9 @@ msgstr "àà àààà ààà ààààà ààà ààà"
 #: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  ààààà àààààààà àààààà ààà ààààà ààààààà ààà ààààà ààààà àààààà ààà àààààà ààà?"
+msgstr ""
+"%s  ààààà àààààààà àààààà ààà ààààà ààààààà ààà ààààà ààààà àààààà ààà àààààà "
+"ààà?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -2470,264 +2574,276 @@ msgstr "àà àààà ààààà ààà ààà"
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  ààààà àààààààà àààààà ààà ààààà ààààààà ààà ààààà ààààà àààààà ààà àààààà ààà?"
+msgstr ""
+"%s  ààààà àààààààà àààààà ààà ààààà ààààààà ààà ààààà ààààà àààààà ààà àààààà "
+"ààà?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ààààà ààà àààààà àààà àààà àà, àààààà ààà?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "àààà àààà: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "àààààààà àààààà àààà àà ààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:543
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
 msgstr "àààà àààààà àààà àà àààà àà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:658
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "ààààààà ààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
 msgstr "àààààà - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
 msgstr "ààààààà - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:673
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "àààà ààà - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
 msgstr "ààà - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:680
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
 msgstr "àààà - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "ààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:817
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "àà àààà àààà ààààà àà?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
-msgid "Click here to close the current window"
-msgstr "àààààà ààààà ààà ààà àà àààà"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+#| msgid "Close the current file"
+msgid "Close the current window"
+msgstr "àààààà ààààà ààà ààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1434
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
-msgstr "àààà àà ààà"
+msgstr "àààà àà àààà ààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1441
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "àààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1034
-#: ../shell/e-shell-window-actions.c:1448
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "àààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
-msgid "Click here to view help available"
-msgstr "àààààà àààà àààà àà àààà àààà"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+#| msgid "View"
+msgid "View help"
+msgstr "àààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
-msgstr "ààààààààà àààààà"
+msgstr "ààààààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1069
-msgid "Click here to save the current window"
-msgstr "àààààà ààààà àààààà àà àààà"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+#| msgid "Save Current View"
+msgid "Save current changes"
+msgstr "àààààà ààààà àààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1553
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "àààà ààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "ààààààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:174
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ààà(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
-#: ../shell/e-shell-window-actions.c:1588
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "àààà(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
-#: ../shell/e-shell-window-actions.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "àààà(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "àààààà(_i)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1118
-#: ../composer/e-composer-actions.c:301
+#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "ààà(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "àààà(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../composer/e-composer-actions.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
-msgstr "àààà(_a)..."
+msgstr "àààà(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Click here to attach a file"
-msgstr "ààà àààà àààà ààà àà àààà"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "ààà àààà àààà ààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "ààààààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
 msgstr "ààààà ààà àà ààà ààààààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "àààà àààà(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
 msgstr "ààààà ààà àà àààà àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "ààààà(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
 msgstr "ààààà àààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "ààààà(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
 msgstr "ààààà àààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "àààà(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
 msgstr "àààà àà ààà 'àà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
 msgstr "ààà àààà(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
 msgstr "ààààà ààà àà ààà àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ààààà ààà àà RSVP àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
 msgstr "àààà àààà(_S):"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
 msgstr "ààààà ààà àà àààà àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
 msgstr "àààà àààà(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ààààà ààà àà ààààà àààà àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "ààààà àààààààà(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:2053
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "àààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#: ../calendar/gui/dialogs/comp-editor.c:2415
-#: ../calendar/gui/dialogs/comp-editor.c:3382
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "àààà àààààà àààà àà àààà àààà àààààà àààààààà ààà àà ààààààà ààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3346
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "àààààààà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3414
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
 msgstr "àààààà àààà àààà àààà àààà!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "àààà ààààààà àààà àà àààà àà"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
 msgstr "àààà ààààààà àààà àà àààà àà"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "àààà àààà ààà àà àà"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
+#| msgid "Cannot create a new event"
+msgid "Cannot create object"
+msgstr "àààààà ààààà àààà àà àààà"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
+msgid "Could not open source"
+msgstr "àààà ààààààà àààà àà àààà àà"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ààà àà àààààà ààà àààààà àà àààà-àààà àààà àà àààà àààààà àà?(_D)"
@@ -2812,150 +2928,146 @@ msgstr "àà àà àààààààà:"
 msgid "Enter Delegate"
 msgstr "àààààààà ààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "_Alarms"
-msgstr "ààààà(_A)"
+#: ../calendar/gui/dialogs/event-editor.c:212
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "ààààààà(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-msgid "Click here to set or unset alarms for this event"
-msgstr "àà àààà àà ààààà ààà àààà ààà àà-àààà ààà àà àààà"
+#: ../calendar/gui/dialogs/event-editor.c:214
+#| msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "àà àààà àà ààààààà àààà ààà àà-àààà ààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "àààà àààà àààà ààààà(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "ààààà ààà àà ààà àààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "ààààà(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "àà ààààààà ààà ààà àààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "àààà ààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:242
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "àààààà àààà ààà ààààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "àà ààà ààààààà(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "ààààà ààà àà àààà ààà àààà ààààààà àààààà àààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "ààààà/ààààà(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "àà àààààà àà ààààà / ààààà ààààààà ààà ààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "àààà"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "àà ààààà ààààà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:771
+#: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
 msgstr "ààààà àà ààààà àààà ààà ààààà àààà 'à àà"
 
-#: ../calendar/gui/dialogs/event-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:633
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ààààà ààààà àààà àà àààà, àààààà ààààà àààààà àààà ààààà àà àà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:816
+#: ../calendar/gui/dialogs/event-page.c:637
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ààààà àààà àààààà ààààà àààà àà àààà, àààààà ààààà àààààà àààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2784
-msgid "This event has alarms"
-msgstr "àà àààà àà ààààà àà"
+#: ../calendar/gui/dialogs/event-page.c:649
+#: ../calendar/gui/dialogs/event-page.c:3021
+#| msgid "This event has alarms"
+msgid "This event has reminders"
+msgstr "àà àààà àà ààààààà"
 
-#: ../calendar/gui/dialogs/event-page.c:895
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:716
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ààààààà(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:942
-msgid "_Delegatees"
-msgstr "àààààààà(_D)"
+#: ../calendar/gui/dialogs/event-page.c:1254
+msgid "Event with no start date"
+msgstr "ààààà àààààà àààà ààà àààà"
 
-#: ../calendar/gui/dialogs/event-page.c:944
-msgid "Atte_ndees"
-msgstr "àààà(_N)"
-
-#: ../calendar/gui/dialogs/event-page.c:1159
-msgid "Event with no start date"
-msgstr "ààààà àààààà àààà ààà àààà"
-
-#: ../calendar/gui/dialogs/event-page.c:1162
+#: ../calendar/gui/dialogs/event-page.c:1257
 msgid "Event with no end date"
 msgstr "ààààà ààà àààà ààà àààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
-#: ../calendar/gui/dialogs/memo-page.c:689
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/event-page.c:1430
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "ààààààà àààà ààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1440
 msgid "End date is wrong"
 msgstr "àààààà àààà ààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:1366
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "Start time is wrong"
 msgstr "ààààààà àààà ààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:1373
+#: ../calendar/gui/dialogs/event-page.c:1470
 msgid "End time is wrong"
 msgstr "àààààà àààà ààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:1537
-#: ../calendar/gui/dialogs/memo-page.c:730
-#: ../calendar/gui/dialogs/task-page.c:971
-msgid "The organizer selected no longer has an account."
-msgstr "àààà ààààààà àà àààààà àààà àààà ààà"
-
-#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "ààà ààààààà àààààà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:1568
-#: ../calendar/gui/dialogs/task-page.c:1001
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "ààà àààà ààà àààààà ààà"
 
-#: ../calendar/gui/dialogs/event-page.c:2658
+#: ../calendar/gui/dialogs/event-page.c:1869
+msgid "_Delegatees"
+msgstr "àààààààà(_D)"
+
+#: ../calendar/gui/dialogs/event-page.c:1871
+msgid "Atte_ndees"
+msgstr "àààà(_N)"
+
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "'%s' àààààà àààà àààà àààà"
+#| msgid "Unable to open the calendar '%s'."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "'%s' àààààà àààààà àààà àààà: %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -2963,79 +3075,82 @@ msgstr "'%s' àààààà àààà àààà àààà"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2702
-#: ../calendar/gui/dialogs/memo-page.c:949
-#: ../calendar/gui/dialogs/task-page.c:1791
+#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/memo-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ààààà %s àà ààà àààà ààà àà ààà àà"
 
-#: ../calendar/gui/dialogs/event-page.c:3013
+#: ../calendar/gui/dialogs/event-page.c:3250
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3256
 #, 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:3025
+#: ../calendar/gui/dialogs/event-page.c:3262
 #, 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:3044
+#: ../calendar/gui/dialogs/event-page.c:3281
 msgid "Customize"
 msgstr "àààà"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3050
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3287
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "àààà(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "ààààà ààà:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "ààààààà ààààààà:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ààààà ààààà"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "àààà-àààà(_z):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "ààààà(_A)"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:349
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "ààààà(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:361
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "àààààà(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "ààààààà(_R)"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "ààààà(_S):"
@@ -3044,19 +3159,19 @@ msgstr "ààààà(_S):"
 msgid "_Time:"
 msgstr "àààà(_T):"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "ààààààà ààà à ààà àààààà"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "ààààààà ààà àààààà à àààà"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3074,35 +3189,93 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "àààà ààà"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "àààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "ààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "àààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "àà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "àààààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "àààà àààà"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "Select _Today"
+msgstr "ààà àààà(_T)"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "ààààà"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "àààà"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "àà àààà ààààà ààà"
 
-#: ../calendar/gui/dialogs/memo-page.c:341
+#: ../calendar/gui/dialogs/memo-page.c:393
 msgid "Memo's start date is in the past"
 msgstr "àààà àà ààààà àààà ààà ààààà àààà 'à àà"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:430
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "àààà ààààà àààà àà àààà, àààààà ààààà àààà àààà ààààà àà àà àà"
 
-#: ../calendar/gui/dialogs/memo-page.c:383
+#: ../calendar/gui/dialogs/memo-page.c:434
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "àààà àààà àààààà ààààà àààà àà àààà, àààààà ààààà àààààà àààà àà"
 
-#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/memo-page.c:924
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "'%s' àààà àààà àààà ààà àààààà"
+#| msgid "Unable to open memos in '%s'."
+msgid "Unable to open memos in '%s': %s"
+msgstr "'%s' àààà àààà àààà ààà àààààà: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2466 ../mail/em-format-html.c:2490
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ààà"
 
@@ -3121,10 +3294,11 @@ msgid "T_o:"
 msgstr "ààà(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:428
+#: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "ààààà(_G):"
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "àààà(_L):"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3134,7 +3308,8 @@ msgstr "ààààà ààà ààààà àààà ààà àà
 #: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "ààààà ààà ààààà àààà àà àààààààà àà ààà àà, ààààà àà àààààààà ààà ààààààà àà?"
+msgstr ""
+"ààààà ààà ààààà àààà àà àààààààà àà ààà àà, ààààà àà àààààààà ààà ààààààà àà?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
@@ -3162,21 +3337,21 @@ msgstr "àà ààà àààààà àààà àà"
 msgid "All Instances"
 msgstr "àà àààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:569
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "àà ààààààà àààà ààà àà, àà àà ààààààà ààà àààà àààà ààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:901
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "ààààà àààà ààà àà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:941
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr "ààà-ààà àà àààà ààààà ààààà ààà àà àààà ààà àààààà àà"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "àààà"
 
@@ -3184,7 +3359,7 @@ msgstr "àààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "àààààà"
 
@@ -3193,7 +3368,7 @@ msgstr "àààààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "àààà"
 
@@ -3201,7 +3376,7 @@ msgstr "àààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "àààà"
 
@@ -3209,7 +3384,7 @@ msgstr "àààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "àààà"
 
@@ -3217,7 +3392,7 @@ msgstr "àààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "àààààà"
 
@@ -3225,13 +3400,13 @@ msgstr "àààààà"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "àààà"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "ààà àààà"
 
@@ -3239,7 +3414,7 @@ msgstr "ààà àààà"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "ààà ààà ààààà"
 
@@ -3247,7 +3422,7 @@ msgstr "ààà ààà ààààà"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "ààààà ààà ààààà"
 
@@ -3255,80 +3430,73 @@ msgstr "ààààà ààà ààààà"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "ààààà ààà ààààà"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-msgid "day"
-msgstr "ààà"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "àààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "àààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ààààààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "àààààààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1129
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "ààààà"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "àà àà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1425
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "ààààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2132
+#: ../calendar/gui/dialogs/recurrence-page.c:2140
 msgid "Add exception"
 msgstr "ààààà ààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2181
 msgid "Could not get a selection to modify."
 msgstr "ààà àà ààà ààà àààà ààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2179
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Modify exception"
 msgstr "ààààà ààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2231
 msgid "Could not get a selection to delete."
 msgstr "ààààà àà ààà ààà àààà ààààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2357
+#: ../calendar/gui/dialogs/recurrence-page.c:2365
 msgid "Date/Time"
 msgstr "àààà/àààà"
 
@@ -3340,7 +3508,7 @@ msgstr "àààà"
 msgid "Exceptions"
 msgstr "ààà"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "ààà"
 
@@ -3390,30 +3558,31 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ààà"
 
-#: ../calendar/gui/dialogs/send-comp.c:193
-msgid "Send my alarms with this event"
-msgstr "àà ààààà àà àààà ààààà àààà"
+#: ../calendar/gui/dialogs/send-comp.c:192
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
+msgstr "àà ààààà àà àààà ààààààà àààà"
 
-#: ../calendar/gui/dialogs/send-comp.c:195
+#: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
 msgstr "àààà ààààààà àà ààààà ààà(_o)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "àààààà àààà ààà"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "ààà àààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:442
-#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3421,59 +3590,59 @@ msgstr "ààà àààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "ààààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "àààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:712
-#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3224
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:435
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "ààààà àààà àà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "àààààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ààààà"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:433
+#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "àààà àààà àà"
 
@@ -3489,8 +3658,8 @@ msgstr "àààà(_U):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1837
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1831
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3499,7 +3668,7 @@ msgstr "ààààà"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "àà-àààààààà"
@@ -3526,52 +3695,52 @@ msgid "Click to change or view the status details of the task"
 msgstr "ààà àà àààà ààààà àà ààààà àà àààà"
 
 #: ../calendar/gui/dialogs/task-editor.c:126
-#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "àààà ààà(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
-#: ../widgets/misc/e-send-options.c:503
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
+#: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "àààà"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "ààà ààààà"
 
-#: ../calendar/gui/dialogs/task-editor.c:376
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "àà ààà ààààà ààà"
 
-#: ../calendar/gui/dialogs/task-page.c:345
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "àààà àà ààààà àààà ààà ààààà àààà 'à àà"
 
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "àààà àà àààà ààà ààààà àààà 'à àà"
 
-#: ../calendar/gui/dialogs/task-page.c:381
+#: ../calendar/gui/dialogs/task-page.c:284
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "àààà àààà àààà àà àààà, àààààà àààà àààà àààà ààààà àà àà àà"
 
-#: ../calendar/gui/dialogs/task-page.c:385
+#: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "àààà àààà àààààà àààà àààà àà àààà, àààààà ààààà àààààà àààà àà"
 
-#: ../calendar/gui/dialogs/task-page.c:436
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "àààààà(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:882
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
 msgstr "àààà àààà ààà"
 
-#: ../calendar/gui/dialogs/task-page.c:1748
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "'%s' àààà àààà àààà ààà àààààà"
+#| msgid "Unable to open tasks in '%s'."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "'%s' àààà àààà àààà ààà àààààà: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3586,7 +3755,7 @@ msgid "Time zone:"
 msgstr "àààà-àààà:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:384
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3594,116 +3763,116 @@ msgstr[0] "%d ààà"
 msgstr[1] "%d ààà"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:390
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d àààà"
 msgstr[1] "%d àààà"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Unknown action to be performed"
 msgstr "ààààààà àààààà ààà àà àà"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "ààààààà àààà ààà ààà àààààà %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s ààààààà àà àààà àààà"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s àà àààààà àààà"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ààààààà àà ààà ààà àààààà"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "ààààààà ààà àààà %s %s "
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "ààààààà àà ààà %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
+#: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
 msgstr "%s, %s àà"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "ààààà àààààà àààà àà  %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "ààààà ààà"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "ààààààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "ààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "ààààààà àààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "àààà:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "ààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "àààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "ààààà:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "ààà ààà:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "ààààà"
 
@@ -3723,16 +3892,16 @@ msgid "Start Date"
 msgstr "àààà àààà"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "ààààà"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:655
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3743,44 +3912,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:705
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1029
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "ààà"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "ààà"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../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:1073
-#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
+#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "àààààà"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "àààà àààà"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
 msgstr "%s ààààààà àà àààà àà"
@@ -3808,7 +3977,7 @@ msgstr "àààà"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "àààà"
 
@@ -3817,110 +3986,112 @@ msgid "Start date"
 msgstr "ààààààà àààà"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:582
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "àààà"
 
-#: ../calendar/gui/e-calendar-view.c:430
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "àààà ààààà ààààààààà ààà àààà"
 
-#: ../calendar/gui/e-calendar-view.c:436
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "àààà ààààà ààààààààà àààà àààà ààà"
 
-#: ../calendar/gui/e-calendar-view.c:442
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "ààààà ààààààààà ààà àààà"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "àààà ààààà àààà"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "àààààà àààààà àààààà àà ààààà àà"
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1078
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1086
 msgid "Updating objects"
 msgstr "àààà àààààà àààà àà ààà àà"
 
-#: ../calendar/gui/e-calendar-view.c:1784
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-calendar-view.c:1778
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "àààààà"
 
-#: ../calendar/gui/e-calendar-view.c:1785
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-calendar-view.c:1779
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-calendar-view.c:1786
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "àààà"
 
-#: ../calendar/gui/e-calendar-view.c:1787
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "ààààààààà"
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1782
 msgid "Needs action"
 msgstr "àààààà àààààà àà"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:753
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ààààààà: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:756
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "ààààààà: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "àààààà: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1983
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "àààà: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%I:%M:%S %p %a %d/%m/%Y"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3934,27 +4105,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:761
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i àààà ààà"
 
-#: ../calendar/gui/e-day-view-time-item.c:782
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "àààà àààà àààà àààà"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:799
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:844
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:876
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "àààà..."
 
@@ -3964,8 +4135,8 @@ msgstr "àààà..."
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -3975,10 +4146,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:223
-#: ../calendar/gui/ea-gnome-calendar.c:203
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3987,29 +4158,29 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
-#: ../calendar/gui/e-week-view-main-item.c:237
-#: ../calendar/gui/ea-gnome-calendar.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "àààà"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
-#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
-#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "àààà"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2609
+#: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
 msgstr "ààààà %d"
@@ -4030,90 +4201,97 @@ msgstr "àààààà ààà ààà àààà"
 msgid "Resources"
 msgstr "àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1071
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1072
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1086
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "àààààà ààà ààà àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "àààààà ààà àààà àààà"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1089
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "ààà ààà ààà àààà àààà àà"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1036
+#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "àààààà àààààà àà"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "ààààà                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "àààààà àààà"
 
-#: ../calendar/gui/e-meeting-store.c:1760
+#: ../calendar/gui/e-meeting-store.c:1841
 #, c-format
-#| msgid "Enter password for user %s on server %s"
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "%s àààà àààà %s ààààà àààà àààà/ààààà ààààààà ààà àà àààààà ààà"
 
-#: ../calendar/gui/e-meeting-store.c:1767
+#: ../calendar/gui/e-meeting-store.c:1851
 #, c-format
 msgid "Failure reason: %s"
 msgstr "ààààà ààà àà àààà: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1856
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:448
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "àààààà ààà"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel-item.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:2380
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -4121,74 +4299,74 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#: ../calendar/gui/e-meeting-time-sel-item.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:2411
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel-item.c:439
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Out of Office"
 msgstr "àààà ààà àààà"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "No Information"
 msgstr "ààà ààààààà àààà"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:584
 msgid "O_ptions"
 msgstr "ààà(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "Show _only working hours"
 msgstr "àààà ààà-àààà àà ààààà(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "àààà àààà ààààà(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:629
 msgid "_Update free/busy"
 msgstr "ààààà/ààààà àààààà(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "ààà-ààà(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:695
 msgid "_All people and resources"
 msgstr "àà àààààà àà àààà(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "àà àààààà àà ààà àààà(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "_Required people"
 msgstr "àààààà àààààà(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "àààààà ààà àà ààà àààà(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "àààààààà àààà(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:813
 msgid "_End time:"
 msgstr "àààààà àààà(_E):"
 
@@ -4216,26 +4394,26 @@ msgstr "ààààà"
 msgid "Member"
 msgstr "ààààà"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:439
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "àààà"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* ààààà àààà *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
+#: ../calendar/gui/e-memo-table.c:586 ../calendar/gui/e-task-table.c:806
 msgid "Start: "
 msgstr "àààà:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
+#: ../calendar/gui/e-memo-table.c:605 ../calendar/gui/e-task-table.c:824
 msgid "Due: "
 msgstr "àààà:"
 
@@ -4252,7 +4430,7 @@ msgid "Paste memos from the clipboard"
 msgstr "ààààààààà ààà àààà àààà"
 
 #: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
 msgstr "àààà ààà àààà"
 
@@ -4268,43 +4446,40 @@ msgstr "ààà àààà ààààà ààà àà àààà"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:546
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:437
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1003
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "ààà"
 
-#: ../calendar/gui/e-task-table.c:943
+#: ../calendar/gui/e-task-table.c:951
 msgid "Cut selected tasks to the clipboard"
 msgstr "àààà àààà ààààààààà ààà àààà"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:957
 msgid "Copy selected tasks to the clipboard"
 msgstr "àààà àààà ààààààààà àààà àààà ààà"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:963
 msgid "Paste tasks from the clipboard"
 msgstr "ààààààààà àààààà àààà àààà"
 
-#: ../calendar/gui/e-task-table.c:961
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:969
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
 msgstr "àààà àààà àààà"
 
-#: ../calendar/gui/e-task-table.c:967
+#: ../calendar/gui/e-task-table.c:975
 msgid "Select all visible tasks"
 msgstr "àà ààà ààààà àààààà àààà"
 
@@ -4318,65 +4493,66 @@ msgstr "àààà àààà àààà"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "àà àà ààààà ààà"
+#: ../calendar/gui/ea-cal-view-event.c:290
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "àà àà ààààààà ààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "àà ààààààà ààààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "ààà àààààà ààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "àààààà ààààààà: %s ààààà ààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "àààààà ààààààà: ààà ààààààà àààà ààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "àààààà àààà àààà"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "àààà ààà"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "àààà ààààààà"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New All Day Event"
 msgstr "ààààà àààà ààà ààààààà"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Meeting"
 msgstr "àààà àààààà"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Today"
 msgstr "ààà 'àà ààà"
 
-#: ../calendar/gui/ea-cal-view.c:309
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Date"
 msgstr "àààà 'àà ààà"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "àààààà àààà àààà àààà ààà àààà àà ààà àààà"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4385,7 +4561,7 @@ msgstr[1] "àà àààà %d ààààààà ààà"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "àà àààà ààà àààà àààà ààà"
 
@@ -4413,150 +4589,93 @@ msgstr "ààà àààà àà àààààà àààà"
 msgid "calendar view for one or more days"
 msgstr "ààà ààà ààààà ààààà àà àààààà àààà"
 
-#: ../calendar/gui/ea-gnome-calendar.c:49
-#: ../calendar/gui/ea-gnome-calendar.c:57
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "àààà àààààà"
 
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:205
-#: ../calendar/gui/ea-gnome-calendar.c:210
-#: ../calendar/gui/ea-gnome-calendar.c:212
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../calendar/gui/ea-gnome-calendar.c:235
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:243
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "ààà ààà"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "ààà ààààààà àààà àà àà ààà ààààà"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ààààà ààà: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "àààà ààà: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:196
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "ààààà àà àààààà àààà"
 
-#: ../calendar/gui/ea-week-view.c:198
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "ààà ààà ààààà àààààà àà àààààà ààà"
 
-#: ../calendar/gui/gnome-cal.c:2201
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "ààààà àà àààà àà"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "àààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "ààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "àààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "àà"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "ààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "àààààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "àààà àààà"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
-msgid "Select _Today"
-msgstr "ààà àààà(_T)"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "ààààà"
-
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "ààà ààààààà àààà ààààà àà"
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "ààà àààà ààà àààààà àà"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
 msgstr "àààà ààààààà"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
 msgstr "ààà ààààààà"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "àààà ààààààà"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
 msgstr "ààààà/ààààà ààààààà"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
 msgstr "àààààà ààààààà"
 
@@ -4564,7 +4683,7 @@ msgstr "àààààà ààààààà"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "àààààà"
@@ -4573,7 +4692,7 @@ msgstr "àààààà"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "àààà àààààà"
@@ -4585,7 +4704,7 @@ msgstr "àààà àààààà"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ààààà"
@@ -4594,7 +4713,7 @@ msgstr "ààààà"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ààààààààà"
@@ -4602,7 +4721,7 @@ msgstr "ààààààààà"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "àààà"
@@ -4610,7 +4729,7 @@ msgstr "àààà"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ààà ààà"
@@ -4618,7 +4737,7 @@ msgstr "ààà ààà"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ààà-àààà"
@@ -4626,239 +4745,252 @@ msgstr "ààà-àààà"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ààà ààààà"
 
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ààààà/ààààà ààààààà (%s ààà %s)"
 
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
 msgstr "iCalendar ààààààà"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:969
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "àààà àààà ààà àà àààààà, àààà ààààà àààààà àà àààà ààà àààà àààà ààà"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
 msgstr "àààà àààà ààà àà àààààà, àààà: "
 
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "ààààà àà ààààà àààà àààà àààààà àà"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:548
 msgid "1st"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:548
 msgid "2nd"
 msgstr "ààà"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:548
 msgid "3rd"
 msgstr "ààà"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:548
 msgid "4th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:548
 msgid "5th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:549
 msgid "6th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:549
 msgid "7th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:549
 msgid "8th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:549
 msgid "9th"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:549
 msgid "10th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:550
 msgid "11th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:550
 msgid "12th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:550
 msgid "13th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:550
 msgid "14th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:550
 msgid "15th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:551
 msgid "16th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:551
 msgid "17th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:551
 msgid "18th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:551
 msgid "19th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:551
 msgid "20th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:552
 msgid "21st"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:552
 msgid "22nd"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:552
 msgid "23rd"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:552
 msgid "24th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:552
 msgid "25th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:553
 msgid "26th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:553
 msgid "27th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:553
 msgid "28th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:553
 msgid "29th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:553
 msgid "30th"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:554
 msgid "31st"
 msgstr "ààààà"
 
-#: ../calendar/gui/print.c:605
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "àà"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:611
 msgid "Mo"
 msgstr "àà"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:611
 msgid "Tu"
 msgstr "àà"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:611
 msgid "We"
 msgstr "ààà"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:612
 msgid "Th"
 msgstr "àà"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:612
 msgid "Fr"
 msgstr "àààà"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:612
 msgid "Sa"
 msgstr "à"
 
-#: ../calendar/gui/print.c:2969
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " ààà "
 
-#: ../calendar/gui/print.c:2979
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (ààààà "
 
-#: ../calendar/gui/print.c:2985
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "ààààà "
 
-#: ../calendar/gui/print.c:2995
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr " (àààà "
 
-#: ../calendar/gui/print.c:3002
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "àààà "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "ààààà: %s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "àààà:"
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "àààà: %s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "àààà: %s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ààààààà àààà: %i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "ààààààà: %s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "ààààà: "
 
@@ -4867,6 +4999,10 @@ msgstr "ààààà: "
 msgid "% Completed"
 msgstr "% àààààà"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "ààà àààà"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ààààà àààà àà"
@@ -4879,185 +5015,186 @@ msgstr "àà ààààà àà"
 msgid "is less than"
 msgstr "àà ààà àà"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "ààààààà ààà àààààà"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "àààààà ààààààà àà àààà àà"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar àààààà (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
 msgstr "ààààààà àà-àààààà ààààààà"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "ààà-àààà!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar àààààà (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
 msgstr "ààààààà àà-àààààà ààààààà"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
 msgstr "àààààà ààààààà"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
 msgstr "ààààààà àààà àààààà ààààààà"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "àààààà"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ààààà"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "àààà"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "àààà"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ààà-àààààà àà"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ààà àààà"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1126
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ààààà ààà"
+msgid "has reminders"
+msgstr "ààààààà àà"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "àààà"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ààààà"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "àààààààà"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "àààà"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ààààààà"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ààààà"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1165
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "àààààà"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "àààà"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "àààààà"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ààààà"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ààààààààà"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ààààà"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ààààààà"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "àààà"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ààààà"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "àààà"
@@ -6614,153 +6751,152 @@ msgstr "àààààà/ààààà"
 msgid "Pacific/Yap"
 msgstr "àààààà/àààà"
 
-#: ../composer/e-composer-actions.c:163
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ààà àààààà..."
 
-#: ../composer/e-composer-actions.c:259
-#: ../widgets/misc/e-attachment-view.c:380
-msgid "Attach a file"
-msgstr "ààà àààà ààààà ààà"
-
-#: ../composer/e-composer-actions.c:264
+#: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "ààà ààà(_C)"
 
-#: ../composer/e-composer-actions.c:266
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "àààààà àààà ààà ààà"
 
-#: ../composer/e-composer-actions.c:273
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "àààà àààààà(_M)"
+
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr "àààà àààààà ààààà àààààà"
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+msgid "Configure Evolution"
+msgstr "àààààààà àààààà"
+
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "àààààà àààà àààààà"
 
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "ààà àààààà(_A)..."
 
-#: ../composer/e-composer-actions.c:280
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "àààààà àààà ààà ààààà ààà ààà àààààà"
 
-#: ../composer/e-composer-actions.c:285
-msgid "New _Message"
-msgstr "àààà àààààà(_M)"
-
-#: ../composer/e-composer-actions.c:287
-msgid "Open New Message window"
-msgstr "àààà àààààà ààààà àààààà"
-
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "àààà àààààààà(_E)"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "ààààà ààà(_P)..."
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "àààà ààà(_v)"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "ààààà àààà àààààà(_D)"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "ààààà àààà àààààà"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "àààà(_e)"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "àà àààààà àààà"
 
-#: ../composer/e-composer-actions.c:342
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "PGP àààààààà(_E)"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "àà àààààà ààà PGP ààà àààààààà ààà"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "PGP ààààà(_S)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "àààà PGP àà ààà àà àààààà àà ààààà ààà"
 
-#: ../composer/e-composer-actions.c:358
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "ààààà ààààà(_P)"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "ààààààà àà ààààà àààà, àà àà ààààà àààà àààààà àààà ààààà ààààààà àà"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "àààà àààààà(_P)"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "àààààà àà àààà àààà"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "ààààà àààà àà ààà(_q)"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "àààà àààààà àààààà àààà àààà ààà ààààààà ààààà ààà"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "S/MIME àààààààà(_C)"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "àà àààààà ààà àààà S/MIME ààààààà ààààààààà ààà àààààà ààà"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "S/MIME àààà(_n)"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "àààà S/MIME ààààà ààààààààà ààà àà àààààà àà ààààà ààà"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "_Bcc àààà"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ààààà ààà àà BCC àààà ààààà àààà"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "_Cc àààà"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "ààààà ààà àà CC àààà ààààà àààà"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "àààà àààà(_R)"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ààààà ààà àà àààà àààà ààààà àààà"
 
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "ààààà àààààà"
 
@@ -6777,40 +6913,41 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"àà àààààà àà àààààà ààà àààààà ààà ààà ààà ààà àààà àààà àààààà ààà (ààààà àààà) àààà àà "
+"àà àààààà àà àààààà ààà àààààà ààà ààà ààà ààà àààà àààà àààààà ààà (ààààà "
+"àààà) àààà àà "
 "ààààààà"
 
 #  * From
-#: ../composer/e-composer-header-table.c:1006
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "àààà(_o):"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "àààà(_R):"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "ààà(_T):"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
 #  * Post-To
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "àààà(_P):"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "àààà(_u):"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "ààààà(_g):"
 
@@ -6822,47 +6959,51 @@ msgstr "àààààà-àààà àà àààà ààààà à
 msgid "Click here to select folders to post to"
 msgstr "àààà àà ààààà àààà àà àààà ààààà ààà"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "ààààà àààààà àààà ààà"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "àààà àààà àààà àààààà ààà ààà-ààà"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "ààààà àààà"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "ààààà àà ààà ààà ààà àààà"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "ààààà àààààà"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:808
 #, c-format
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "ààààà àààààà àà ààààà ààà àààà àà àààà: àà àààààà àà ààà ààààààààà àààà àà"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"ààààà àààààà àà ààààà ààà àààà àà àààà: àà àààààà àà ààà ààààààààà àààà àà"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "àààà ààà àààà àààààà ààà ààààà àààà àà àààà àà: àà àààààà àà ààà àààààààà ààààààààà àààà àà"
+msgstr ""
+"àààà ààà àààà àààààà ààà ààààà àààà àà àààà àà: àà àààààà àà ààà àààààààà "
+"ààààààààà àààà àà"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2042
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "àààààà àààà"
 
-#: ../composer/e-msg-composer.c:4117
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "àààà àààà ààà àà-ààààà ààà àà, ààà ààà ààààà àààà àà àààà ààà"
 
-#: ../composer/e-msg-composer.c:4822
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "àààà-ààààà àààààà"
 
@@ -6871,7 +7012,8 @@ msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
 msgstr ""
-" ààà àààààà ààà ààààààà àààà àà àààà ààà àààà àààà ààà àààà àààààà àààààà ààààà àà àààà "
+" ààà àààààà ààà ààààààà àààà àà àààà ààà àààà àààà ààà àààà àààààà àààààà "
+"ààààà àà àààà "
 "àààà ààààààà"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -6881,27 +7023,32 @@ msgstr "àà àààààà àààà àààà"
 #: ../composer/mail-composer.error.xml.h:3
 msgid "An error occurred while saving to your Drafts folder."
 msgstr ""
-"àààààà ààààà ààààà ààà àààààà ààààà àààà ààààààààà ààààà ààààà ààà àààààà ààààà àààà "
+"àààààà ààààà ààààà ààà àààààà ààààà àààà ààààààààà ààààà ààààà ààà àààààà "
+"ààààà àààà "
 "àààààààà ààààà ààààà ààà àààààààà àà"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "An error occurred while saving to your Outbox folder."
 msgstr ""
-"àààààà ààààààà ààààà àààà àààààà ààààà àààà àà ààààààààà ààààààà ààààà àààà àààààà àààààààààà "
-"ààààààà ààààà ààààààà ààààààà ààààà àààààààà ààààààà ààààà àààààà ààààààà ààààà ààààààà "
+"àààààà ààààààà ààààà àààà àààààà ààààà àààà àà ààààààààà ààààààà ààààà àààà "
+"àààààà àààààààààà "
+"ààààààà ààààà ààààààà ààààààà ààààà àààààààà ààààààà ààààà àààààà ààààààà "
+"ààààà ààààààà "
 "ààààààà ààààà ààààààààà ààààààà ààààà '"
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr ""
-"àààà ààààà àààà àà ààà àà ààààà àààà ààààà ààààààà àà?àààà ààààà àààà àà ààà àà ààààà àààà "
+"àààà ààààà àààà àà ààà àà ààààà àààà ààààà ààààààà àà?àààà ààààà àààà àà ààà "
+"àà ààààà àààà "
 "ààààà àààààà ààààà àààà àà ààà àà à"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "àà ààààà àààà àà ààà àààààà ààààà '{0}' ààà, ààà ààààà ààààà àààà ààààààà àà? "
+msgstr ""
+"àà ààààà àààà àà ààà àààààà ààààà '{0}' ààà, ààà ààààà ààààà àààà ààààààà àà? "
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -6923,9 +7070,11 @@ msgid ""
 "Outbox folder. When you are back online you can send the message by clicking "
 "the Send/Receive button in Evolution's toolbar."
 msgstr ""
-"àààààà ààààà àààààà ààà àà ààà àà, àààààà àààààà ààà àààààà àààà ààààààà ààààà àààà "
-"ààààààà ààààààà àààà ààààà àààà àààààà àààààà ààà ààààà àààààààà àà àààààà ààà àààà/ààà "
-"ààà ààà àààààà ààà ààà àààà ààà"
+"àààààà ààààà àààààà ààà àà ààà àà, àààààà àààààà ààà àààààà àààà ààààààà "
+"ààààà àààà ààààààà "
+"ààààààà àààà ààààà àààà àààààà àààààà ààà ààààà àààààààà àà àààààà ààà "
+"àààà/ààà ààà ààà àààààà ààà ààà "
+"àààà ààà"
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid ""
@@ -6933,8 +7082,10 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"àà àààà ààààà ààà ààà ààà ààà ààà àà ààà ààààà ààà ààà ààà àààààààà ààààà àà ààà àà "
-"ààààààà, àààà ààà àà ààààà àààààà ààà ààààà ààààà àààà ààààààà ààààà àà ààà àààà ààà àààààà ààà ààà "
+"àà àààà ààààà ààà ààà ààà ààà ààà àà ààà ààààà ààà ààà ààà àààààààà ààààà àà "
+"ààà àà "
+"ààààààà, àààà ààà àà ààààà àààààà ààà ààààà ààààà àààà ààààààà ààààà àà ààà "
+"àààà ààà àààààà ààà ààà "
 "àààà àààà àààà àà àààà ààà"
 
 #: ../composer/mail-composer.error.xml.h:11
@@ -6970,21 +7121,22 @@ msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"ààààààà àà àààà ààààà ààà àà àà àà, àààà àà ààààà ààà àààà àààààà ààà ààà ààà àààà ààà-àààààà "
+"ààààààà àà àààà ààààà ààà àà àà àà, àààà àà ààààà ààà àààà àààààà ààà ààà ààà "
+"àààà ààà-àààààà "
 "ààà ààà ààààààà àà àààà ààà ààà àààà ààà àààà àààà àà àààà àà, ààààà ààààà ààà"
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "Saving message to Outbox."
 msgstr ""
-"àààààà ààààààà 'à ààààààà àà àààà ààààààààà ààààààà 'à ààààààà àà àààà ààààààà "
+"àààààà ààààààà 'à ààààààà àà àààà ààààààààà ààààààà 'à ààààààà àà àààà "
+"ààààààà "
 "ààààààà 'à à'àààààà ààààà"
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "àààà `{0}' àààààà àààà àààà àà ààà àààààà ààààà àààà àà àààà ààà"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "àààààà àààà àààà &quot;{0}&quot; ààà"
 
@@ -6992,7 +7144,9 @@ msgstr "àààààà àààà àààà &quot;{0}&quot; ààà"
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
-msgstr "àààààà àààà àààà &quot;{0}&quot; ààà ààààà àààà àà àà àààààà àààà ààààààà ààà ààà"
+msgstr ""
+"àààààà àààà àààà &quot;{0}&quot; ààà ààààà àààà àà àà àààààà àààà ààààààà ààà "
+"ààà"
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
@@ -7006,288 +7160,291 @@ msgstr "ààààà àà àààààà ààà &quot;{0}&quot; à
 msgid "You need to configure an account before you can compose mail."
 msgstr "àààà àààà ààà àààààà ààààààà àààààà àààààà ààà àà ààà ààà"
 
+#: ../composer/mail-composer.error.xml.h:26
+#| msgid "An error occurred during processing: %s"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "àààààà àààààà ààààà ààà àà, àà àààà-àààààààààà ààààà àààà àà ààà"
+
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
 msgstr "ààààààà àààà àààà(_C)"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "ààà-àààààà àà ààà(_D)"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "ààà-àààààà(_R)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
 msgstr "ààààà àààààà(_S)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "ààààààà 'à àààààà(_S)"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
 msgstr "ààà ààààààà ààà(_T)"
 
-#: ../capplet/anjal-settings-main.c:224
-msgid "Run Anjal in a window"
-msgstr "ààààà ààààà àààà àààà"
-
-#: ../capplet/anjal-settings-main.c:225
-msgid "Make Anjal the default email client"
-msgstr "ààààà ààà àààààà àààà ààààà àààà"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
 msgstr "àààà ààààà ààà àà àààà àà ID"
 
-#: ../capplet/anjal-settings-main.c:233
+#: ../capplet/anjal-settings-main.c:154
 msgid "socket"
 msgstr "àààà"
 
-#: ../capplet/anjal-settings-main.c:246
-msgid "Anjal email client"
-msgstr "ààààà àààà ààààà"
-
-#: ../capplet/settings/mail-account-view.c:73
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "àààà àààà ààà àààà"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "àààà àààà àààààà ààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "àààààà àààà ààààà àààà àààààà ààààààà àààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "àààà àààààà ààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:255
-#: ../plugins/caldav/caldav-source.c:66
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:56
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "àààà"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "ààààà ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "ààà:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "à-ààà àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "àààà àààà:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "àààà àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "ààààà ààà:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "àààààààààà ààààà:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "ààà àààà"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "ààààà"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 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:592
+#: ../capplet/settings/mail-account-view.c:609
 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:594
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "ààààà àààààà àààààà àà ààà ààààà àà àààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 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:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "ààààà àààà àààààà àà àààà àààààà àààààà àà àààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 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:613
-#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2233 ../mail/em-account-editor.c:2366
 msgid "Identity"
 msgstr "àààà"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "àààà - àààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "àààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "àààà - àààà ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "ààààà - àààà"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "àààà - ààààààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "ààààààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "ààààà - ààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "ààà ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "àààà - àààààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "àààà - àààààà"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "ààààà - ààààààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3044
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3226
 msgid "Defaults"
 msgstr "ààà"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "ààààà - ààà ààààààà"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "àààààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "àààààà"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "ààààà - ààààà"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
 msgstr "àààààààà ààà àààà ààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
 msgstr "àààààààà ààà àààà àààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:731
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
 msgstr "ààààààà IMAP ààààà àààà ààà àà ààà àà àààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:739
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
 msgstr "àààà àààààà àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "àààààààà ààà àààà àààààà àààààà"
 
-#: ../capplet/settings/mail-account-view.c:770
+#: ../capplet/settings/mail-account-view.c:801
 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 ""
-"àààà àààààà àààààà ààà_àààà ààà ààààà ààààà ààà àààà àààààà ààà ààààà àà ààààààà àààà ààà "
+"àààà àààààà àààààà ààà_àààà ààà ààààà ààààà ààà àààà àààààà ààà ààààà àà "
+"ààààààà àààà ààà "
 "àààààà àààààà ààà àà àààààà ààà, àà ààà àà àààà ààà àààààà ààà ààà ààààà"
 
-#: ../capplet/settings/mail-account-view.c:777
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
 msgstr "àààà àààààà àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:791
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
 msgstr "àààà àààààà ààà:"
 
-#: ../capplet/settings/mail-account-view.c:1063
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "àààààà:"
 
-#: ../capplet/settings/mail-account-view.c:1132
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:1145
+#: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "ààà ààà ààà"
 
-#: ../capplet/settings/mail-account-view.c:1142
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "àààààà ààààà"
 
@@ -7296,20 +7453,19 @@ msgid "Evolution account assistant"
 msgstr "ààààààà àààààà ààààà"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1709
-#: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:148
-#: ../modules/calendar/e-memo-shell-backend.c:96
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-migrate.c:115
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:744 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "àà ààààààà àààà"
 
@@ -7326,7 +7482,7 @@ msgstr "àààà àààààà ààààà"
 msgid "Account management"
 msgstr "àààààà ààààà"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:258
 msgid "Settings"
 msgstr "àààààà"
 
@@ -7338,9 +7494,9 @@ msgstr "àààààà ààààà ààààààààààà"
 msgid "Evolution Alarm Notify"
 msgstr "ààààààà ààààà ààààààààààà"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:253
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "ààààààà"
 
@@ -7348,7 +7504,7 @@ msgstr "ààààààà"
 msgid "Evolution Mail and Calendar"
 msgstr "ààààààà ààà ààà àààààà"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "ààààààààà ààà"
 
@@ -7365,36 +7521,36 @@ msgid "Email Settings"
 msgstr "àààà àààààà"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ààà ààà)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ààààà)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:232
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (àààà àààà)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (ààà àààà ààààà àà)"
 
-#: ../e-util/e-activity.c:238
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:243
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ààààà)"
@@ -7478,9 +7634,9 @@ msgstr "àààà"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "ààà"
 
@@ -7493,58 +7649,116 @@ msgstr "àààà"
 msgid "Yesterday"
 msgstr "ààààà"
 
-#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
-#. ngettext is used to be able to define different translations for different days of week, where
-#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
-#: ../e-util/e-datetime-format.c:218
-#, c-format
-msgid "Next %a"
-msgid_plural "Next %a"
-msgstr[0] "àààà %a"
-msgstr[1] "àààà %a"
-
-#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
-#: ../e-util/e-datetime-format.c:314
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:220
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "àààà ààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:226
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "àààà àààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:232
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "àààà àààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:238
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "àààà ààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:244
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "àààà àààààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:250
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "àààà ààààààà"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:256
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "àààà àà"
+
+#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
+#: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
 msgstr "ààààà àààààà ààààà"
 
-#: ../e-util/e-datetime-format.c:510
+#: ../e-util/e-datetime-format.c:554
 msgid "Format:"
 msgstr "àààààà:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(ààààà àààà ààà)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "\"%s\" àààà àà ààà àà"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" ààà %s àààà ààààà àà àààà àà"
 
 #: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-contacts-source.c:380
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "àààà"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "àààààààà àà ààààà ààà àààà àà àà"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "àààààààà ààààà àà àààà àààà ààà ààààà ààààààà àààà àà:"
 
-#: ../e-util/e-print.c:170
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "àààààààà ààààà àà àààà àààà ààà ààààààà àààà ààààà ààà"
 
 #: ../e-util/e-signature.c:707
@@ -7577,319 +7791,313 @@ msgstr "àà ààààà àààà ààààà àààààà
 msgid "File exists \"{0}\"."
 msgstr "àààà ààààà \"{0}\" ààà"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "àààà àààà(_O)"
 
-#: ../e-util/e-util.c:154
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "àààà ààààààà àààà àà ààààà"
 
-#: ../e-util/e-util.c:201
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "àààààààà àà àààà ààààà àààà àà àààà"
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf àààà: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "ààà àààà àà àààààà àààà àààààà àààà àà ààààà"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "àààà"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "àà ààà àààà"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2470
-#: ../mail/em-format-html.c:2493 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2474
-#: ../mail/em-format-html.c:2496 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "ààààà"
 
 #  pseudo-header
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2590
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "àààà"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "-------- àààà ààààà àààààà --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
-#: ../widgets/misc/e-dateedit.c:551
+#: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "àààà"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "àààààà àààà"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ààà"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s àààà"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "àààààà S/MIME ààà àààà àààà àààà àà àààà: àààààà àààà"
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "àààààà MIME ààà àààà àààà àààà àà àààà, àààà àà ààà àà àà àààààà àà àààà ààà"
+msgstr ""
+"àààààà MIME ààà àààà àààà àààà àà àààà, àààà àà ààà àà àà àààààà àà àààà ààà"
 
-#: ../em-format/em-format.c:1739
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "àààààà/àààààààà àà àà-ààààà ààààààààà àààà"
 
-#: ../em-format/em-format.c:1759
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
 msgstr "àààààà PGP/MIME ààà àààà àààà àààà àà àààà"
 
-#: ../em-format/em-format.c:1760
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "àààààà PGP/MIME ààà àààà àààà àààà àà àààà: àààààà àààà"
 
-#: ../em-format/em-format.c:1951
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "àà-ààààà ààààà àààààà"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "ààààà àààà ààààà àààà"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
-#: ../em-format/em-format.c:2138
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "ààààà àààà ààààà àààààà àààà"
 
-#: ../em-format/em-format.c:2229
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
 msgstr "PGP àààààà àààà àààà àààà àà àààà: "
 
-#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
-#: ../plugins/caldav/caldav-browse-server.c:211
-#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "àààààà àààà"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "à ààààà àààààà"
 msgstr[1] "%d ààààà àààààà"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ààà àààà à ààààà"
 msgstr[1] "ààà àààà %d ààààà"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "à àààà àààààà"
 msgstr[1] "%d àààà àààààà"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ààà àààà à àààà"
 msgstr[1] "ààà àààà %d àààà"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "à àààà àààààà"
 msgstr[1] "%d àààà àààààà"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ààà àààà ààà àààà à àààà"
 msgstr[1] "ààà àààà ààà àààà %d àààà"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "à ààà àààààà"
 msgstr[1] "%d ààà àààààà"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ààà àààà à ààà"
 msgstr[1] "ààà àààà %d ààà"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "à àààà àààààà"
 msgstr[1] "%d àààà àààààà"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ààà àààà ààààà àààà à ààààà"
 msgstr[1] "ààà àààà ààààà àààà %d ààààà"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "à ààààà àààààà"
 msgstr[1] "%d ààààà àààààà"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ààà àààà à ààààà"
 msgstr[1] "ààà àààà %d ààààà"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "à ààà àààààà"
 msgstr[1] "%d ààà àààààà"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ààà àààà à ààà"
 msgstr[1] "ààà àààà %d ààà"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<àààà àààà àà ààà ààààà ààà>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "ààà"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:282
 msgid "Select a time to compare against"
 msgstr "ààà ààà àà àààà àààà"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "àààà àààà"
 
-#: ../filter/e-filter-rule.c:669
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "àààà ààà(_u):"
 
-#: ../filter/e-filter-rule.c:699
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "àààààà àààà, àà àà ààà ààààà ààààààà ààà àààà àààà àààà"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "àààà àà àààà ààà ààà ààà"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "àààà ààà àà àààà ààà àààà"
 
-#: ../filter/e-filter-rule.c:728
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "àààà ààà(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "ààà àààà"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "àà ààààààà"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "àààà"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "àààà àà àààààà"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "ààà àààà ààà àààààà àààà"
 
-#: ../filter/e-filter-rule.c:764
-msgid "I_nclude threads"
-msgstr "ààààà ààààà(_n)"
+#: ../filter/e-filter-rule.c:759
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
+msgstr "ààààà àààà(_n):"
 
-#: ../filter/e-filter-rule.c:789
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "àààà ààààà(_d)"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "à ààà"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "ààààà"
 
-#: ../filter/e-rule-editor.c:270
+#: ../filter/e-rule-editor.c:263
 msgid "Add Rule"
 msgstr "àààà àààààà"
 
-#: ../filter/e-rule-editor.c:359
+#: ../filter/e-rule-editor.c:349
 msgid "Edit Rule"
 msgstr "àààà ààà"
 
@@ -7916,7 +8124,7 @@ msgstr "àààà ààà àààà ààà"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "ààà àààà ààà"
 
@@ -8010,32 +8218,160 @@ msgstr "àààà àà ààààà ààààà àà"
 msgid "years"
 msgstr "ààà"
 
-#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
-#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
-#: ../widgets/misc/e-attachment-paned.c:136
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ààà àààà"
+
+#: ../mail/em-account-editor.c:926
+msgid "Never"
+msgstr "ààà àààà"
+
+#: ../mail/em-account-editor.c:927
+msgid "Always"
+msgstr "àààààà"
+
+#: ../mail/em-account-editor.c:928
+msgid "Ask for each message"
+msgstr "àà àààààà àà ààààà"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1786 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ààà àààà"
+
+#: ../mail/em-account-editor.c:2230
+msgid "Mail Configuration"
+msgstr "ààà àààààà"
+
+#: ../mail/em-account-editor.c:2231
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin."
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ààààààà àààà àààààà ààààà àààà àà àààà ààà\n"
+"\n"
+"àààà ààà àà \"àààà àààà\" ààà ààààà"
+
+#: ../mail/em-account-editor.c:2234
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"ààààà àààà ààà ààà à-ààà àààààà ààà ààà ààààà \"àààààà\" àààà ààà àà ààà àààà "
+"àà, àààà ààà àà "
+"ààààà à-ààà àààà àààà ààà àààà ààààààà àààà ààààà àà àà ààààà"
+
+#: ../mail/em-account-editor.c:2236 ../mail/em-account-editor.c:2425
+msgid "Receiving Email"
+msgstr "àààà ààààààà"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Please configure the following account settings."
+msgstr "ààà ààààà àààààà àààààà àà àààààà ààà ààà"
+
+#: ../mail/em-account-editor.c:2239 ../mail/em-account-editor.c:3022
+msgid "Sending Email"
+msgstr "àààà ààààà"
+
+#: ../mail/em-account-editor.c:2240
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"àà ààà àà ààààààà ààà àà, ààà ààààà ààààà àààà ààààà ààààààà ààà àààà ààààà "
+"ààààà àààà àà "
+"ààà àààà ààààà àààààààà ààà àààààààà ààààà ààààààà ààà ààààà àààà"
+
+#: ../mail/em-account-editor.c:2242 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "àààààà ààààààà"
+
+#: ../mail/em-account-editor.c:2243
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"àààà àà àààààà àààà ààààà ààààà ààà ààà ààà\n"
+"àà ààà àààà àààààà àà àà ààààà ààààààà"
+
+#: ../mail/em-account-editor.c:2247
+msgid "Done"
+msgstr "ààààà"
+
+#: ../mail/em-account-editor.c:2248
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"àààààà, ààààà àààà àààààà àààààà àà àà ààà\n"
+"\n"
+"ààà ààààà ààààààà àààà àààà ààà àà àààààà àà àààà ààà\n"
+"\n"
+"àààà àààààà àààà ààà àà \"àààà ààà\" ààààà"
+
+#: ../mail/em-account-editor.c:2784
+msgid "Check for _new messages every"
+msgstr "àààà àààààà àààà àààà àààà ààà(_n)"
+
+#: ../mail/em-account-editor.c:2792
+msgid "minu_tes"
+msgstr "àààà(_t)"
+
+#: ../mail/em-account-editor.c:3365 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "ààààààà"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3419 ../mail/em-account-editor.c:3502
+msgid "Receiving Options"
+msgstr "ààààààà ààà"
+
+#: ../mail/em-account-editor.c:3420 ../mail/em-account-editor.c:3503
+msgid "Checking for New Messages"
+msgstr "àààà àààààààà àà àààà àààà àà àààà àà"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "àààààààà"
 msgstr[1] "àààààààà"
 
-#: ../mail/e-mail-attachment-bar.c:633
-#: ../widgets/misc/e-attachment-paned.c:624
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "ààààà ààà"
 
-#: ../mail/e-mail-attachment-bar.c:635
-#: ../widgets/misc/e-attachment-paned.c:626
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "àààà ààà"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
-#: ../shell/e-shell-window-actions.c:1413
-#: ../shell/e-shell-window-actions.c:1420
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "àà ààààà ààà ààà"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(ààà ààààà àààà)"
 
@@ -8051,16 +8387,80 @@ msgstr "àà àààààà ààà(_T)"
 msgid "_From This Address"
 msgstr "àà àààààà ààà(_F)"
 
+#: ../mail/e-mail-display.c:87
+#| msgid "_Send To..."
+msgid "Send _Reply To..."
+msgstr "...ààà àààà àààà(_R)"
+
 #: ../mail/e-mail-display.c:89
+#| msgid "Send a mail message to this address"
+msgid "Send a reply message to this address"
+msgstr "àà àààààà ààà ààààà àààààà àààà"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "ààà ààààà àààà(_F)"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "àààààà '%s' ààààà àààà ààààààà àà àààà àà"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "àààà àààà àààààà"
+
+#: ../mail/e-mail-folder-utils.c:391
+#| msgid "Checks selected messages for duplicates"
+msgid "Scanning messages for duplicates"
+msgstr "àààààààà àà àààà àààààà ààààà"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "àààààà %d ààà àà àààà àà"
+msgstr[1] "àààààà %d àà àà ààà àà"
+
+#: ../mail/e-mail-folder-utils.c:833
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "ààààà '%s' ààààà àà àààà àà"
+
+#: ../mail/e-mail-folder-utils.c:967
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "àààà \"%s\" àààà àà ààà"
+
+#: ../mail/e-mail-folder-utils.c:971
+#| msgid "File \"%s\" has been removed."
+msgid "File has been removed."
+msgstr "àààà ààà ààààà ààà ààà"
+
+#: ../mail/e-mail-folder-utils.c:1030
+msgid "Removing attachments"
+msgstr "àààààààà àààààà àà ààààà àààààààààà hàààààà àà ààà à"
+
+#: ../mail/e-mail-folder-utils.c:1194
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d àààààà ààààààà àà àààà àà"
+msgstr[1] "%d àààààà àààààà àà ààà àà"
+
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:612
+#, c-format
+#| msgid "Invalid folder: %s"
+msgid "Invalid folder URI '%s'"
+msgstr "ààà ààààà URI '%s'"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "ààà àààààààà àààààààà:"
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "àààà ààà(_L):"
 
@@ -8090,7 +8490,7 @@ msgid "_Later"
 msgstr "àààà 'à(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:616
+#: ../modules/mail/e-mail-shell-view-actions.c:679
 msgid "Add Label"
 msgstr "àààà ààààà"
 
@@ -8098,7 +8498,7 @@ msgstr "àààà ààààà"
 msgid "Edit Label"
 msgstr "àààà ààà"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8106,702 +8506,652 @@ msgstr ""
 "ààà: àààà ààà àààà ààààà àààà ààà àààà àààà ààààààà\n"
 "àààààààà ààààà"
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "ààà"
 
-#: ../mail/e-mail-label-tree-view.c:96
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1297
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1295
+#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "ààà"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
-#: ../modules/mail/e-mail-shell-view-private.c:1099
-#: ../modules/mail/e-mail-shell-view-private.c:1110
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:717
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "ààà-àààà"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
-#: ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "ààààà"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "àààà-àààà"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
-#: ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:725
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "àààà"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
+#: ../plugins/templates/templates.c:1293
 msgid "Templates"
 msgstr "àààààà"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "ààààààà àààà àà àààà àà..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "ààààààà"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ààà ààààààà àààà àà àààà àà:"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "ààààà ààààààà àààà àà ààà àà"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:723
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ààààààà àààà-àààà ààààà àà ààààà àààààà ààààààà à.àà àààà SQLite àà ààààà àà àà ààà\n"
+"ààààààà àààà-àààà ààààà àà ààààà àààààà ààààààà à.àà àààà SQLite àà ààààà àà "
+"àà ààà\n"
 "\n"
 "àààààààà àààà àààààà ààààà ààààààà ààà ààà ààà àààà àà..."
 
-#: ../mail/e-mail-migrate.c:1147
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "`%s' àààà ààà àààà ààààà ààààà àààà àààààà: %s"
 
 #  FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/e-mail-notebook-view.c:565
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "ààààà àààà àà"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "ààààà ààà àà àààààà"
-
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ààààà àààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "àààà ààà(_o)"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:510
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] "ààààà '%s' àààà %d àààààààà àààààà ààà àà ààààà àà ààà àààààà ààààààà àà?"
-msgstr[1] "ààààà '%s' àààà %d àààààààà àààààà ààà àà ààààà àààààà ààà àààààà ààààààà àà?"
-
-#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "àààà(_M)"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "ààààà ààà àà ààààà(_D)à"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "àààààà àààà àà àààà ààà: àààààà ààààààà(_A)"
 
-#: ../mail/e-mail-reader.c:1558
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "àààààà àààààà"
-msgstr[1] "àààààà àààààà"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1579
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "àààààà"
-msgstr[1] "àààààà"
-
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "àààà àààà àààààà àààà àààà ààààà ààà(_d)"
 
-#: ../mail/e-mail-reader.c:1855
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "àààà àààà àààààà-àààà àààà ààààà ààà"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "ààà àà àààà(_J)"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "àààà àààààà ààààà ààààà àà ààààà"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "ààààà àààà àààà(_C)..."
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "àààà ààààà ààà ààà ààà ààààà àààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "àààààà àààà(_D)"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "àààà ààààààà ààà ààààà àà àààà"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "àààààà àààà àààà ààààà(_L)..."
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "àààààà àààà ààà ààààààà àààààà ààà ààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "àààààààà àà ààààà(_R)..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ààààà àààààà ààà àààààà ààà àààààà ààà ààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "àààà àààààà àà ààààà(_n)..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "ààààà àààà àààà àà àààààà ààààà ààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "àààà 'àà ààààà(_S)..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "àà àààà ààà ààààààà àààààà ààà ààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "ààààà àààà(_p)"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "àààà àààààààà àà ààààà àààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "àààààà 'à ààà(_F)..."
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "àààà ààà àààààà àààà ààààà àà ààà"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "ààààà àààà(_C)"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "àààà àààààààà ààà àààà-àààà àààààà àààà"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "ààààà ààààà (_F)"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "àààà àààààà àà àààà ààà àà àààà-àààà àààààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "àààà àààààà(_U)..."
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "àààà àààà àà àààà àààààà ààààààààà"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "àààà(_A)"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "àààà àààààà ààà àààà àààà àààà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "àààà àààà àààà àààà(_A)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "àààà àààà(_I)"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "àààà àààààà ààà àààà àààààà àà àààà àààà ààà àààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "àààààà àààà àààà àààà(_I)"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "ààààà(_Q)"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "àààà àààààà àààà ààà ààààà ààà àààà àà àààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "ààààà àààà àààà(_Q)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "ààààà ààà(_L)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ààà àààà àààààà ààà ààà àà ààààà ààà"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "ààà(_I)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "àààà àààààà ààà ààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "ààà(_J)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "àààà àààààà ààà ààà àààà ààààààààà"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "ààà àààà(_N)"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "àààà àààààààà ààà ààà-àààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "ààààà(_R)"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "àààà ààààààà ààà ààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "àà-ààà(_m)"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "àààà àààààà ààà àà-àààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "àà-ààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "àààà àààààààà ààà àà-ààààà ààààààààà ààà"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "àààà àààààà àààà ààà(_E)..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "àààà àààààà ààà àà ààààà (ààààààà) àààà àààààà"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "àààà àààààà àààà(_N)"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "àààà àààààà àààà àà ààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "àààà ààààà 'à àààààà(_O)"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "àààà àààààà àààà ààààà àààà àààààà"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "ààààà àààà àààà(_M)..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "àààà àààààà ààà ààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "ààààà àààà ààà(_S)"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "àààààà ààààà àààà"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "àààà ààà àààà ààà(_n)"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "àààà ààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "ààààà ààà àààà ààà(_p)"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "ààààà ààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "àààààà ààà ààà ààà(_o)"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "àààààà ààà ààà ààà"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "àààà àààààà(_N)"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "àààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "àààà ààà àààààà(_I)"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "àààà ààààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "àààà àààà(_T)"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "àààà àà-àààààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "àààà àà-àààààà àààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "àààà àà-àààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "ààààà àààààà(_P)"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "ààààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ààà àààààà ààààà(_e)"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "ààààà ààààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2133
-#| msgid "_Previous Message"
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "ààààà ààààà(_h)"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "ààààà ààààà àààààààààà ààààààà ààààà à"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "ààààà àà-àààààà àààààà(_r)"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "ààààà àà-àààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "àà àààààà ààààà ààà"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "ààààà àààà ààà àààà àààààà àà ààà"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "àààà(_d)"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "àààà àààààà àààà ààà àà-àààààà ààà"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "àààààààà àààà(_v)àààààààà àààà(_ve Attachment"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "àààààààà àààààà"
 
-#: ../mail/e-mail-reader.c:2175
-#| msgid "Hide S_elected Messages"
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "àààààààà àààààà àààà(_p)"
 
-#: ../mail/e-mail-reader.c:2177
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "àààààààà àà àààà àààààààà àààà àààà ààà"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "àà ààà àààà(_A)"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "àààà àààààà àà àààà àààààà ààà àààààà àà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "àààà ààà àààà(_L)"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "àààà àààààà àà àààààà àààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "àààà àààà ààà àààà(_R)"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "àààà àààààà àà àààà àààà àà ààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "mbox àààà àààààà(_S)..."
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "àààà àààààààà ààà mbox àààà àààà àààààà"
 
-#: ../mail/e-mail-reader.c:2210
-msgid "Search Folder from Mailing _List..."
-msgstr "àààààà àààà ààà ààà ààààà(_L)..."
-
-#: ../mail/e-mail-reader.c:2212
-msgid "Create a search folder for this mailing list"
-msgstr "àà àààààà àààà ààà ààà ààà àààà"
-
-#: ../mail/e-mail-reader.c:2217
-msgid "Search Folder from Recipien_ts..."
-msgstr "ààààà àààà ààà ààà ààààà(_t)..."
-
-#: ../mail/e-mail-reader.c:2219
-msgid "Create a search folder for these recipients"
-msgstr "ààààà àààààààà ààà ààà ààà ààààà àààà"
-
-#: ../mail/e-mail-reader.c:2224
-msgid "Search Folder from Sen_der..."
-msgstr "àààà àààà ààà ààà ààààà(_d)..."
-
-#: ../mail/e-mail-reader.c:2226
-msgid "Create a search folder for this sender"
-msgstr "àà àààà àààà ààà ààà ààà àààà"
-
-#: ../mail/e-mail-reader.c:2231
-msgid "Search Folder from S_ubject..."
-msgstr "àààà ààà ààà ààààà(_u)..."
-
-#: ../mail/e-mail-reader.c:2233
-msgid "Create a search folder for this subject"
-msgstr "àà àààà àà ààà ààà ààààà àààà"
-
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "àààààà àààà(_M)"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "àààààà àà àà-àààà à-ààà àààà ààààà"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "àà-ààààà àààààà(_U)"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "àààà àààààà àà-àààà àààà"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "àà àààà(_N)"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "ààààà ààà àààà àààà àààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "àààà àààà(_Z)"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "ààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "àààà àààà(_O)"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "ààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "àààà àààà(_u)"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "àààà àààààààà(_A)"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "àààà àààà àà àààà(_O)"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "ààààà àààà(_G)"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "ààà(_G)"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "ààààààààà(_k)"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "àààààà(_M)"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "àààà(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "àààààà àààà ààà ààà ààààà(_L)..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "àà àààààà àààà ààà ààà ààà àààà"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "ààààà àààà ààà ààà ààààà(_t)..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "ààààà àààààààà ààà ààà ààà ààààà àààà"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "àààà àààà ààà ààà ààààà(_d)..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "àà àààà àààà ààà ààà ààà àààà"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "àààà ààà ààà ààààà(_u)..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "àà àààà àà ààà ààà ààààà àààà"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "ààààà ààà àà àààààààà(_w)..."
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "ààà àà ààààà àààà(_I)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "àààà àà ààààà àààà(_J)"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "àààà àààà àà ààààà àààà(_N)"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "ààààà àà ààààà àààà(_k)"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "àà-ààà ààààààààà àààà(_m)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "àà-ààààà àà ààààà àààà(_U)"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "àààà-àààà ààà(_C)"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "àààà ààà àààààà àààà àààà ààààà ààààà"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "àà àààààà ààààà(_H)"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "àààààà àà à-ààà ààààààà ààà ààààà"
 
-#: ../mail/e-mail-reader.c:2670
-msgid "Unable to retrieve message"
-msgstr "àààààà àààààà ààà àà àààà"
-
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "àààààà '%s' àààààà àààà àà àààà àà"
@@ -8809,295 +9159,193 @@ msgstr "àààààà '%s' àààààà àààà àà ààà
 #  default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "àààààà"
 
-#: ../mail/e-mail-reader.c:3524
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "àààà àààà(_F)"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "àààà àààààà àààà àààà"
 
-#: ../mail/e-mail-reader.c:3544
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "ààààà àààà"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "àààààà àààà ààà àààà ààà àà àààààà-ààààààà ààà"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:744
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "àààà"
 
-#: ../mail/e-mail-reader.c:3623
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
-#: ../widgets/misc/e-calendar.c:196
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "àààà"
 
-#: ../mail/e-mail-reader.c:3627
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../widgets/misc/e-calendar.c:172
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ààààà"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "àààà"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "'%s' ààààà"
 
-#: ../mail/e-mail-session.c:647
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s àà ààà àààà"
-
-#: ../mail/e-mail-session.c:649
-msgid "Enter Passphrase"
-msgstr "ààà àààà"
+#: ../mail/e-mail-reader-utils.c:145
+#| msgid "Do not ask me again"
+msgid "Do not warn me again"
+msgstr "ààààà ààààààà àà ààààà"
 
-#: ../mail/e-mail-session.c:652
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:669
 #, c-format
-msgid "Enter Password for %s"
-msgstr "%s àà àààààà ààà"
-
-#: ../mail/e-mail-session.c:654
-msgid "Enter Password"
-msgstr "àààààà ààà"
+#| msgid ""
+#| "Folder '%s' contains %d duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#| "delete them?"
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"ààààà '%s' àààà %u àààààààà àààààà ààà àà ààààà àà ààà àààààà ààààààà àà?"
+msgstr[1] ""
+"ààààà '%s' àààà %u àààààààà àààààà ààà àà ààààà àààààà ààà àààààà ààààààà àà?"
 
-#: ../mail/e-mail-session.c:702
-#, c-format
+#: ../mail/e-mail-reader-utils.c:1046
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "àààààà àààààà"
+msgstr[1] "àààààà àààààà"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1067
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "àààààà"
+msgstr[1] "àààààà"
+
+#: ../mail/e-mail-session.c:863
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "%s àà ààà àààà"
+
+#: ../mail/e-mail-session.c:867
+msgid "Enter Passphrase"
+msgstr "ààà àààà"
+
+#: ../mail/e-mail-session.c:871
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s àà àààààà ààà"
+
+#: ../mail/e-mail-session.c:875
+msgid "Enter Password"
+msgstr "àààààà ààà"
+
+#: ../mail/e-mail-session.c:926
+#, c-format
 msgid "User canceled operation."
 msgstr "ààààà àà àààààà ààà ààààà"
 
-#: ../mail/e-mail-session.c:870
+#: ../mail/e-mail-session.c:1039
 #, c-format
-msgid "No destination address provided, forward of the message has been cancelled."
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr "ààà àààààà àààààà àààà ààààà ààà,  àààààà àà àààà ààààà ààà ààààà"
 
-#: ../mail/e-mail-session.c:879
+#: ../mail/e-mail-session.c:1048
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "àààà àà ààà àààààà àààà ààààà, àààààà àààà àààà ààà ààà àààà àààà"
 
-#: ../mail/e-mail-session.c:1268 ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "ààààà '%s' ààààààà àà àààà àà"
-
-#: ../mail/e-mail-session.c:1284
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Invalid folder: %s"
-msgstr "ààà ààààà: '%s'"
+#| msgid "Expunging and storing account '%s'"
+msgid "Cannot get transport for account '%s'"
+msgstr "àààààà '%s' àà ààààààààà àààà ààà àà àààà"
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ààààà ààààà àààà ààà ààà ààààà: %s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
 "%s àààà ààààà ààà àààà ààààà: %s\n"
-"àà àà àààà àààà`àààà (Sent)' ààààà ààààà àààà àà ààà ààà"
+"àà àà àààà àààà 'àààà (Sent)' ààààà ààààà àààà àà ààà ààà"
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "àààà `àààà (Sent)' ààààà ààààà ààà àààà ààààà: %s"
+msgstr "àààà 'àààà (Sent)' ààààà ààààà ààà àààà ààààà: %s"
 
-#: ../mail/e-mail-session-utils.c:765 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "àààààà ààààà àà àààà àà"
 
-#: ../mail/e-mail-session-utils.c:836
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
-#| msgid "Unsubscribing from folder \"%s\""
 msgid "Unsubscribing from folder '%s'"
 msgstr "ààààà '%s' ààà àààààà àààà àà ààà àà"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ààààà ààà-àààààààà àààà ààààà àà"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' ààà ààà àààààà àààà àà àààà àà"
 
-#: ../mail/e-mail-tag-editor.c:295
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "àààààà àà àààààà '%s' àààà àààà àà àààà àà"
+
+#: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "ààààà àà ààààà"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "ààà àààààààààà àààà"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:124
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS àààààààààà"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:575 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL àààààààààà"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ààà àààà"
-
-#: ../mail/em-account-editor.c:924
-msgid "Never"
-msgstr "ààà àààà"
-
-#: ../mail/em-account-editor.c:925
-msgid "Always"
-msgstr "àààààà"
-
-#: ../mail/em-account-editor.c:926
-msgid "Ask for each message"
-msgstr "àà àààààà àà ààààà"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ààà àààà"
-
-#: ../mail/em-account-editor.c:2092
-msgid "Mail Configuration"
-msgstr "ààà àààààà"
-
-#: ../mail/em-account-editor.c:2093
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ààààààà àààà àààààà ààààà àààà àà àààà ààà\n"
-"\n"
-"àààà ààà àà \"àààà\" ààààà"
-
-#: ../mail/em-account-editor.c:2096
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"ààààà àààà ààà ààà à-ààà àààààà ààà ààà ààààà \"àààààà\" àààà ààà àà ààà àààà àà, àààà ààà àà "
-"ààààà à-ààà àààà àààà ààà àààà ààààààà àààà ààààà àà àà ààààà"
-
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2260
-msgid "Receiving Email"
-msgstr "àààà ààààààà"
-
-#: ../mail/em-account-editor.c:2099
-msgid "Please configure the following account settings."
-msgstr "ààà ààààà àààààà àààààà àà àààààà ààà ààà"
-
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
-msgid "Sending Email"
-msgstr "àààà ààààà"
-
-#: ../mail/em-account-editor.c:2102
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"àà ààà àà ààààààà ààà àà, ààà ààààà ààààà àààà ààààà ààààààà ààà àààà ààààà ààààà àààà àà "
-"ààà àààà ààààà àààààààà ààà àààààààà ààààà ààààààà ààà ààààà àààà"
-
-#: ../mail/em-account-editor.c:2104
-msgid "Account Management"
-msgstr "àààààà ààààà"
-
-#: ../mail/em-account-editor.c:2105
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"àààà ààààà ààà àààà àà àààààà àààà àààà àààà ààààààà ààà ààà àà ààà àààà \n"
-"àààààà àà àà àààà ààààààà"
-
-#: ../mail/em-account-editor.c:2109
-msgid "Done"
-msgstr "ààààà"
-
-#: ../mail/em-account-editor.c:2110
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"àààààà, ààààà àààà àààààà àààààà àà àà ààà\n"
-"\n"
-"ààà ààààà ààààààà àààà àààà ààà àà àààààà àà àààà ààà\n"
-"\n"
-"àààà àààààà àààà ààà àà \"àààà ààà\" ààààà"
-
-#: ../mail/em-account-editor.c:2573
-msgid "Check for _new messages every"
-msgstr "àààà àààààà àààà àààà àààà ààà(_n)"
-
-#: ../mail/em-account-editor.c:2581
-msgid "minu_tes"
-msgstr "àààà(_t)"
-
-#: ../mail/em-account-editor.c:2863
-msgid "Please select a folder from the current account."
-msgstr "àààààà àààààà ààà ààààà àààà ààà"
-
-#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "ààààààà"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
-msgid "Receiving Options"
-msgstr "ààààààà ààà"
-
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
-msgid "Checking for New Messages"
-msgstr "àààà àààààààà àà àààà àààà àà àààà àà"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1136
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9105,35 +9353,36 @@ msgstr ""
 "${AbbrevWeekdayName} , ${Day}-${Month}-${Year}, ${24Hour}:${Minute} ààà "
 "${TimeZone}, ${Sender} àà ààààà:"
 
-#: ../mail/em-composer-utils.c:1146
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 msgstr "--------àààà àààààà--------"
 
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1804
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../mail/em-composer-utils.c:1985
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "àààààà %s ààà àààààà \"%s\" àààà, àà %s ààà ààààà àà, àààààà àà àààààà ààà"
+msgstr ""
+"àààààà %s ààà àààààà \"%s\" àààà, àà %s ààà ààààà àà, àààààà àà àààààà ààà"
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1854
+#: ../mail/em-composer-utils.c:2044
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ààà ààààààààààà ààààààààà: \"%s\""
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2567
 msgid "an unknown sender"
 msgstr "ààààà àààà àààà"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2972
 msgid "Posting destination"
 msgstr "àààà àààààà"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2973
 msgid "Choose folders to post the message to."
 msgstr "àààààà àààà àà ààààà àààà"
 
-#: ../mail/em-filter-folder-element.c:337
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "ààààà àààà"
 
@@ -9251,7 +9500,7 @@ msgstr "àààà àààà àà"
 msgid "is set"
 msgstr "àààà àà"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ààà"
 
@@ -9300,7 +9549,7 @@ msgid "Play Sound"
 msgstr "àààà àààà"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "ààààà"
 
@@ -9381,335 +9630,355 @@ msgid "Unset Status"
 msgstr "àààà àà-àààà"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:539
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "àà"
 
-#: ../mail/em-filter-rule.c:570
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "ààààà ààààà(_t)"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "àà ààààà àààààà:"
 msgstr[1] "àà ààààà àààààà:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "àààà àààààà:"
 msgstr[1] "àààà àààààà:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "àààà (%s) àààà àà:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "àààà ààààà"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "ààààà ààààààà"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<ààààà àààà àà ààà ààààà ààà>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "àààà(_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "ààààà ààà(_n):"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
-msgid "Search Folders"
-msgstr "ààà ààààà"
-
-#  UNMATCHED is always last
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
-msgid "UNMATCHED"
-msgstr "àà-ààààà"
-
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
-msgid "Loading..."
-msgstr "ààà àààà àà àààà àà...."
-
-#: ../mail/em-folder-tree.c:201
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" àààà ààààà àà àààà àààà àà ààà àà"
-
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:664
 msgid "Folder names cannot contain '/'"
 msgstr "ààààà ààà àààà \"/\" àààà ààà àààà"
 
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:784
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%Iu%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1606
 msgid "Mail Folder Tree"
 msgstr "àààà ààààà ààà"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "ààààà %s ààààà àà àààà àà"
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2088 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "ààààà %s àààà àààà àà àààà àà"
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:2095 ../mail/message-list.c:2212
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "àààààààà ààà %s ààààà àààà ààààà àà àààà àà"
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:2099 ../mail/message-list.c:2214
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "àààààà ààààà %s àààà àààà àààà àà ààà àà"
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:2118
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ààààà ààààà ààà àààààà ààààà àààà àà àààà àà"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
+#: ../mail/mail-vfolder.c:1121 ../mail/mail-vfolder.c:1235
+msgid "Search Folders"
+msgstr "ààà ààààà"
+
+#  UNMATCHED is always last
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
+msgid "UNMATCHED"
+msgstr "àà-ààààà"
+
+#: ../mail/em-folder-tree-model.c:787 ../mail/em-folder-tree-model.c:1072
+msgid "Loading..."
+msgstr "ààà àààà àà àààà àà...."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "ààààà àààà àààà"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "ààààà àààà àààà ààà"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "'%s' ààààà ààààà àà àààà àà"
-
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:589
 msgid "Create Folder"
 msgstr "ààààà àààà"
 
-#: ../mail/em-folder-utils.c:746
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:590
 msgid "Specify where to create the folder:"
 msgstr "àààà àà ààààà ààààà ààààà àààà:"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "àààààà ààà àààààà àààà àà àààà àà"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "àààààà àààààà àààà àà àààà àà..."
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "'%s' ààà àà àààà àà"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "àà-ààààà"
 
-#: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "àà àààààà ààààà ààà àààà ààà àà àà ààà àààààà àààà àà àà àààààà àààà ààà"
-
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "àààà ààààà"
 
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "àà àààààà ààààà ààà àà ààà àààà àààà àà àà, àà àà àààààààà àààà ààààà ààà"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "ààà ààààà"
 
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr "àà àààààà àà ààààà ààààà àààà àà, àà ààààà ààààà àà ààààà àà àà ààààà ààà"
-
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "ààààà ààà àà, àà àààà àààà àààà àààà àààà"
 
-#: ../mail/em-format-html-display.c:91
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr "àà àààààà àà ààààà ààà àààà àà, àà àà àà àààà àààà ààà àààààà àààà àà àààà ààà"
-
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "ààààà ààààà àà, àà ààààà ààààà àààààà àà"
 
-#: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "àà àààààà àà ààààà ààà àà, àà àààààà ààààà àà ààà àààààà ààààà"
-
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "àà-ààààààààà"
 
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr "àà àààààà ààààààààà àààà àà àà àà ààà ààà àààààààà àà ààààà ààààà àààà àà àààà ààà"
-
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "ààààààààà, àààà"
 
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"àà àààààà ààààààààà àà ààà àà àà àààà ààààààààà ààààà ààà ààà àà àààààà ààà ààà àààà àààà àààà "
-"àààà àà ààààà àààààà àààà àààà ààà ààà àà, àà ààààà àààà ààà"
-
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "ààààààààà"
 
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr "àà àààààà ààààààààà àà, àà àààààà àà àààà ààà ààà àààààà ààààà àààà àààà ààààààà"
-
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "àààààààà, ààà"
 
-#: ../mail/em-format-html-display.c:102
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"àà àààààà ààààààààà àà ààà àà àà ààà ààààààààà ààààà ààà ààà àà àààààà àà ààààà ààà ààà àààà àààà "
-"àààà àààà àà ààààà àààààà àààà ààààà ààà ààà"
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "ààààà ààààà-àààà àààà"
 
-#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
-msgid "_View Certificate"
-msgstr "ààààààààà àààà(_V)"
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "àààààà ààààà-ààà"
 
-#: ../mail/em-format-html-display.c:251
-msgid "This certificate is not viewable"
-msgstr "àà ààààààààà ààààààà àààà àà"
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP àààà (%s) àà ààààààà"
 
-#: ../mail/em-format-html-display.c:506
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"àààààààà àà à-ààà ààà àààà àààà àà àààà, àààààà àà àààà àààà ààà ààààà àà ààà ààààà àààààà ààà "
-"àààà àà ààà ààààà ààààà ààààà ààà ààà àààà ààà"
+#: ../mail/em-format-html.c:2172
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "àààà àààà (%s) àà àààà %s àà àà ààààààà"
 
-#: ../mail/em-format-html-display.c:749
-msgid "Completed on"
-msgstr "ààààà "
+#: ../mail/em-format-html.c:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "àààà àààà (%s) àà ààààààà"
 
-#: ../mail/em-format-html-display.c:757
-msgid "Overdue:"
-msgstr "àààà ààààà:"
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ààààà àààà (%s) àà ààààààà"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:761
-msgid "by"
-msgstr "ààà"
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "àààààà ààààà àààà (\"%s\" àààà) àà ààààààà"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
-msgid "View _Unformatted"
-msgstr "ààà-àààààà àààà(_U)"
-
-#: ../mail/em-format-html-display.c:980
-msgid "Hide _Unformatted"
-msgstr "ààà-àààààà àààà(_U)"
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "àààà: %s"
 
-#: ../mail/em-format-html-display.c:1045
-msgid "O_pen With"
-msgstr "àà ààà àààààà(_p)"
+#: ../mail/em-format-html.c:2937
+#| msgid "(No Subject)"
+msgid "(no subject)"
+msgstr "(ààààà àààà)"
 
-#: ../mail/em-format-html-print.c:176
+#: ../mail/em-format-html.c:3013
 #, c-format
-msgid "Page %d of %d"
-msgstr "%2$d àààààà %1$d àààà"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "àà àààààà %s àààà %s àà ààà àààà ààààà ààà àà"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "àààààà ààà àààààà àààà àà àààà àà"
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"àà àààààà ààààà ààà àààà ààà àà àà ààà àààààà àààà àà àà àààààà àààà ààà"
 
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr "àààààà àààààà àààà àà àààà àà..."
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"àà àààààà ààààà ààà àà ààà àààà àààà àà àà, àà àà àààààààà àààà ààààà ààà"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "'%s' ààà àà àààà àà"
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"àà àààààà àà ààààà ààààà àààà àà, àà ààààà ààààà àà ààààà àà àà ààààà ààà"
 
-#: ../mail/em-format-html.c:1979
-msgid "Unknown external-body part."
-msgstr "ààààà ààààà-àààà àààà"
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"àà àààààà àà ààààà ààà àààà àà, àà àà àà àààà àààà ààà àààààà àààà àà àààà ààà"
 
-#: ../mail/em-format-html.c:1987
-msgid "Malformed external-body part."
-msgstr "àààààà ààààà-ààà"
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "àà àààààà àà ààààà ààà àà, àà àààààà ààààà àà ààà àààààà ààààà"
 
-#: ../mail/em-format-html.c:2017
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP àààà (%s) àà ààààààà"
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"àà àààààà ààààààààà àààà àà àà àà ààà ààà àààààààà àà ààààà ààààà àààà àà "
+"àààà ààà"
 
-#: ../mail/em-format-html.c:2028
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "àààà àààà (%s) àà àààà %s àà àà ààààààà"
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"àà àààààà ààààààààà àà ààà àà àà àààà ààààààààà ààààà ààà ààà àà àààààà ààà "
+"ààà àààà àààà àààà "
+"àààà àà ààààà àààààà àààà àààà ààà ààà àà, àà ààààà àààà ààà"
 
-#: ../mail/em-format-html.c:2030
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "àààà àààà (%s) àà ààààààà"
+#: ../mail/em-format-html-display.c:102
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"àà àààààà ààààààààà àà, àà àààààà àà àààà ààà ààà àààààà ààààà àààà àààà "
+"ààààààà"
 
-#: ../mail/em-format-html.c:2051
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ààààà àààà (%s) àà ààààààà"
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"àà àààààà ààààààààà àà ààà àà àà ààà ààààààààà ààààà ààà ààà àà àààààà àà "
+"ààààà ààà ààà àààà àààà "
+"àààà àààà àà ààààà àààààà àààà ààààà ààà ààà"
 
-#: ../mail/em-format-html.c:2062
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "àààààà ààààà àààà (\"%s\" àààà) àà ààààààà"
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "ààààààààà àààà(_V)"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "àà ààààààààà ààààààà àààà àà"
+
+#: ../mail/em-format-html-display.c:556
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"àààààààà àà à-ààà ààà àààà àààà àà àààà, àààààà àà àààà àààà ààà ààààà àà ààà "
+"ààààà àààààà ààà "
+"àààà àà ààà ààààà ààààà ààààà ààà ààà àààà ààà"
+
+#: ../mail/em-format-html-display.c:746
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "ààààà àààààà"
+
+#: ../mail/em-format-html-display.c:794
+#| msgid "Save as..."
+msgid "Save _Image..."
+msgstr "ààààà ààà àààààà(_I)..."
+
+#: ../mail/em-format-html-display.c:796
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "ààààà ààà àààà àààà àààààà"
+
+#: ../mail/em-format-html-display.c:1024
+msgid "Completed on"
+msgstr "ààààà "
+
+#: ../mail/em-format-html-display.c:1036
+msgid "Overdue:"
+msgstr "àààà ààààà:"
+
+#: ../mail/em-format-html-display.c:1044
+msgid "by"
+msgstr "ààà"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2768
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
+msgid "View _Unformatted"
+msgstr "ààà-àààààà àààà(_U)"
+
+#: ../mail/em-format-html-display.c:1322
+msgid "Hide _Unformatted"
+msgstr "ààà-àààààà àààà(_U)"
+
+#: ../mail/em-format-html-display.c:1387
+msgid "O_pen With"
+msgstr "àà ààà àààààà(_p)"
+
+#: ../mail/em-format-html-print.c:176
 #, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "àà àààààà %s àààà %s àà ààà àààà ààààà ààà àà"
+msgid "Page %d of %d"
+msgstr "%2$d àààààà %1$d àààà"
 
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
@@ -9717,62 +9986,63 @@ msgstr "àà àààààà %s àààà %s àà ààà ààà
 msgid "No HTML stream available"
 msgstr "ààà HTML ààààà àààààà àààà"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1142
 msgid "Folder Subscriptions"
 msgstr "ààààà àààààà"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1181
 msgid "_Account:"
 msgstr "àààààà(_A):"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1196
 msgid "Clear Search"
 msgstr "ààà àààà ààà"
 
-#: ../mail/em-subscription-editor.c:1179
-#| msgid "S_how only items containing:"
+#: ../mail/em-subscription-editor.c:1214
 msgid "Sho_w items that contain:"
 msgstr "àààààà àààà àààà àààà(_w):"
 
-#: ../mail/em-subscription-editor.c:1218
+#: ../mail/em-subscription-editor.c:1253
 msgid "Subscribe to the selected folder"
-msgstr "àààà ààààà àà ààààà ààààààà ààààà àà ààààà ààààààà ààààà àààà ààààà ààà àààààà "
+msgstr ""
+"àààà ààààà àà ààààà ààààààà ààààà àà ààààà ààààààà ààààà àààà ààààà ààà "
+"àààààà "
 
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1254
 msgid "Su_bscribe"
 msgstr "ààààà ààà(_b)"
 
-#: ../mail/em-subscription-editor.c:1230
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../mail/em-subscription-editor.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Unsubscribe from the selected folder"
 msgstr "àààà ààààà ààà ààààà àààà"
 
-#: ../mail/em-subscription-editor.c:1231
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../mail/em-subscription-editor.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Unsubscribe"
 msgstr "àààààà àààà(_U)"
 
-#: ../mail/em-subscription-editor.c:1242
+#: ../mail/em-subscription-editor.c:1277
 msgid "Collapse all folders"
 msgstr "àà ààààà ààààà"
 
-#: ../mail/em-subscription-editor.c:1243
+#: ../mail/em-subscription-editor.c:1278
 msgid "C_ollapse All"
 msgstr "àà ààààà(_o)"
 
-#: ../mail/em-subscription-editor.c:1253
+#: ../mail/em-subscription-editor.c:1288
 msgid "Expand all folders"
 msgstr "àà ààààà ààààà"
 
-#: ../mail/em-subscription-editor.c:1254
+#: ../mail/em-subscription-editor.c:1289
 msgid "E_xpand All"
 msgstr "àà ààààà(_x)"
 
-#: ../mail/em-subscription-editor.c:1264
+#: ../mail/em-subscription-editor.c:1299
 msgid "Refresh the folder list"
 msgstr "ààààà àààà ààààà àààà"
 
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1311
 msgid "Stop the current operation"
 msgstr "àààààà àààààà àààààààààà àààà"
 
@@ -9780,23 +10050,23 @@ msgstr "àààààà àààààà àààààààààà à
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "àà ààààà %d àààààà ààà àààà àà ààààààà ààààààà àà?"
 msgstr[1] "àà ààààà %d àààààà ààà àààà àà ààààààà ààààààà àà?"
 
-#: ../mail/em-utils.c:153
+#: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "àà àààààà ààà àà ààààà(_D)à"
 
-#: ../mail/em-utils.c:327
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "àààààà ààààà"
 
-#: ../mail/em-utils.c:883
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ààà àààààà"
@@ -9805,7 +10075,7 @@ msgstr "%s ààà àààààà"
 msgid "Search _Folders"
 msgstr "ààà ààààà(_F)"
 
-#: ../mail/em-vfolder-rule.c:603
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "ààààà ààààà"
 
@@ -9822,17 +10092,14 @@ msgid "\"Filter Editor\" window width"
 msgstr "\"ààààà ààààà\" ààààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#| msgid "\"Filter Editor\" window height"
 msgid "\"Folder Subscriptions\" window height"
 msgstr "\"ààààà àààààà\" ààààà àààà"
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#| msgid "\"Filter Editor\" window maximize state"
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "\"ààààà àààààà\" ààààà àààà-ààà àààà"
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#| msgid "\"Filter Editor\" window width"
 msgid "\"Folder Subscriptions\" window width"
 msgstr "\"ààààà àààààà\" ààààà ààààà"
 
@@ -9865,7 +10132,7 @@ msgid "Always request read receipt"
 msgstr "ààààà àààà àà àààààà ààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "àààà àààà àààà àààà ààà ààààà ààà àà àààà ààààààà ààààà"
 
@@ -9874,11 +10141,11 @@ msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
 msgstr ""
-"àààà ààààà àààà ààààà àààà àààà ààààà ààà àààà ààààà àààààà àààààà àà àààà àààà ààà àààààà ààààà ààà ààà "
-"ààà àààà ààààà"
+"àààà ààààà àààà ààààà àààà àààà ààààà ààà àààà ààààà àààààà àààààà àà àààà "
+"àààà ààà àààààà ààààà ààà "
+"ààà ààà àààà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:16
-#| msgid "Attached message"
 msgid "Attribute message."
 msgstr "ààà àààààà ààà"
 
@@ -9891,12 +10158,10 @@ msgid "Automatic link recognition"
 msgstr "àààààààà àààà àààà"
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
 msgstr "àà ààààà àààààà àààà àààà àààààààà àà àààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
 msgstr "ààààà ààà àààà àààà àààààààà àà àààà ààà"
 
@@ -9932,14 +10197,16 @@ msgstr "TO/CC/BCC àààà àààà àààààà ààààà"
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "TO/CC/B_CC àààà àààààà ààààà àààà ààààà àààààà àààààà àààà àààààà àààààà"
+msgstr ""
+"TO/CC/B_CC àààà àààààà ààààà àààà ààààà àààààà àààààà àààà àààààà àààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
-"àààààà, ààà ààààà ààà ààààà ààààà ààààà ààà àààà ààà àààààà àààà àààà àààààààààà-ààà 30 "
+"àààààà, ààà ààààà ààà ààààà ààààà ààààà ààà àààà ààà àààààà àààà àààà "
+"àààààààààà-ààà 30 "
 "ààààà àààà àààààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:30
@@ -9951,7 +10218,8 @@ msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"ààà àà àààà ààà àà ààààà àààà ààààà ààààààà àààààà àààà àààààà \"headername=value\" "
+"ààà àà àààà ààà àà ààààà àààà ààààà ààààààà àààààà àààà àààààà "
+"\"headername=value\" "
 "àààààà àà àààà àà ààà 'à ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:32
@@ -10004,285 +10272,310 @@ msgstr "ààà ààààààà ààààà àà ààààà
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
-msgstr "àààà àà àà ààà àààààààà àà àààààà àààà àààà  àààààà-àààà 'à àà àààà àààà"
+msgstr ""
+"àààà àà àà ààà àààààààà àà àààààà àààà àààà  àààààà-àààà 'à àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "àààà àà àà àààà àààà àààà àààààà-àààà 'à ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"ààà àààà àà àà àà àààà àààà àààà àà àààààà àààà àààà ààààà ààà àà ààààà ààà àà ààà àààà "
-"ààààààà àà àààà àààà ààààà àà, àà àà ààà-àààà àà àààà ààà àà àààà àà àààà àà, àà ààààà ààààà "
+"ààà àààà àà àà àà àààà àààà àààà àà àààààà àààà àààà ààààà ààà àà ààààà ààà "
+"àà ààà àààà "
+"ààààààà àà àààà àààà ààààà àà, àà àà ààà-àààà àà àààà ààà àà àààà àà àààà àà, "
+"àà ààààà ààààà "
 "àààà (LDAP àààà) ààà ààà-àààà àà àààà àààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "àààà àà ààà àà àààà ààà àààà ààààààà ààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
-"àà ààà àààà ààà àà àààà ààààà ààààà àààààà ààà àà àà ààà àààà ààà ààà ààààà àà ààààààà "
+"àà ààà àààà ààà àà àààà ààààà ààààà àààààà ààà àà àà ààà àààà ààà ààà ààààà "
+"àà ààààààà "
 "ààà ààà àà ààà àààà ààà àà ààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"àà àààààà ààà àààà \"àààààà\" àààà àààà \"àààà\" ààà \"ààààà\" àààààà àà àààà àààà ààààà "
+"àà àààààà ààà àààà \"àààààà\" àààà àààà \"àààà\" ààà \"ààààà\" àààààà àà àààà "
+"àààà ààààà "
 "ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "ààààààà àààà àààààà ààà ààà/ààààà ààà ààààà ààààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "ààà ààà àààààà àààààà ààààà àààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "àààà àààà ààààà ààà àà ààààààà-ààààà ààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "àààà ààà ààààà àààààà àààà, àà àà ààà àààà ààà ààà àààà àà"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "ààààà ààààààà ààààà àà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "àààààà àààà ààààà àà ààààà àà ààà-ààà ààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "ààà ààà àààà ààà ààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "ààà ààà àà àààà ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "àààààààà ààà ààà àààà àà ààà ààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ààààààà ààà ààà àààà àààà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"HTML àààà àààà àààààà ààààà ààà àààà àà ààààà àààààà ààààààà ààà àààà àààà àààà ààà àààà ààààà "
+"HTML àààà àààà àààààà ààààà ààà àààà àà ààààà àààààà ààààààà ààà àààà àààà "
+"àààà ààà àààà ààààà "
 "àà àààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ààààà ààà ààà, ààà àà ààààà àààà ààà ààààà àààà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "ààààà àààà ààà ààà ààà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "àààà àà àààààààà ààà ààààààààà àààà àààà ààà ààààà ààà ààà/àààà àààà ààà"
+msgstr ""
+"àààà àà àààààààà ààà ààààààààà àààà àààà ààà ààààà ààà ààà/àààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "àààà ààà àààà àààà ààà ààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "ààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "ààààà àààà ààà ààààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "ààààà ààà àààà ààà ààà ààà, àà àà ààààà ààà àà ààà àà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr "àà ààà ààà ààà ààà àààà ààà ààààà àààààà ààà, àààààà àààà ààà ààààà àààà ààààà àààààà "
+msgstr ""
+"àà ààà ààà ààà ààà àààà ààà ààààà àààààà ààà, àààààà àààà ààà ààààà àààà "
+"ààààà àààààà "
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
-"àààà ààà àààààà àààààà àà ààà àààà àà, àààààààà àà àààà 'message_text_part_limit' ààààà "
+"àààà ààà àààààà àààààà àà ààà àààà àà, àààààààà àà àààà "
+"'message_text_part_limit' ààààà "
 "'à àààà àààà ààà ààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "àà ààààààà àà àààà àààààà àààà ààà àààààà àààà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "àà ààààààà àà àààà àààààà àààà ààà àààààà àààà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "ààààà ààà ààà/àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ààààààà/ààààà ààà ààà àààà ààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
-"ààààààà ààà ààààà àààà ààà ààààà àààà ààààà àààà àààà ààà, ààà àà àà ààà ààà àà àààààààà ààààà "
-"UTF-8 àààà ààà àààà àààà ààà àààà ààààà àà, àààààà àà RFC àààà àà àààààà àààà, àààà RFC "
+"ààààààà ààà ààààà àààà ààà ààààà àààà ààààà àààà àààà ààà, ààà àà àà ààà ààà "
+"àà àààààààà ààààà "
+"UTF-8 àààà ààà àààà àààà ààà àààà ààààà àà, àààààà àà RFC àààà àà àààààà "
+"àààà, àààà RFC "
 "àààà ààààààà ààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "ààààà ààà àà àààà ààààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#| msgid "Forwarded message"
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "àààààà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "ààààà àààà àààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "àààààà-àààà àààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "àààààà-àààà àààà àà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "àà-ààààà ààà àààà ààà ààà ààà ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
-"àààà ààààà àà àà ààà ààààà àààààà àààà àààà àààà àà ààààà àààà ààà, ààààà ààà ààààà àà àà àà ààà àààà "
+"àààà ààààà àà àà ààà ààààà àààààà àààà àààà àààà àà ààààà àààà ààà, ààààà ààà "
+"ààààà àà àà àà ààà àààà "
 "ààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"ààà ààà MIME àààà àà ààààààà àààà àààà ààààà àààà àà, àààà MIME àààà ààà àà àààà àààà "
-"àààààà ààà àà àà ààà àààà àà MIME àààà ààààààà àà ààààà-ààà àààà àààà àààààà àààà ààààà ààà"
+"ààà ààà MIME àààà àà ààààààà àààà àààà ààààà àààà àà, àààà MIME àààà ààà àà "
+"àààà àààà "
+"àààààà ààà àà àà ààà àààà àà MIME àààà ààààààà àà ààààà-ààà àààà àààà àààààà "
+"àààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "àààà ààà àààà ààà ààààààà:"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"\"ààààà ààààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààààà ààààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-#| msgid ""
-#| "Initial height of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ààààà àààààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
-"àààà àààààà ààààààà"
+"\"ààààà àààààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà àààà "
+"àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ààà ààààà ààààà ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààà ààààà ààààà ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"ààà àààà ààà ààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààà àààà ààà ààà\" ààààà àà àààààààà ààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"ààààà ààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà ààààà àà, àààà ààààà ààààà "
-"ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà àààà ààààà ààààà, àààà "
-"\"ààààà ààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà ààààà ààà"
+"\"ààààà ààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà "
+"ààààà àà, àààà ààààà ààààà "
+"ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà "
+"àààà ààààà ààààà, àààà "
+"\"ààààà ààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà "
+"ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:89
-#| msgid ""
-#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
-#| "when the user maximizes or unmaximizes the window. Note, this particular "
-#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
-#| "be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Folder Subscriptions\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"ààààà àààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà ààààà àà, àààà ààààà ààààà "
-"ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà àààà ààààà ààààà, àààà "
-"\"ààààà àààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà ààààà ààà"
+"\"ààààà àààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà "
+"ààààà àà, àààà ààààà ààààà ààà "
+"àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà àààà "
+"ààààà ààààà, àààà "
+"\"ààààà àààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà "
+"ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"ààà ààààà ààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà ààààà àà, àààà ààààà "
-"ààààà ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà àààà ààààà ààààà, "
-"àààà \"ààà ààààà ààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà ààààà ààà"
+"\"ààà ààààà ààààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà "
+"ààààà àà, àààà ààààà "
+"ààààà ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà "
+"àààà àààà ààààà ààààà, "
+"àààà \"ààà ààààà ààààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà "
+"àààà àà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10290,480 +10583,530 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"ààà àààà ààà ààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà ààààà àà, àààà ààààà ààààà "
-"ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà àààà ààààà ààààà, àààà "
-"\"ààà àààà ààà ààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà àà ààààà ààà"
+"\"ààà àààà ààà ààà\" ààààà àà àààààààà àààà-ààà àààà ààà àààà ààà àààààà àààà "
+"ààààà àà, àààà ààààà ààààà "
+"ààà àààà-ààà ààà àà-àààà-ààà àààà ààà ààà àààà àà àà ààà àààà àààààààà àààà "
+"àààà ààààà ààààà, àààà "
+"\"ààà àààà ààà ààà\" ààààà àààà-ààà àà ààààà àà ààààà àààà ààààà ààààà àààà "
+"àà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"\"ààààà ààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààààà ààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-#| msgid ""
-#| "Initial width of the \"Filter Editor\" window. The value updates as the "
-#| "user resizes the window horizontally."
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"ààààà àààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
-"àààà àààààà ààààààà"
+"\"ààààà àààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà àààà "
+"àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"ààà ààààà ààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààà ààààà ààààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"ààà àààà ààà ààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà ààà-àààà ààààà ààà "
+"\"ààà àààà ààà ààà\" ààààà àà àààààààà àààààà ààààà àà ààààà ààààà ààà àààààà "
+"ààà-àààà ààààà ààà "
 "àààà àààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
-"àà \"àà ààà àààà\" ààààà àà àààà, àà ààà ààààà ààààààà àà àà 'ààààà àààà' àààààà ààà "
-"àààà àààààà àààà ààààà àààà ààà àà ààààààà ààà, ààà ààà ààààà àààà àà ààà àààààà àà àààà ààà "
+"àà \"àà ààà àààà\" ààààà àà àààà, àà ààà ààààà ààààààà àà àà 'ààààà àààà' "
+"àààààà ààà "
+"àààà àààààà àààà ààààà àààà ààà àà ààààààà ààà, ààà ààà ààààà àààà àà ààà "
+"àààààà àà àààà ààà "
 "àààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"àà àààààà ààààà ààà àààà/ààà ààà àà, àà àà ààààààà ààààà àà ààà ààààà ààà àààààà ààààà ààà "
+"àà àààààà ààààà ààà àààà/ààà ààà àà, àà àà ààààààà ààààà àà ààà ààààà ààà "
+"àààààà ààààà ààà "
 "àààààà ààà àààà ààà àààà ààààà àààààà, àà àà àààà ààà ààààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr ""
-"àà ààà àààààà ààààà ààà ààààà ààà àààà àààà àà àààà àà, àààà ààààà àààààà àààà àààà àà àààààà "
+"àà ààà àààààà ààààà ààà ààààà ààà àààà àààà àà àààà àà, àààà ààààà àààààà "
+"àààà àààà àà àààààà "
 "àà àààà àààààààà ààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
-msgstr "àààààà àààààà àààà /ààà àààà àà, àààà ààààà àà ààààà ààà àààà ààà ààà ààà"
+msgstr ""
+"àààààà àààààà àààà /ààà àààà àà, àààà ààààà àà ààààà ààà àààà ààà ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
-"àà ààà àààààà ààààà ààà ààààà ààà àààà àààà àà àààà àà, àààà ààààà àààààà àààà àààà àà àààààà "
-"àà àààà àààààààà ààà ààà ààààà, àà àààà àà àààà-ààà: ààààà àààà àààà àà, àà àà àààààà àààà "
+"àà ààà àààààà ààààà ààà ààààà ààà àààà àààà àà àààà àà, àààà ààààà àààààà "
+"àààà àààà àà àààààà "
+"àà àààà àààààààà ààà ààà ààààà, àà àààà àà àààà-ààà: ààààà àààà àààà àà, àà "
+"àà àààààà àààà "
 "ààà àààà àààà àààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are sending a "
+#| "private reply to a message which arrived via a mailing list."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"àà ààà àààààà ààààà ààà ààààà ààà àààà àààà àà àààà àà, àààà ààààà àààààà "
+"àààà àààà àà àààààà "
+"àà àààà àààààààà ààà ààà ààààà"
+
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "àààà ààà ààà ààà àààà àààà àà"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "àààà ààà àààà àààà ààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "ààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:104
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "àààà, ààà ààà àààà àààààà ààà 'à ààààà ààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "àààà àààà ààà ààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ààààà ààà àààà àà àààà àà MIME àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "àààààà ààààààààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "àààààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
-"ààààààà àà àààà ààà ààà àààààà àààààààà àà ààààà àà àààà àààà àààààà àà-ààààààààààà /apps/"
+"ààààààà àà àààà ààà ààà àààààà àààààààà àà ààààà àà àààà àààà àààààà "
+"àà-ààààààààààà /apps/"
 "evolution/mail/accounts àà àààààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "ààààààà ààààààà àà àààà ààà àà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "àààà-ààà àààà ààà àà àààààààà ààààà ààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"ààààààà àà àààà ààà àà àààà àà àààà àààà ààà àà àààà àà àààà ààà ààààà àà, àà àà HTML "
+"ààààààà àà àààà ààà àà àààà àà àààà àààà ààà àà àààà àà àààà ààà ààààà àà, àà "
+"àà HTML "
 "ààààà àààààààà àà àààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "àààààààààà ààà àà àààà, àààààà àà ààààààà àààààà àààà ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML àààààà àà HTTP ààà ààààà àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"HTML(S) àààà HTML àààààààà àà ààààà ààààààà ààà ààà àààà àààà àà \"0\"- ààà àààà \"1\"- "
-"ààààà ààààààà ààà àà ààà, àààà àààà àààà àààààà àààà àààà ààààà àààà \"2\" -  àààà ààà àààààà "
+"HTML(S) àààà HTML àààààààà àà ààààà ààààààà ààà ààà àààà àààà àà \"0\"- ààà "
+"àààà \"1\"- "
+"ààààà ààààààà ààà àà ààà, àààà àààà àààà àààààà àààà àààà ààààà àààà \"2\" -  "
+"àààà ààà àààààà "
 "ààààà ààààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "ààà ààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "ààààà ààà àààà àà ààà ààààà àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "ààà ààààà ààààààà àà ààà-àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "ààà ààààà ààààààà àà ààà-àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "ààà ààààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "ààà ààààààà àààà-ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "ààà ààààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "ààààà àààà àààà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "ààààà àààà àààà ààààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "àààààà \"ààà\" àààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "àààààà \"ààà\" àààà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "àààààà àà àààààà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "àààààà àààààà ààààà (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ààà ààà àààà ààà ààà àààà ààà àà àààà-ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ààà ààà àà àààà àààà ààà àà àààà-ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ààà ààà àààà àààà àààà ààà àà àààà-ààà àààà ààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ààà ààà àà àààà àààà ààà àà àààà-ààà àààààà ààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ààà/CC/BCC àààà àààààà àà ààààààààà àà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "àààà àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Path where image gallery should search for its content"
-msgstr "ààà, ààààà ààààà ààààà àà àà àààààà àààà"
+#: ../mail/evolution-mail.schemas.in.h:137
+#| msgid "Path where image gallery should search for its content"
+msgid "Path where picture gallery should search for its content"
+msgstr "ààà, ààààà ààààà ààààà àà àà àààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
-"ààà àààà àà: never (ààà àààà) - àààààà ààààààà ààààà ààà àà ààà ààà àà, always "
-"(àààààà) - ààààààà ààààà àààààà ààà ààà àà, ask (ààààà)  - (ààà ààà àààà) ààààà ààà ààààà"
+"ààà àààà àà: never (ààà àààà) - àààààà ààààààà ààààà ààà àà ààà ààà àà, "
+"always (àààààà) - "
+"ààààààà ààààà àààààà ààà ààà àà, ask (ààààà)  - (ààà ààà àààà) ààààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+#| msgid ""
+#| "The following recipients were not recognized as valid mail addresses:\n"
+#| "{0}"
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"àààà ààààà àààààà àààà ààà ààààààà ààà àààààà àààà àààààà àààà àà àààà:\n"
+"{0}"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "àààà àààà àà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "àààà ààààà ààààà ààà ààààà àà àààà àààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "àààà ààààà ààààà àààà ààà àààààà àààà àà àààà àààà ààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "ààààà, àààà ààà ààààà àààà àààààà àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ààààà, àààà ààààà àààà àààààà àààààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "ààààà, àààà àààà àààààààà àà àààààààà àààà ààààà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "ààààà, àààà àà àààààà-ààààààà ààà àààà ààààà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "àààà ààààà àààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "àààà àààà Bcc àààà àà àààà àààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "àààà ààààà àààà àààà àà àààààà àààà àà ààààà ààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"àààà ààààà HTML àààààà, ààààà ààààà ààà àààà àà ààààà ààà, àà àà àà àààààà àà àààà àààà ààààààà "
+"àààà ààààà HTML àààààà, ààààà ààààà ààà àààà àà ààààà ààà, àà àà àà àààààà àà "
+"àààà àààà ààààààà "
 "àà, ààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "àààà ààààà ààààà ààà ààà Cc àààààààààà àà àààààà àààà àà ààààà ààà ààà àààààà"
+msgstr ""
+"àààà ààààà ààààà ààà ààà Cc àààààààààà àà àààààà àààà àà ààààà ààà ààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "àààà ààààà àà-àààààà HTML àààààà àààà àà ààààà ààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "àààà àà àààààà ààààààààà àààà ààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "àààà àà àààà ààààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "àààààà àà ààààà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "ààààà àààààà àààààà àà àààà àààà ààààààà ààà ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "ààààà àààà àààààà àà àààà ààà ààà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "à ààààà ààààà àà ààà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "ààààààààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "àààà àààààà àààà àààà àààà àààà àààà àà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "àààààà HTML àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "àààààà HTML àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "àààààà àààà àààà àààààà àààà àààà àààà àààà àà à-ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "àààà àààààààààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
-"àààà àààà ààà, àà ààààà ààà àààà àà ààààà, àààà ààààààà ààà àààààà ààààà ààààààà ààààà àààà "
+"àààà àààà ààà, àà ààààà ààà àààà àà ààààà, àààà ààààààà ààà àààààà ààààà "
+"ààààààà ààààà àààà "
 "àààà ààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "àààà ààà àààààà ààààà àààà ààà \"Bcc\" àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "àààà àààààà ààààà àààà ààà \"Cc\" àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "àààààààààà àààà àààà ààààà \"àààà\" àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "àààààààààà ààà àààà ààààà \"àààà ààà\" àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "àààà àààà àààààà ààààà àààà ààà \"àààà ààà\" àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "àààààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "àà àààààà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "àààààà àààà ààààà àà ààààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "àààààààà àààààà àààààààà àààà àà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "àààààà-àààà àààà àààà àààààà àààà (ààààà ààà)à"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "àààààà-àààà àààà àààà àààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "ààààà àààààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "àààà \"àààà\" ààààà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "àààà àààà àà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"àààà àààà àààààà ààààà àààà ààà \"Bcc\" àààà ààààà àà ààà ààà àààààà àààà àà ààààà àààà àààà ààà àààààà "
+"àààà àààà àààààà ààààà àààà ààà \"Bcc\" àààà ààààà àà ààà ààà àààààà àààà àà "
+"ààààà àààà àààà ààà àààààà "
 "àààà àà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"àààà àààà àààààà ààààà àààà ààà \"Cc\" àààà ààààà àà ààà ààà àààààà àààà àà ààààà àààà àààà ààà àààààà "
+"àààà àààà àààààà ààààà àààà ààà \"Cc\" àààà ààààà àà ààà ààà àààààà àààà àà "
+"ààààà àààà àààà ààà àààààà "
 "àààà àà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"àààà àààààààààà ààààà àààà ààà \"àààà\" àààà ààààà àà ààà ààà àààààà àààà àà ààààà àààà àààà ààà àààààà "
+"àààà àààààààààà ààààà àààà ààà \"àààà\" àààà ààààà àà ààà ààà àààààà àààà àà "
+"ààààà àààà àààà ààà àààààà "
 "àààà àà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
-"àààà àààààààààà ààààà àààà ààà \"àààà ààà\" àààà ààààà àà ààà ààà àààààà àààà àà ààààà àààà àààà ààà "
+"àààà àààààààààà ààààà àààà ààà \"àààà ààà\" àààà ààààà àà ààà ààà àààààà àààà "
+"àà ààààà àààà àààà ààà "
 "àààààà àààà àà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"àààà àààà àààààà ààààà àààà ààà \"àààà ààà\" àààà ààààà àà ààà ààà àààààà àààà àà ààààà àààà àààà ààà "
+"àààà àààà àààààà ààààà àààà ààà \"àààà ààà\" àààà ààààà àà ààà ààà àààààà "
+"àààà àà ààààà àààà àààà ààà "
 "àààààà àààà àà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "àààààà àààà àààà ààààà àààà àààà àààà àààà àà à-ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
-"àààà \"àààà\" ààààà àààà (àààà àààà ààà, àà àààà àààà ààààà àààà)à àààà ààà àààààà \"àààà\" "
+"àààà \"àààà\" ààààà àààà (àààà àààà ààà, àà àààà àààà ààààà àààà)à àààà ààà "
+"àààààà \"àààà\" "
 "ààààà àààà ààààà àààà àààà àààààà ààà ààà àààà àààà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "àààààà ààààà àààà àààà àààà àààà àà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10773,222 +11116,230 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
-"ààà àààààà àààààà àààà-ààà(Reply-To:) ààààà ààà ààààà ààà àààà àààààà àààà àààà àààà àà àààà "
-"àààààà ààààààà àà, ààààà àà àà àààààààà ààà àààààààà àààà ààà àà àààààààà ààà àà ààà àààà ààà "
-"ààà àààà-ààà: ààààà ààà ààààààà ààà àà ààààààà àààà àààààà, ààà àà àààààààà ààà àà àà ààà, "
-"ààààà ààààà ààààààà ààà àà ààààà àààààààà àààà ààààà ààààà ààà, àà àààààààà àààà àààààà, àààà àà "
-"ààààà 'àààà ààà àààà' ààààà ààààà ààà àà ààà àà àààààà àà àààà-ààà: ààààà ààà àààà-àààà: "
+"ààà àààààà àààààà àààà-ààà(Reply-To:) ààààà ààà ààààà ààà àààà àààààà àààà "
+"àààà àààà àà àààà "
+"àààààà ààààààà àà, ààààà àà àà àààààààà ààà àààààààà àààà ààà àà àààààààà ààà "
+"àà ààà àààà ààà "
+"ààà àààà-ààà: ààààà ààà ààààààà ààà àà ààààààà àààà àààààà, ààà àà àààààààà "
+"ààà àà àà ààà, "
+"ààààà ààààà ààààààà ààà àà ààààà àààààààà àààà ààààà ààààà ààà, àà àààààààà "
+"àààà àààààà, àààà àà "
+"ààààà 'àààà ààà àààà' ààààà ààààà ààà àà ààà àà àààààà àà àààà-ààà: ààààà ààà "
+"àààà-àààà: "
 "ààààà ààà ààààà àààà ààà àààà àà, àà ààà àààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "àààà àààà ààà-ààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "ààà-ààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "àààà-ààà àààà àààààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr "ààà ààà àààà àààààà ààààà àà àààà"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "àààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "ààà àààà àà àààààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "àààà ààà ààà ààà àààà ààà àà, 1 ààààà 1970 ààà àà àà ààààà 'à (àààà)"
 
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "àààà ààà àààà àààà ààà àà àààààà, 1 ààààà 1970 ààà àà àà ààààà àà"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
-"ààààà ààààà ààà àààà àà àà àààààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà \"0"
-"\" (àààààà ààà) ààà àààà ààà àààààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) ààà "
+"ààààà ààààà ààà àààà àà àà àààààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà "
+"\"0"
+"\" (àààààà ààà) ààà àààà ààà àààààà àààà ààààà àààààààà ààà \"1\" (àààààà "
+"ààà) ààà "
 "àààà ààà àààààà àààà àà ààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "ààà àààààà àà àààààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
-"ààààà, àà àà àààà àààà àààààà àààà ààààà àààà ààà àà, àààààààà àà àà àààà ààààà "
-"àààààà ààààà ààà"
+"ààààà, àà àà àààà àààà àààààà àààà ààààà àààà ààà àà, àààààààà àà àà àààà "
+"ààààà àààààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
-"ààààà, àà àà ààààà àààà ààà, àààà àààààà ààà àààà ààààà àà àààà àà (àààà ààààà), ààà 'à "
+"ààààà, àà àà ààààà àààà ààà, àààà àààààà ààà àààà ààààà àà àààà àà (àààà "
+"ààààà), ààà 'à "
 "ààààà àà àà àààà àààààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
-"ààààà, àà àà ààààà àààà ààà, àààà àààààà ààà àààà ààààà àà àààà àà, ààà 'à àààà "
-"àààà àà àààààà ààà"
+"ààààà, àà àà ààààà àààà ààà, àààà àààààà ààà àààà ààààà àà àààà àà, ààà 'à "
+"àààà àààà àà "
+"àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "ààà àààààà àà àààààà àààà àààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
-msgstr "àààà àààà àààà ààà àààààà àà \"0\"à ààààààà àà \"1\"à ààààà àààààà àà \"2\"à"
+msgstr ""
+"àààà àààà àààà ààà àààààà àà \"0\"à ààààààà àà \"1\"à ààààà àààààà àà \"2\"à"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr ""
-"àà ààààà ààà àà ààà ààà ààà àààà ààà àààà àà, ààà ààà àààààààà àààààà àààààà àààà àà àààà "
-"ààà àààààà 4 (à) MB / àààà KB àà ààà KB àà ààà àààà ààààà àà àààà ààà àà àààà ààà àà "
+"àà ààààà ààà àà ààà ààà ààà àààà ààà àààà àà, ààà ààà àààààààà àààààà àààààà "
+"àààà àà àààà "
+"ààà àààààà 4 (à) MB / àààà KB àà ààà KB àà ààà àààà ààààà àà àààà ààà àà àààà "
+"ààà àà "
 "ààààà àà àààà àà, àààà 'force_message_limit' ààààà ààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
-"àà àààààà ààà àààààà àà, ààààà àà àà àààààà ààà ààà àà àààààà ààààà àààààà àààà àà ààà àà "
+"àà àààààà ààà àààààà àà, ààààà àà àà àààààà ààà ààà àà àààààà ààààà àààààà "
+"àààà àà ààà àà "
 "ààà àààààà àààààà àààà àààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"àà àà àààà ààààà àà àà ààà ààààà àààà \"ààà\" àà àà-àààà àààà ààà àààà àààààà ààà àà-"
+"àà àà àààà ààààà àà àà ààà ààààà àààà \"ààà\" àà àà-àààà àààà ààà àààà àààààà "
+"ààà àà-"
 "àààà àà ààà àà ààààà àà ààà àààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"àà àà àààà XML ààààà ààààà ààààààà ààààààà àà àààà ààààà àà ààà àà àà ààààà ààà ààà ààà "
-"XML ààààà àà àààààà àà &lt; ààààà ààà&gt; - àààà ààà, àààà ààà ààà àààà ààààà ààààà ààààà "
+"àà àà àààà XML ààààà ààààà ààààààà ààààààà àà àààà ààààà àà ààà àà àà ààààà "
+"ààà ààà ààà "
+"XML ààààà àà àààààà àà &lt; ààààà ààà&gt; - àààà ààà, àààà ààà ààà àààà ààààà "
+"ààààà ààààà "
 "ààààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"àà ààà lookup_addressbook ààààà ààà àààààà àà ààà àà ààà àààà àààààà àààà àààààà àà ààà àà "
+"àà ààà lookup_addressbook ààààà ààà àààààà àà ààà àà ààà àààà àààààà àààà "
+"àààààà àà ààà àà "
 "ààààà ààààà àà, àààà àà ààà ààààà ààà ààààà ààààà ààà ààà àààà àà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "àà ààà ààà àà àààà àààààà àà àààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"àà àààààà àààààà àààà ààà àààà àààààààà àà ààààà àààà àààà àà, ààà ààà àààà ààà '...' "
+"àà àààààà àààààà àààà ààà àààà àààààààà àà ààààà àààà àààà àà, ààà ààà àààà "
+"ààà '...' "
 "àààààà ààààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:207
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
 msgstr ""
-"àà àààààà ààà àààà àà àà àààààà ààà àààà ààààà (ààààà) ààààà àààà ààà àààààà ààààà àààà "
+"àà àààààà ààà àààà àà àà àààààà ààà àààà ààààà (ààààà) ààààà àààà ààà àààààà "
+"ààààà àààà "
 "ààà àà ààà-àààà àààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"àà àààààà ààà àààà àà àà ààààààà ààà àààà ààààà àààà ààààà àààààààà àààààà àààààà àààà àààà, "
+"àà àààààà ààà àààà àà àà ààààààà ààà àààà ààààà àààà ààààà àààààààà àààààà "
+"àààààà àààà àààà, "
 "àà àà àààààà àà àààà ààààààà àààààààà ààà ààà-ààààà àààà àààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder."
 msgstr ""
-"àà àààà àààà àààà àà àààà àà, ààà àà àààà àà ààààà ààààà ààààà, àà àà àààà "
-"~/Pictures (~/ààààààà) ààà ààààà ààà àà ààààà ààà ààà àà ààààà àààààà, àààà ààà "
-"àà-ààààà ààààà àà àààààà àààà ààà ààààà"
+"àà àààà àààà àààà àà àààà àà, ààà àà àààà àà ààààà ààààà ààààà, àà àà àààà ~/"
+"Pictures (~/ààààààà) ààà ààààà ààà àà ààààà ààà ààà àà ààààà àààààà, àààà ààà "
+"àà-ààààà "
+"ààààà àà àààààà àààà ààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "àààà àà àààààà àààààà-àààà àà ààààà àààà"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "àààààà ààààà ààààà àà àààà-ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "àààààà ààààà ààààà àà àààà-ààà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "ààà àààààà àà UID ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "àààà àà-àààà ààààààà àà ààààà àààà ààà ààà àààà àà ààààà àààà àà ààà"
 
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "Use SpamAssassin daemon and client"
-msgstr "Spamasssassin àààà ààà ààààà ààààà"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "SpamAsssassin àààà ààà ààààà ààààà (spamc/spamd)"
-
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "ààààààà àààà ààààà"
 
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use custom fonts for displaying mail."
-msgstr "ààà àààààà àà àààà àààà ààààà ààà"
-
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use only local spam tests."
-msgstr "àààà àààà àààà àààà àà àààààà"
-
 #: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use only the local spam tests (no DNS)."
-msgstr "àààà àààà àààà àààà àà ààààà (DNS àààà)à"
+msgid "Use custom fonts for displaying mail."
+msgstr "ààà àààààà àà àààà àààà ààààà ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:221
 msgid ""
@@ -10996,7 +11347,8 @@ msgid ""
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
-"ààààà ààà àààààà àà àààà ààà àààà àààà ààààà ààà àà àààà ààà àà ààà àààà àà àà àààà ààà àààààà àà "
+"ààààà ààà àààààà àà àààà ààà àààà àààà ààààà ààà àà àààà ààà àà ààà àààà àà "
+"àà àààà ààà àààààà àà "
 "àààà ààààà àààààà ààà àààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:222
@@ -11005,7 +11357,8 @@ msgid ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"ààààà àààààà àà àààà ààà àààà àààà ààààà ààààà àà àààààà àà ààà àààà àà àà ààààààà ààà àààààà àà "
+"ààààà àààààà àà àààà ààà àààà àààà ààààà ààààà àà àààààà àà ààà àààà àà àà "
+"ààààààà ààà àààààà àà "
 "àààà ààààà àààààà àà àààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:223
@@ -11028,7 +11381,8 @@ msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
-"àà àààà àààààààà ààààà àààà ààà àààà àààààà ààààà ààà àà àààà ààààààà ààà àààà àà ààà àààààà àààà ààààà "
+"àà àààà àààààààà ààààà àààà ààà àààà àààààà ààààà ààà àà àààà ààààààà ààà "
+"àààà àà ààà àààààà àààà ààààà "
 "ààà"
 
 #: ../mail/evolution-mail.schemas.in.h:227
@@ -11040,7 +11394,8 @@ msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"àà ààààààà ààà àààà àààààà àààà àààà ààà àà, àààà àà àààààààà àààà àààà ààà ààààà àààà "
+"àà ààààààà ààà àààà àààààà àààà àààà ààà àà, àààà àà àààààààà àààà àààà ààà "
+"ààààà àààà "
 "ààààà àà ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:229
@@ -11053,8 +11408,10 @@ msgid ""
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
-"ààààà ààà àà àààà àà ààààààà ààà àààà àààà ààà ààààààà àààà àààà ààà àà àààààà àà, "
-"àààà ààà 'àààà àààà' ààààà àààààà àààà àààà àà àààà àààààà àà àààà ààà àààà ààààà"
+"ààààà ààà àà àààà àà ààààààà ààà àààà àààà ààà ààààààà àààà àààà ààà àà "
+"àààààà àà, "
+"àààà ààà 'àààà àààà' ààààà àààààà àààà àààà àà àààà àààààà àà àààà ààà àààà "
+"ààààà"
 
 #: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
@@ -11068,112 +11425,111 @@ msgstr "àààààà-àààà àààà àà ààààà à
 msgid "Importing Elm data"
 msgstr "ààà àààà àààààà àààà àà àààà àà"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1045
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:500
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1040
+#: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "àààà"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "ààààààà ààà ààààààà"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "Elm ààà àààà àààààà ààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "àààààà ààààà(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:233
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "ààààà àààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "àààààà ààà àà ààààà àààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ààààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "àààà"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:466
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ààààààà àààà-àààà (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ààààààà àààà-àààà àààààà ààààà ààààààà"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "àààà-àààà àààààà àààà àà àààà àà"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:568
-#: ../plugins/pst-import/pst-importer.c:478
-#: ../plugins/pst-import/pst-importer.c:587
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "`%s' àààààà àààà àà àààà àà"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "àààà àààà àà %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
 msgstr "àààà àààà àààààà àààà àà àààà àà"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../mail/importers/pine-importer.c:458
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "àààààà àààà"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
 msgstr "ààààààà àààà àààààà"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
 msgstr "Pine ààà àààà àààààà ààà"
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ààà àààà"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ààà àààà"
 
-#: ../mail/mail-autofilter.c:256
+#: ../mail/mail-autofilter.c:264
 #, c-format
 msgid "Subject is %s"
 msgstr "àààà àà %s"
 
-#: ../mail/mail-autofilter.c:291
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "%s àààààà àààà"
 
-#: ../mail/mail-autofilter.c:382
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "ààààà àààà àààà"
 
@@ -11182,7 +11538,7 @@ msgstr "ààààà àààà àààà"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:480
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11199,10 +11555,6 @@ msgstr[1] ""
 "%s àààààà àà àààà àà àà, àà àààà àà ààààà\n"
 "\"%s\" àà ààà"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "àààààà ààààààà"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "àààà ààààà ààààà ààà(_w)..."
@@ -11211,452 +11563,485 @@ msgstr "àààà ààààà ààààà ààà(_w)..."
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "àà àààààà àààààà àààà àààà ààààààà àà ààààà ààààà ààà(_w)"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
-#| msgid "Prompt when mailing list redirects private reply back to list"
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "àààààà àààà ààà àààààààà àààà ààà àààà àààà àààà àà ààààààà(_m)"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "àààààààà àààààà àààà àààà ààà àààààààà ààà(_f)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "àà ààà àààààà ààààà àààà àààà àààà(CC):"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "àà ààà ààààà àààààà àààà àààà àààà(_BCC):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "àààààààà ààà àààà àààà àà-àààà àààà ààààà àààà(_t)"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "àààààààà àààààà àààà àààà ààààà àààààà àààààààà ààà(_m)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ààààà àààà àààààà àààà(_d)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "àà ààààààà àà ààà ààà àààààà àààà ààà(_v)"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "àààààààààà"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "àààààà ààààà àààààààà ààààà ààà(_e)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "àààà àààà(_h):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "ààààà àààà àà àààà(_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "ààà àà àààà ààààà àààà ààà(_s)"
 
-#: ../mail/mail-config.ui.h:19
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "ààààà àààà àààà àààààààà àà àààà ààà(_m)"
 
-#: ../mail/mail-config.ui.h:20
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "àà ààààà àààààà àààà àààà àààààààà àà àààà ààà(_g)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "ààà àà à ààà àààààà àààà ààà(_m)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "ààààà ààà ààààà, ààà àà ààà àà ààààà àààà ààà"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "ààà ààà(_a)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "ààà ààà(_r)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "ààà ààà-ààà àààààà àà ààà(_m):"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "àààààà ààààà"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "àààààà"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "ààààà àà ààà àààà àààà ààààà ààà(_w)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "àààààà"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "àààà/àààà àààààà"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "àààààà ààààà"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "ààà àààà ààààààà(_n):"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "ààà àààà"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ààà ààà àààà ààà ààà àààà(_x)"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "àààà ààà àààà àààààà àààààà àààà ààà (àààààà)(_s)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "àààààà ààààà àààààà àà àààà àà"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "àà àààà àààà àààà àààààà-àààà àààà àààà ààà àààààà ààà àà àààà(_k)"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "ààà àà ààà"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "ààààà ààààà(_F):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "à-ààà àààààà(_A):"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "ààà ààà àà àààà ààààà ààà àà ààà(_x)"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "àààààààà ààààààààà(_p):"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "ààààà ààà àààà àààààà ààà àààààààà (ààà àà)(_g)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "ààààà àààààààà ààààà àààààà àà ààààà(_a)"
 
-#: ../mail/mail-config.ui.h:48
-#| msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "àààà ààààà àààà(_e):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "_HTML àààà àààààà àààààà"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "àààà ààà(_E):"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "ààààà àààà àààà àààààà àààà ààà àààà ààà, àà àààà àààà"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML àààààà"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP àààààà:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+#| msgid "Sender contains"
+msgid "Header content"
+msgstr "ààààà àààààà"
+
+#: ../mail/mail-config.ui.h:57
+#| msgid "Header Name:"
+msgid "Header name"
+msgstr "ààààà ààà"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "ààààà"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "ààààà ààà ààààà(_q)"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "àààààà àààààà àà àààà-ààà: ààààààà"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "àààà 'à"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "àààààà (ààààààà ààààà)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "àààà"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "ààààà àààà"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "ààààà ààà àààà àà ààà àà"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "ààà ààààà àààà"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "ààà-àààà àààààà"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "àààààà ààà"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "àààààà àààààààààà"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "ààà àààààà àààà(_P):"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ààà àààààààààà àààà"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ààà ààà ààààààà àààà àààààà, àà àààà àààà ààà ààààà ààààà ààààà"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "àààààà ààààààà"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "ààààà(_g):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "àààààà(_w):"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "Pick a color"
 msgstr "ààà àààà"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "àààà:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "ààààààà àààà àààààààà (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "àààààà àààààà"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "ààààà"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "àààààà ààà àààà(_m)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "àà ààà àààà(_p):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "àààààà ààà àààà(_p)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "àààà ààà àààà àààààààà ààà àààà ààààààà ààà ààà"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "àààààà ààààààà"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL àààààààààà"
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr " SSL àààààà ààààààà àà àà àààà àà àààààà àààà"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "àààà àààà àà ààààà àà ààà ààààà àààà àààààà-àààà àààà àà ààà(_e)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "àààà(_e)..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "àààààà àààà àààà(_e):"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ààààààà àààà(_t):"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "àààààààà MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "HTML àààà ààààà ààà àààà"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "HTML ààààà ààààà ààà àààà"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "àààà àààà àà àààà"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
-#| msgid "Prompt when sending private replies to mailing _list messages"
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "àààààà àààà àààààà àà àààààààà àààà àààà ààààà ààààà(_p)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
-#| msgid "_Prompt when sending messages with an empty subject line"
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+#| msgid "Sending a message with only _Bcc recipients defined"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "àààà àà àààààà ààààà àà àààà àààà, àà àà _Bcc ààààààààà àààà ààà"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "àààà àààà àààà ààà àààààà àààà(_e)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "àààà àà àààààà ààààà àà àààà àààà, àà àà _Bcc ààààààààà àààà ààà"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
-#| msgid "Send reply to all recipients?"
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "àààà ààààà àààà àààààà ààà àààààà ààà àààà ààààà àà àààà àààà(_n)"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "àààà àààààà ààààà(_M):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "àààà àà àààààààààà àààààà àà"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "àààà àààààà"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "àààà àààà(_T): "
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:119
+#| msgid "Add Custom Junk Header"
+msgid "Set custom junk header"
+msgstr "àààà ààà ààààà àààà ààà"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "ààààààà àààààààà(_g):"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "ààààà(_n)"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "ààààààààà ààààà(_n):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "ààààà(_u):"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "ààààà"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "ààààààà àààààààà(_a):"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "ààà ààààààààà"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "ààà-ààà àààà"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "àààà àààà àààà àààà ààà ààààà ààààà ààààààà àà(_t)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "ààààà"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS àààààààààà"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "àààà(_y):"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "ààààààà àà àààà, àààà ààààà ààà ààààààà àà, ààààà àà ààà-ààà àààààà ààà"
+msgstr ""
+"ààààààà àà àààà, àààà ààààà ààà ààààààà àà, ààààà àà ààà-ààà àààààà ààà"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11666,15 +12051,15 @@ msgstr ""
 "àààààààààà, àà àà ààààà ààààà, àààà àààààà àà ààà\n"
 " àààààà"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
-"àààà ààààààà ààà àààààààà ààà ààà àà àààà ààààà, àààà ààààààà àààààààà ààà ààà àààààà "
-"ààààà:"
+"àààà ààààààà ààà àààààààà ààà ààà àà àààà ààààà, àààà ààààààà àààààààà ààà "
+"ààà àààààà ààààà:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11682,144 +12067,141 @@ msgstr ""
 "ààà àààà, ààà ààà ààààà àà àààààà ààà àààààà àààà ààààààà ààà\n"
 "àààààà àà: \"ààààààà\" ààà \"ààààà\""
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "ààààà ààà(_e):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "àààààààààà ààààà(_n)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "ààààà ààà(_N):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "ààààà ààààà(_A)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "àààààààà ààà ààààà ààààà àààààà ààà(_A)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "ààààààààà àààà(_A)"
 
-#: ../mail/mail-config.ui.h:139
-msgid "_Default junk plugin:"
-msgstr "àààààà ààà àààààà(_D):"
-
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "àààààààà àà ààààà àààààààà(_D)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "àààààà ààààà àààà àààààà àà ààà (ààààààà àààààààà àà) (_D)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "àààà àààà ààààà(_F):"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "ààà ààààà(_J):"
 
-#: ../mail/mail-config.ui.h:144
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "àààà ààà àààà ààààà àààà àààààà àà àààà àààà(_K)"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "ààààà(_L)"
 
-#: ../mail/mail-config.ui.h:146
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "àààà ààààààà ààà àà àààààààà 'à ààààà ààà ààà(_L)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "àààà àààààà àààà àààà àà àààà(_L)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "àààà àà àààààà ààà ààà àààà(_M)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "àààà àààààà àààààà(_M):"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "àààààààà ààà ààààà ààà àà ààà àà ààà(_N)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "àààà(_P):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "àààà(_P):"
+
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML àààààà ààààààà ààà àààà àààà ààààà, àà àà àààà ààààààà àà (_P)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "àààà ààààà(_R):"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "ààààààà(_S):"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "àààààààà HTTP àààààà(_S):"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "àààà(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:160
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "àààààà ààà ààààà àààà(_S)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "àààà ààà àààà àààà àààà àà àààà àààà(_S)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "àààà ààààà(_T):"
 
-#: ../mail/mail-config.ui.h:163
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "àààààààà ààààààà ààààà(_U):"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "ààààà àààààà ààààà(_U)"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "ààà ààààààààà àààà ààà àààà ààààà(_U)"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "ààà"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "ààààà"
 
@@ -11839,63 +12221,64 @@ msgstr "àà àààà ààààà"
 msgid "Call"
 msgstr "ààà"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "àààààà(_m)"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "àààààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "àààà àà àààà"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "àààààààààà"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "ààààà"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "àààààà ààààààà àà"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "àààà"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ààààààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "ààà àààà àààààà àààà àà"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "àà ààà àààà"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ààà-àààà"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "ààà ààààà àààà"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ààààààà ààààààà"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "ààà ààààà"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -11903,23 +12286,23 @@ msgstr ""
 "àààààà, àà àà ààààà ààààà ààà àà àààà àà, ààààà ààààà àà ààà ààà\n"
 "\"àààà\" ààààà àààààà àààààà ààà àà àààà"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "ààààààà àààààà(_A)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "àààààà(_D):"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "ààààà(_F):"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "ààààààà ààààà àààààà ààà àà àà ààà àààà(_T)"
 
-#: ../mail/mail-folder-cache.c:792
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "%s àààà àààà àà àààà àà"
@@ -11928,205 +12311,138 @@ msgstr "%s àààà àààà àà àààà àà"
 msgid "Filtering Selected Messages"
 msgstr "àààà àààààà ààààà"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "àààà àà àà ààà àà"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d àààààà %1$d àààààà ààààà àà àààà àà"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d àààààà %1$d àààààà àààà àààà ààààà"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "ààà ààààà"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "ààààà"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "àààààà '%s' àààà àààà àà ààà àà"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "àààààà '%s' àààà àààà àààà àà ààà àà"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "'%s' àààà ààààà ààààà àà ààà àà"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "àààà àààà àààààà"
-
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "'%s' ààààà àà àààà ààààààà àà àà ààà àà"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "àààà '%s' ààààààà àà àààà àà"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "ààààà '%s' ààààà àà àààà àà"
-
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ààààà '%s' ààààààà àà àààà àà"
 
-#: ../mail/mail-ops.c:1654
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "àààààà '%s' ààààààà àà àààà àà ààà ààààààà àà àààà àà"
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
 msgstr "àààààà '%s' ààààààà àà àààà àà"
 
-#: ../mail/mail-ops.c:1713
+#: ../mail/mail-ops.c:1240
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "'%s' ààààà ààààà àààà àà àààà àà"
 
-#: ../mail/mail-ops.c:1877
+#: ../mail/mail-ops.c:1418
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "'%s' àààààà ààààà"
 
-#: ../mail/mail-ops.c:1949
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' àààà àààà àààà àààà àà àààà àà"
 
-#: ../mail/mail-ops.c:1950
+#: ../mail/mail-ops.c:1492
 msgid "Local Folders"
 msgstr "àààà ààààà"
 
-#: ../mail/mail-ops.c:2123
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "àààààà %d ààà àà àààà àà"
-msgstr[1] "àààààà %d àà àà ààà àà"
-
-#: ../mail/mail-ops.c:2216
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "%d àààààà ààààààà àà àààà àà"
-msgstr[1] "%d àààààà àààààà àà ààà àà"
-
-#: ../mail/mail-ops.c:2312
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "àààààà àààààà àààà àààà: %s:\n"
-
-#: ../mail/mail-ops.c:2387
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "àààààà àà àààààà '%s' àààà àààà àà àààà àà"
-
-#: ../mail/mail-ops.c:2478
-msgid "Checking Service"
-msgstr "ààààà ààààà àà ààà àà"
-
-#: ../mail/mail-ops.c:2558
+#: ../mail/mail-ops.c:1590
 #, c-format
 msgid "Disconnecting %s"
 msgstr "%s ààààà ààà-àààààààà àààà ààààà àà"
 
-#: ../mail/mail-ops.c:2615
-#, c-format
-msgid "Removing attachments"
-msgstr "àààààààà àààààà àà ààààà àààààààààà hàààààà àà ààà à"
-
-#: ../mail/mail-ops.c:2662
-#, c-format
-#| msgid "All accounts have been removed."
-msgid "File \"%s\" has been removed."
-msgstr "àààà \"%s\" àààà àà ààà"
-
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "ààà àààà àà àààà àà..."
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
 msgstr "àààà ààààà ààà àààà"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:459
 msgid "Cancel _All"
 msgstr "àà ààà ààà(_A)"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
 msgstr "àààààà àààà àà àààà àà..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
 msgstr "àààà àààà àà ààà àà..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
 msgstr "àààà àààà àà àààà àààà àà ààà àà"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "àààà ààààààààà '%s' àààà àààà àà ààà àà: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "ààà non-mbox àààà `%s' àà àààà àà ààààà àààà"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "àààà ààààà àààààà - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "àààà ààààà àààààà"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ààà ààààà àààà àààà àà àààà àà: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "'%s:%s' àà ààà ààààà àààààà àààà àààà"
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:232
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "'%s' àà ààà ààààà àààààà àààà àààà"
+#| msgid "Updating Search Folders for '%s:%s'"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "'%s' àà ààà ààààà àààààà àààà àààà: %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:709
+#: ../mail/mail-vfolder.c:675
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12144,11 +12460,11 @@ msgstr[1] ""
 "àà àààààà àà àààà ààààà ààà ààààààà ààà ààààà ààà àà\n"
 "%1$s"
 
-#: ../mail/mail-vfolder.c:1273
+#: ../mail/mail-vfolder.c:1289
 msgid "Edit Search Folder"
 msgstr "ààà ààààà ààà"
 
-#: ../mail/mail-vfolder.c:1380
+#: ../mail/mail-vfolder.c:1403
 msgid "New Search Folder"
 msgstr "àààà ààà ààààà"
 
@@ -12186,14 +12502,16 @@ msgid ""
 msgstr ""
 "\"{1}\" 'àà ààà àà-àààà ààààà àààààà àà ààààà ààà\n"
 "\n"
-"ààààà àà ààààà ààà ààààààà àà àààà àà, àààà ààà àààà àà ààà ààà ààààà àà àààà àà ààà ààà àà "
+"ààààà àà ààààà ààà ààààààà àà àààà àà, àààà ààà àààà àà ààà ààà ààààà àà àààà "
+"àà ààà ààà àà "
 "àààà ààà"
 
 #: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr "\"{1}\" àà ààààà àààà ààààà àà ààà àààà àà ààà àà {0} ààà àààà ààààà ààààà àà?"
+msgstr ""
+"\"{1}\" àà ààààà àààà ààààà àà ààà àààà àà ààà àà {0} ààà àààà ààààà ààààà àà?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
@@ -12208,7 +12526,8 @@ msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"àààà àààà àà àààà àààà ààà ààà àààà ààààààà àààà ààà àààà àààààà ààà àààà àààààà àààà àààà "
+"àààà àààà àà àààà àààà ààà ààà àààà ààààààà àààà ààà àààà àààààà ààà àààà "
+"àààààà àààà àààà "
 "ààààà ààà ààà àààà ààà"
 
 #: ../mail/mail.error.xml.h:12
@@ -12220,20 +12539,27 @@ msgid "Are you sure you want to delete this account?"
 msgstr "àà ààààà àààààà ààààààà ààààà àà ààààà àà?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "àà ààààà àà àààààà ààààà àà ààààà àà ààà àà àà àà àààààààà ààà àààààà ààààààà àà?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"àà ààààà àà àààààà ààààà àà ààààà àà ààà àà àà àà àààààààà ààà àààààà ààààààà "
+"àà?"
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "àà ààààà àà àààà àààààààà ààà àà ààààààà àààààà ààààà àà ààààà àààà ààààààà àà?"
+msgstr ""
+"àà ààààà àà àààà àààààààà ààà àà ààààààà àààààà ààààà àà ààààà àààà ààààààà "
+"àà?"
 
 #: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "àà ààààà àà àààà àààààààà ààà ààààà \"{0}\" àààààà ààààà àà ààààà àààà ààààààà àà?"
+msgstr ""
+"àà ààààà àà àààà àààààààà ààà ààààà \"{0}\" àààààà ààààà àà ààààà àààà "
+"ààààààà àà?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
@@ -12290,7 +12616,8 @@ msgstr "ààààà ààààà \"{0}\" ààààà àààà à
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "ààà ààààà \"{0}\" ààààà ààà ààààà àààà àà àààà àà, ààààà àà ààààà àààà ààà"
+msgstr ""
+"ààà ààààà \"{0}\" ààààà ààà ààààà àààà àà àààà àà, ààààà àà ààààà àààà ààà"
 
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -12313,8 +12640,10 @@ msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
-"ààààààà àààà \"{0}\" ààà àààà àààà àà àààà àà, ààààà ààààààààà àààààà ààà ààààà àà àààààà "
-"àààà ààà àààà àà ààà ààà ààà àààà àà àààà, àà ààà ààààààà ààà ààààà àààà àààààà"
+"ààààààà àààà \"{0}\" ààà àààà àààà àà àààà àà, ààààà ààààààààà àààààà ààà "
+"ààààà àà àààààà "
+"àààà ààà àààà àà ààà ààà ààà àààà àà àààà, àà ààà ààààààà ààà ààààà àààà "
+"àààààà"
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -12345,7 +12674,8 @@ msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"àààà ààà àà àààààà àààààà àààà àààà àààà ààà àà ààà àààà àà àààààà àààà ààààà ààààààààà "
+"àààà ààà àà àààààà àààààà àààà àààà àààà ààà àà ààà àààà àà àààààà àààà ààààà "
+"ààààààààà "
 "àà, ààààà àààà àààà àààà àààà àààà àààà ààà"
 
 #: ../mail/mail.error.xml.h:43
@@ -12356,113 +12686,167 @@ msgstr "àààààà ààààà ààà àààà"
 msgid "Could not save signature file."
 msgstr "àààààà àààà àààààà àààà àà ààà ààà"
 
-#: ../mail/mail.error.xml.h:45
-msgid ""
-"Default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"A mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-msgstr ""
-"àààààà àààà àààà ààà mbox ààà maildir àààààà àà ààààà ààà ààà àà ààààà àààà ààààààà "
-"àààà ààààààà àà?\n"
-"\n"
-"àààààà mbox ààààà ààà ààààà àà ààà mbox àààààà ààààà ààààààà ààààà àà ààà àààà "
-"àààà ààà àààà àà, àààà ààààààà ààààà àà àààà àà àààà àààààààà ààà ààà ààààààà àà ààààà ààà "
-"àà ààààà ààààààà àààà ààààààà àà ààà àààà ààà ààà àà àààààà ààààà 'à ààà àààààà ààà ààà"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "\"{0}\" ààà ààààà àààààà àààààà àààà"
-
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "ààà àà ààà(_N)"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "àà àààà(_N)"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "ààààààààààà àà ààà(_N)"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "àà ààààà ààààààà ààà àààà ààààààààààà àààà ààààààà àà, àà àà àààààà ààààà àà ààààààààà àà?"
+msgstr ""
+"àà ààààà ààààààà ààà àààà ààààààààààà àààà ààààààà àà, àà àà àààààà ààààà àà "
+"ààààààààà àà?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "àà ààààà àà àààààààà ààà àààààà àààààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "àà ààààà àààààààà ààààààààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "àààààà àààà"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "ààààà ààà ààà àààà ààààà"
 
 #  mail:async-error-nodescribe primary
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "àààààà ààà ààààà ààààà"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "{0} ààààà ààààà"
 
+#: ../mail/mail.error.xml.h:59
+#| msgid ""
+#| "Default local store has been changed from mbox to maildir format. Do you "
+#| "want to migrate now ?\n"
+#| "\n"
+#| "A mbox account will be created to preserve the old mbox folders. You can "
+#| "delete it after ensuring the data is safely migrated. Please make sure "
+#| "there is enough space if you choose to migrate."
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"àààààààà àà àààà ààà àààààà ààà mbox ààà Maildir àààààà àà ààààà ààà ààà "
+"àààààà "
+"àààà ààà ààà àààààààà ààà àààà àààà ààà àààààà ààààààà àààà àààààà ààà"
+"àà ààààà àààà ààààààà àààà ààààààà àà?\n"
+"\n"
+"àààààà mbox ààààà ààà ààààà àà ààà mbox àààààà ààààà ààààààà ààààà àà ààà "
+"àààà àààà ààà "
+"àààà àà, àààà ààààààà ààààà àà àààà àà àààà àààààààà ààà ààà ààààààà àà ààààà "
+"ààà àà ààààà "
+"ààààààà àààà ààààààà àà ààà àààà ààà ààà àà àààààà ààààà 'à ààà àààààà ààà ààà"
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr "àààààààà àà àààà ààà àààààà ààààà ààà ààà"
+
 #: ../mail/mail.error.xml.h:63
-#| msgid "Really unsubscribe from folder \"%s\"?"
+#| msgid "_Download Messages for Offline Usage"
+msgid "Failed to download messages for offline viewing."
+msgstr "àààààà àààà àà àààààà ààààààà ààà àà àààààà"
+
+#: ../mail/mail.error.xml.h:64
+#| msgid "Remove duplicate messages?"
+msgid "Failed to find duplicate messages."
+msgstr "àààààààà àààààà àààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:65
+#| msgid "failed to open book"
+msgid "Failed to open folder."
+msgstr "ààààà àààààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:66
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "àààààà àààààààààà ààààà àà àààà àà àààà ààà ààààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:67
+#| msgid "View image attachments directly in mail messages."
+msgid "Failed to remove attachments from messages."
+msgstr "àààààààà ààà àààààààà ààààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:68
+#| msgid "Unable to retrieve message"
+msgid "Failed to retrieve messages."
+msgstr "àààààà ààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:69
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to save messages to disk."
+msgstr "àààààààà ààà àààà àààà àààààà àà ààààà ààà"
+
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "ààààà ààà àààààà ààààà àà ààààà ààà"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "àààà ààààà ààà àà, àà àà àààà ààààà àààà àà àààà ààà"
 
 #  mail:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "àààà ààààà ààà àà, àà àà àààààà àààà àààà àà"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ààààà '{0}' àààà ààà àà àààààààà àààààà àààà ààà"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "àààà ààààà àààà ààààà ààà ààààà ààààà àààààààà ààà ààà-àààààà àààà àà àààà ààà"
+msgstr ""
+"àààà ààààà àààà ààààà ààà ààààà ààààà àààààààà ààà ààà-àààààà àààà àà àààà ààà"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
-msgstr "àààà ààààà ààààà ààà ààààà ààà, àà ààà àà àà àà-ààààààà àà àààà ààà ààààà àà ààà ààààà àààààà"
+msgstr ""
+"àààà ààààà ààààà ààà ààààà ààà, àà ààà àà àà àà-ààààààà àà àààà ààà ààààà àà "
+"ààà ààààà àààààà"
 
-#: ../mail/mail.error.xml.h:70
-msgid "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "àààà ààààà ààààà ààà ààààà ààà, àà àà àààà àààààà àààà ààà àààà ààààà ààààààà"
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"àààà ààààà ààààà ààà ààààà ààà, àà àà àààà àààààà àààà ààà àààà ààààà ààààààà"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "àààà ààààà àààà àà, àà àààààà àààààà ààààààà ààààà àà ààà ààààà ààààààà"
+msgstr ""
+"àààà ààààà àààà àà, àà àààààà àààààà ààààààà ààààà àà ààà ààààà ààààààà"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12470,163 +12854,179 @@ msgstr ""
 "àààà ààààà àààà àà, àààààà ààààààà ààà àà àààààà ààààààà ààà\n"
 "àààààà àà ààà ààààà ààààààà"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "àààà ààààà àààà àà, àààààà ààààààà ààààà àà ààà ààààà ààààààà"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
-"àààà ààààà ààà àà ààààà, ààà àà àààààà àààà ààà àààà àààà ààààà, àààà ààà àà ààààààà ààà ààà àààà àààà "
+"àààà ààààà ààà àà ààààà, ààà àà àààààà àààà ààà àààà àààà ààààà, àààà ààà àà "
+"ààààààà ààà ààà àààà àààà "
 "àààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "ààààààà"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "àààààààààà ààà"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "ààà àààààà ààààà"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "àààà-ààààà àààààààà àà àààààà àààà àà ààà"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"àà à-ààà ààààà àà àààà BCC àààààà àààà ààà àààà ààà àà àà àààà ààààà ààààà ààà àà ààààà, "
-"àààà ààààà àààà àà, ààà àààà àààààà àààà ààààà àà àààààà àà ààà àààà àà ààààààà àààà-ààà ààà "
+"àà à-ààà ààààà àà àààà BCC àààààà àààà ààà àààà ààà àà àà àààà ààààà ààààà "
+"ààà àà ààààà, "
+"àààà ààààà àààà àà, ààà àààà àààààà àààà ààààà àà àààààà àà ààà àààà àà "
+"ààààààà àààà-ààà ààà "
 "àààààà àààà ààà To: ààà CC: àààà ààààà àààà"
 
-#: ../mail/mail.error.xml.h:81
-#| msgid "Create a new folder for storing mail"
-msgid "Migrate local mbox folders to maildir"
-msgstr "àààà mbox maildir àà ààààààà ààà"
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+#| 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?"
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"ààààààà: ààà ààààà àààà àààààà ààààà ààà àààààààà ààà àààààà àààà ààà ààààà "
+"ààààà àààà àà ààààà "
+"ààààààà\n"
+"àà ààààà àààà ààààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "ààààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "ààà àààà(_e)"
 
 #  mail-composer:recover-autosave title
-#: ../mail/mail.error.xml.h:85
-#| msgid "Unfinished messages found"
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "ààà àààààààà àààààà àààà ààààà"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "ààà àààà àààà àààààà"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "àààà àààà àààà àààààà àààà àà àààà àààà ààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "àààà àààààà àààààà àààà ààà ààà ààààà ààà ààà"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "àààààà àààà ààà ààà ààà ààààà àààààà ààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
-msgstr "ààà: àààà àà àààà à-ààà àààààà àààà ààààà àààà ààà àààà ààààà àààà à-ààà àààààà ààà àààà ààà"
+msgstr ""
+"ààà: àààà àà àààà à-ààà àààààà àààà ààààà àààà ààà àààà ààààà àààà à-ààà "
+"àààààà ààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
-"àà ààààà ààà ààà àà àà àààààà àààà HTML à-ààà àààààà ààà àà ààààà àà ààà àà ààààà "
+"àà ààààà ààà ààà àà àà àààààà àààà HTML à-ààà àààààà ààà àà ààààà àà ààà àà "
+"ààààà "
 "àà àààà àà àà:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "àà ààààà àà àààààà ààà ààà ààà"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "ààààà ààà"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "àààààà àààà ààààà \"{0}\" ààà ààààà ààà àààà àààààà ààà"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "àààààà àààààààààà ààààà àà àààà àà àààà ààà ààààà àààà àà ààà"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "ààààà àààà àà ààààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "àà ààààà ààààà \"{0}\" ààà àà àà àà-ààààà ààà ààààà àà ààààà àààà àà?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ààààà ààà àààààà àà?"
 
-#: ../mail/mail.error.xml.h:100
-#| msgid "Remove the delegate %s?"
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "àààààààà àààààà àààààà àà?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "ààààà àààà(_P)"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "ààà ààààààà ààà àààààààà àà àààààà àà ààààà ààààààà"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "àààààààà àààà ààààà àà?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "àà àààààà-ààààààà ààà àààà ààààà àà?"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "ààààà àààààà àà ààààà àà"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "àà àààààà ààààà àà ààààà ààààà àààààààààà àààà àà?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
-"ààààà ààààà ààààààà àà ààà ààà àà ààààà àà ààà ààààà ààà ààààà, ààà-ààààà ààà àààààà "
+"ààààà ààààà ààààààà àà ààà ààà àà ààààà àà ààà ààààà ààà ààààà, ààà-ààààà ààà "
+"àààààà "
 "àààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12637,11 +13037,13 @@ msgid ""
 msgstr ""
 "ààààà àààà, àà ààààà ààà ààà àà, àààààà àààààà àààà ààà àààààà ààà\n"
 "\n"
-"àà à-ààà ààààà àà àààà BCC àààààà àààà ààà àààà ààà àà àà àààà ààààà ààààà ààà àà ààààà, "
-"àààà ààààà àààà àà, ààà àààà àààààà àààà ààààà àà àààààà àà ààà àààà àà ààààààà àààà-ààà ààà "
+"àà à-ààà ààààà àà àààà BCC àààààà àààà ààà àààà ààà àà àà àààà ààààà ààààà "
+"ààà àà ààààà, "
+"àààà ààààà àààà àà, ààà àààà àààààà àààà ààààà àà àààààà àà ààà àààà àà "
+"ààààààà àààà-ààà ààà "
 "àààààà àààà ààà To: ààà CC: àààà ààààà àààà"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12649,7 +13051,7 @@ msgstr ""
 "àààà ààààà àààààà àààà ààà ààààààà ààà àààààà àààà àààààà àààà àà àààà:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12658,11 +13060,16 @@ msgstr ""
 "{0}"
 
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "ààààààà àààà ààààà ààà ààààààà àààà àààààà ààà"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+#| msgid "Text message part limit"
+msgid "These messages are not copies."
+msgstr "àà àààààà àààà àààà àààà àà ààà"
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12670,274 +13077,312 @@ msgstr ""
 "àà ààààà àààà ààààà àààà àààà àà àààà àà, ààà\n"
 "ààààà àààààà àààà àà àà àà ààà ààààà ààààà ààà, àà ààà àà àààà"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"àà àààààà ààààà àààà àà àààà àà, ààààà ààà àààààà ààà ààààà àààà àà ààà àààà àà, àà ààà "
+"àà àààààà ààààà àààà àà àààà àà, ààààà ààà àààààà ààà ààààà àààà àà ààà àààà "
+"àà, àà ààà "
 "àààà ààà"
 
-#: ../mail/mail.error.xml.h:122
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:130
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "àà àààààà ààààà àààà àà àààà àà, ààààà ààààà ààà àààààà àààà ààààà àà"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "àààà àà àààà àà àààààààà àà ààààà àààà àà ààà àà àààààààààà àà àààà àà àààà ààà"
+msgstr ""
+"àààà àà àààà àà àààààààà àà ààààà àààà àà ààà àà àààààààààà àà àààà àà àààà "
+"ààà"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "àà ààààà ààààà àà àà àà, àà àààààà àààà àà ààà"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "àà ààà àààà ààààà ààà àà àà àààà-ààààà àààà àà àààààà ààààà ààà ààààà àààààà"
+msgstr ""
+"àà ààà àààà ààààà ààà àà àà àààà-ààààà àààà àà àààààà ààààà ààà ààààà àààààà"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "àà ààà àààà ààààà àààà àà àààààà ààààà ààà ààààà àààààà"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "ààààààààà àààà ààà àààà àààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"àà àààààà àà ààààà ààààà ààààààà àààà àà àààà ààà àà àà àà àààà ààààà ààààà ààààà "
+"àà àààààà àà ààààà ààààà ààààààà àààà àà àààà ààà àà àà àà àààà ààààà ààààà "
+"ààààà "
 "ààààà àààà?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "ààààààà àààà ààààà àààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
+#| msgid "Unable to retrieve message"
+msgid "Unable to retrieve message."
+msgstr "àààààà àààààà ààà àà àààààà ààà"
+
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "ààà ààààà(_D)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "ààà ààààà ààààà ààààà àààà?"
 
-#: ../mail/mail.error.xml.h:132
-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?"
-msgstr ""
-"ààààààà: ààà ààààà àààà àààààà ààààà ààà àààààààà ààà àààààà àààà ààà ààààà ààààà àààà àà ààààà "
-"ààààààà\n"
-"àà ààààà àààà ààààà ààààààà àà?"
-
-#: ../mail/mail.error.xml.h:134
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "àà ààààà àààààà ààààà ààà àààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
-"ààààà àààààà àà àààààààà àààà àà ààà àà, àà àà àààààà àààà ààààà ààààà àà, àà àààà àààààà àààà "
+"ààààà àààààà àà àààààààà àààà àà ààà àà, àà àà àààààà àààà ààààà ààààà àà, àà "
+"àààà àààààà àààà "
 "ààà àààà àààà àààà àààà àà ààààààà àà ààà ààà àà ààààà àààà ààààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
-"ààààà àààààà àà àààà àà ààà àà, àà àà àààààà àààà ààààà ààààà àà, àà ààààà àààà àààà ààà àààààààà "
+"ààààà àààààà àà àààà àà ààà àà, àà àà àààààà àààà ààààà ààààà àà, àà ààààà "
+"àààà àààà ààà àààààààà "
 "àààà àà ààà àà, àà àà àààà ààà, àà ààààà àààà ààààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr ""
-"ààààà àààààà àà àààà àà ààà àà, àà àà àà àààààà-ààà àààààà ààà ààààà ààà ààà àà ààààà àààààà "
+"ààààà àààààà àà àààà àà ààà àà, àà àà àà àààààà-ààà àààààà ààà ààààà ààà ààà "
+"àà ààààà àààààà "
 "àà ààà àààà àààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "àà àààà ààààà àà ààààààà àààààà àààààà àààà ààà"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "ààààà àààà ààààà ààààààà ààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "àààààà ààà àà àà-àààà àààààà àà, àà ààààà àààà àààà àà àààà àààà ààààààà àà?"
+msgstr ""
+"àààààà ààà àà àà-àààà àààààà àà, àà ààààà àààà àààà àà àààà àààà ààààààà àà?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "ààààà ààà àààà àà àààààà àààà ààà àààà ààà"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "ààààààà àà ààà ààààà àà ààà àààà àààààà ààà"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "ààààààà ààààà àààà àààààà ààà"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 "ààààààà àààà-ààà ààà àààà àààààààà àààà àààààà ààà\n"
-"ààà ààààà-ààààà ààààà ààà àà ààà/ààà àààà àààà, àààà ààààà ààààà ààà ààààà ààà ààà"
+"ààà ààààà-ààààà ààààà ààà àà ààà/ààà àààà àààà, àààà ààààà ààààà ààà ààààà "
+"ààà ààà"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "àààààà àààà \"{0}\" àààà \"{0}\" àààà ààààà ààààà ààà"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "àààààà(_A)"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "ààà àààààà(_A)"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "àààà(_D)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "àààààààà ààà(_D)"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1054
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Empty Trash"
 msgstr "àààà àààà ààà(_E)"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "àààààààà ààà ààà(_E)"
+
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "àààààà(_E)"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:161
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "àààà ààààààà ààà(_M)"
+
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "àààà(_N) "
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "àààààà àààààà(_O)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "àààà àààà(_S)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "ààààààààààà(_S)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "ààà(_Y)"
 
-#: ../mail/message-list.c:1213
+#  addressbook:remove-addressbook secondary
+#  addressbook:generic-error primary
+#  addressbook:load-error secondary
+#  addressbook:search-error secondary
+#  mail:session-message-info secondary
+#  mail:session-message-info-cancel secondary
+#  mail:session-message-warning secondary
+#  mail:session-message-warning-cancel secondary
+#  mail:session-message-error secondary
+#  mail:session-message-error-cancel secondary
+#  mail:ask-session-password secondary
+#  mail:filter-load-error secondary
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1211
 msgid "Unseen"
 msgstr "àà-àààà"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1212
 msgid "Seen"
 msgstr "àààà"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1213
 msgid "Answered"
 msgstr "àààà ààààà"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1214
 msgid "Forwarded"
 msgstr "àààà àààà"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1215
 msgid "Multiple Unseen Messages"
 msgstr "ààà àà-àààà àààààà"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1216
 msgid "Multiple Messages"
 msgstr "ààà-àààààà"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1220
 msgid "Lowest"
 msgstr "àà ààà ààà"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1221
 msgid "Lower"
 msgstr "ààà"
 
-#: ../mail/message-list.c:1227
+#: ../mail/message-list.c:1225
 msgid "Higher"
 msgstr "ààà"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1226
 msgid "Highest"
 msgstr "àà ààà ààà"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1832 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1839 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ààà %l:%M %p"
 
-#: ../mail/message-list.c:1853
+#: ../mail/message-list.c:1848
 msgid "Yesterday %l:%M %p"
 msgstr "ààààà %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1860
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1873
+#: ../mail/message-list.c:1868
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:1870
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2642
+#: ../mail/message-list.c:2638
 msgid "Select all visible messages"
 msgstr "àààà àààà ààà àààààà àààà"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2796 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "àààààà"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3991
+#| msgid "Follow-Up"
+msgid "Follow-up"
+msgstr "àààà àààà"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4495 ../mail/message-list.c:4914
 msgid "Generating message list"
 msgstr "àààààà àààà àààà àà ààà àà"
 
-#: ../mail/message-list.c:4707
+#: ../mail/message-list.c:4732
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
-msgstr "ààà àààààà àààààà ààà àààààà àààà ààà ààà ààà ààà -> ààà àààà àààà ààààà àààà ààà ààà àààà ààà"
+msgstr ""
+"ààà àààààà àààààà ààà àààààà àààà ààà ààà ààà ààà -> ààà àààà àààà ààààà àààà "
+"ààà ààà àààà ààà"
 
-#: ../mail/message-list.c:4709
+#: ../mail/message-list.c:4734
 msgid "There are no messages in this folder."
 msgstr "àà ààààà àààà ààà àààààà àààà ààà"
 
@@ -12966,7 +13411,7 @@ msgid "Sent Messages"
 msgstr "àààà àààààà"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "àààà"
 
@@ -12975,27 +13420,27 @@ msgid "Subject - Trimmed"
 msgstr "ààààà - àààà àààà"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Body contains"
 msgstr "àààà 'à àà"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Message contains"
 msgstr "àààààà 'à àà"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Recipients contain"
 msgstr "àààààààà 'à àà"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Sender contains"
 msgstr "àààà àààààà 'à àà"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Subject contains"
 msgstr "àààà 'à àà"
 
@@ -13003,91 +13448,99 @@ msgstr "àààà 'à àà"
 msgid "Subject or Addresses contains"
 msgstr "àààà ààà àààà àààààà 'à àà"
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"àà ààà ààà àà ààà àà àà ààààààà àààààà LDAP àààà ààà ààà àààààà, àààà àààààà LDAP àààà "
+"àà ààà ààà àà ààà àà àà ààààààà àààààà LDAP àààà ààà ààà àààààà, àààà àààààà "
+"LDAP àààà "
 "SSL àà ààààà ààààà"
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr ""
-"àà ààà ààà àà ààà àà àà ààààààà àààààà LDAP àààà ààà ààà àààààà, àààà àààààà LDAP àààà "
+"àà ààà ààà àà ààà àà àà ààààààà àààààà LDAP àààà ààà ààà àààààà, àààà àààààà "
+"LDAP àààà "
 "TLS àà ààààà ààààà"
 
-#: ../modules/addressbook/addressbook-config.c:213
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 msgstr ""
-"àà ààà ààà àà ààà àà àà àààààà àààà SSL ààà TLS àà ààààà àààà ààà àààà ààà àà àààààà "
+"àà ààà ààà àà ààà àà àà àààààà àààà SSL ààà TLS àà ààààà àààà ààà àààà ààà àà "
+"àààààà "
 "ààààààà àà-àààààààà àà àà àààà àà ààà ààààà ààààààà àà àààà àà àààà ààà"
 
-#: ../modules/addressbook/addressbook-config.c:612
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "àààààà àà ààààà-ààà àààààà 'à ààààà(_s)"
 
-#: ../modules/addressbook/addressbook-config.c:648
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "àààààà ààààààà àà àààà àààààà àààà ààà(_b)"
 
-#: ../modules/addressbook/addressbook-config.c:756
+#: ../modules/addressbook/addressbook-config.c:778
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
-"àà LDAP àààà àà àà àààà àà, ààà àà ààààààà àààà àà ààààà àà àààà ààà ààà ààààààà àààààà "
-"àà àààà àààààà ààà àààà ààààà ààààààà ààà ààààà àà ààààà àààà àààààààà àààà ààà"
+"àà LDAP àààà àà àà àààà àà, ààà àà ààààààà àààà àà ààààà àà àààà ààà ààà "
+"ààààààà àààààà "
+"àà àààà àààààà ààà àààà ààààà ààààààà ààà ààààà àà ààààà àààà àààààààà àààà "
+"ààà"
 
-#: ../modules/addressbook/addressbook-config.c:830
+#: ../modules/addressbook/addressbook-config.c:857
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"àà àààààààààà ààà àà àà ààààààà àààààà àà ààààààà àààààà àà ààà \"àààà àààààà\" àààààààà "
+"àà àààààààààà ààà àà àà ààààààà àààààà àà ààààààà àààààà àà ààà \"àààà "
+"àààààà\" àààààààà "
 "ààà ààà àààààà ldap àààà àà àààààà ààààà àààààà ààààààà"
 
-#: ../modules/addressbook/addressbook-config.c:905
+#: ../modules/addressbook/addressbook-config.c:937
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 msgstr ""
-"ààà àààà àà àààààààà àààà àà àà ààààààààà ààà àààà ààààà àààààà ààà ààà àààà ààààà "
-"\"sub\" àààà ààà ààà àààà àà ààààà àà àààààà àà àààà àààààà ààà ààààà \"one\" ààà "
+"ààà àààà àà àààààààà àààà àà àà ààààààààà ààà àààà ààààà àààààà ààà ààà àààà "
+"ààààà "
+"\"sub\" àààà ààà ààà àààà àà ààààà àà àààààà àà àààà àààààà ààà ààààà \"one\" "
+"ààà "
 "àààààà àààà ààà ààà àààà ààà àààà àààà ààààààà"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "àààà ààààààà"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ààààà"
 
-#: ../modules/addressbook/addressbook-config.c:1027
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "ààà àààà àà"
 
-#: ../modules/addressbook/addressbook-config.c:1029
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "ààààààà àààà àà àààà àà"
 
-#: ../modules/addressbook/addressbook-config.c:1235
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "àààààà-àààà ààààààààà"
 
-#: ../modules/addressbook/addressbook-config.c:1237
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "àààà àààààà-àààà"
 
@@ -13124,7 +13577,6 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "ààààà ààà àààà àà ààààà, àààà ààààà àààààà ààààà"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#| msgid "The registry of address books"
 msgid "Primary address book"
 msgstr "àààààààà àààààà àààà"
 
@@ -13133,373 +13585,414 @@ msgid "Show autocompleted name with an address"
 msgstr "àààààà ààà ààà-àààà ààà àààà"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#| msgid "Show Animations"
+msgid "Show maps"
+msgstr "ààààà ààààà"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "ààà ààà àààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
-msgstr "\"ààààà\" ààà àà àààà àààà àààà (ààà \"àààààààà\") àààààà àààà àà UID ààà"
+msgstr ""
+"\"ààààà\" ààà àà àààà àààà àààà (ààà \"àààààààà\") àààààà àààà àà UID ààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"ààààà ààààà ààà àààà àà àà ààààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà \"0"
-"\" (àààààà ààà) ààà àààà ààà ààààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) ààà "
+"ààààà ààààà ààà àààà àà àà ààààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà "
+"\"0"
+"\" (àààààà ààà) ààà àààà ààà ààààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) "
+"ààà "
 "àààà ààà ààààà àààà àà ààà ààààà ààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "àà ààà àààààà àà ààààààà ààà àààà àààààà ààà àààà ààà, àààààà àà ààààà ààà"
+msgstr ""
+"àà ààà àààààà àà ààààààà ààà àààà àààààà ààà àààà ààà, àààààà àà ààààà ààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ààà àààààà àààà àààà ààààà ààààà àà URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "àààà ààà àààààà àààà àààà ààààà ààààà àà URI ààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
-msgstr "àà ààààà àààà ààà-àààà ààààà àà ààà ààà ààà àààààà àààààà àà ààààà àààà ààà"
+msgstr ""
+"àà ààààà àààà ààà-àààà ààààà àà ààà ààà ààà àààààà àààààà àà ààààà àààà ààà"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#| msgid "Whether to show the preview pane."
+msgid "Whether to show maps in preview pane."
+msgstr "àà ààà àààà àààà ààààà ààààààà ààà"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 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:161
-#: ../modules/mail/em-mailer-prefs.c:1138
+#: ../modules/addressbook/autocompletion-config.c:184
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "àààà àààà(_ T):"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "ààà-ààààà"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "ààà-àààà àààà ààààà àà àààààà àààààà àààà"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "LDAP àààààà àààà"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "ààààà(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "àààà ààààà àààà"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ààààà àààà(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "àààà ààààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "àààààà-àààà(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "ààà àààààà ààààà àààà"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "ààààà"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "ààààààààà"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "vCard àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "àà ààààààà àà àààà àààà (_p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "àààà àààààà àààà àà ààààà àà àààà ààà ààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "àààààà àààà àààà(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "àààà àààààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "àà ààààààà ààà àààà(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "àààà àààààà àààà àà ààààààà ààà ààààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "àààà àààààà-àààà(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "àààààà-àààà ààààààààà (_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "àààà àààààà àààà àà ààààààààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#| msgid "Address Book"
+msgid "Address Book _Map"
+msgstr "ààààà àààà ààààà(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#| msgid "Copy the contacts of the selected address book to another"
+msgid "Show map with all contacts from selected address book"
+msgstr "àààà ààààà àààà ààà àà ààààà ààà ààààà ààààà"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1204
 msgid "_Rename..."
 msgstr "ààà àààà(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "àààà àààààà àààà àà ààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "àààààà-àààà vC_ard àààà àààààà"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "àààà àààààà àààà àà ààààààà ààà vCard àààà àààààà"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "ààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "ààààààà àààà àààà ààà(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "àààà ààààà ààà àààààà àààà àààà àààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "ààààà àààà(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "ààààà àààà ààà(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "àààà ààà ààààà àààà ààààà àà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "ààààà ààà àààà àààà(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "àààà ààààà ààà àààààà ààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "ààààà àààà àààà(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "àààà ààààà ààà àààààà àààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "àààà ààààà(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "àààà ààààà àààà(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "ààààà àààààà(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "àààààà ààààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "ààààà ààà àààààà àààà(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "àààààà àààà ààààààà àààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1500
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "àààààà(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "_Preview"
 msgstr "ààà(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "àààà(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "àààààààà(_P)"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "vCard àààà àààààà(_S)...."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#| msgid "Address Book"
+msgid "Address Book Map"
+msgstr "àààààà àààà ààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "ààààà ààà(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "ààààà ààà ààààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#| msgid "Show as list"
+msgid "Show _Maps"
+msgstr "ààààà ààààà(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#| msgid "Show contact preview window"
+msgid "Show maps in contact preview window"
+msgstr "ààààà ààà ààààà àààà ààààà ààààà"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Classic View"
 msgstr "àààààà ààà(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "àààààà àààà àà ààààà ààààà ààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "_Vertical View"
 msgstr "ààààààà ààà(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "ààààà àààà àà ààà ààààà ààà àààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "ààà ààààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "àà-ààààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1684
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
-#: ../shell/e-shell-content.c:613
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "àààààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "àà ààààà ààààà ààààà ààààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "ààààà ààà àààà ààààààà àà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "àààà ààààà ààààà ààà"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "àààààà-àààà vC_ard àààà àààààà"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+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:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "vCard àààà àààààà(_S)...."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "àààà ààààà VCard àààà àààààà"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "ààààà àààà àààà(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "ààààà àààà àààà(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "ààààààà ààà àààààà àààà(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "àààà ààà àààààà àààà(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "ààààà ààà àààààà àààà(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "àà vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "%s àà vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "ààààà ààààààà"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s àà ààààà ààààààà"
@@ -13549,7 +14042,8 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"ààà ààààà ààà àààà àààà àààààà àà ààà àà àà, àààà àà ààà àààà ààààà àààà àà àààà ààà àà "
+"ààà ààààà ààà àààà àààà àààààà àà ààà àà àà, àààà àà ààà àààà ààààà àààà àà "
+"àààà ààà àà "
 "àààà àà ààà,  ààà ààà ààà \"àààààà\" àààà ààà ààà àà ààà àààà ààààààà"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -13581,10 +14075,6 @@ msgstr "àààà ààà àààà àààà(_F)"
 msgid "_Login method:"
 msgstr "ààààà ààà(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "àààà(_P):"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "ààà àààà(_S):"
@@ -13593,18 +14083,55 @@ msgstr "ààà àààà(_S):"
 msgid "_Timeout:"
 msgstr "àààà-àààà(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "àààààààà ààààààà ààààà(_U):"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "àààà"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+#| msgid "Failed to apply outgoing filters: %s"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "ààààààààà àààà ààà àà ààààà (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "ààààààààà àà ààààà àààà ààà àààààà ààààà ààà àà ààààà àà: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+"ààààààààà ààà ààà ààààà àà ààà àà ààà ààà àààààà ààà ààààààà ààà àà ààààà àà"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter ààààà"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "ààà ààààà ààà ààààààà 'à àààà(_U)"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#| msgid "Bogofilter Options"
+msgid "Bogofilter"
+msgstr "àààààààààà"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "ààà àààààààà ààà ààààààà 'à àààà"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"àààààà ààààà ààà ààààààà UTF-à ààà ààààààà ààà/àà àààà àààà àààà, àà àà ààààà "
+"àààà àààà ààà àààà ààà"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u ààà %d ààà à-ààà àààààà àààààà ààààà ààà ààààà ààà ààààà àààà ààààààà"
+msgstr ""
+"%u ààà %d ààà à-ààà àààààà àààààà ààààà ààà ààààà ààà ààààà àààà ààààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "(Shown in a Day View)"
@@ -13630,6 +14157,10 @@ msgstr "àà àààà"
 msgid "60 minutes"
 msgstr "àà àààà"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "ààààà"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "ààààààà"
@@ -13651,8 +14182,9 @@ msgid "Display"
 msgstr "ààààààà"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "ààààààààààà ààà àààà ààààà àààà(_n)"
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
+msgstr "àààà ààààààààààà àààà àààà ààààààà àààà(_n)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Hours"
@@ -13663,424 +14195,436 @@ msgid "Minutes"
 msgstr "àààà"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "àà(_u)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "ààààà ààà ààààà ààà ààààà(_r)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "àààà àààà(_c):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "ààààà ààààà àà ààààà àààà"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
+msgstr "ààààààà ààààààààààà àà àààààà àààà"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "ààààààà ààààà(_o)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "ààààààà ààààà(_r)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr "àààà àààà ààààà àààààà àààà ààà ààààà àààà ààààà àà ààà ààààà ààà 'à ààààà(_e)"
+msgstr ""
+"àààà àààà ààààà àààààà àààà ààà ààààà àààà ààààà àà ààà ààààà ààà 'à ààààà(_e)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "ààààà àààà àààà(_n)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "ààà àà ààà(_a):"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "ààà(_h)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "àààààà:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:606
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "àààà"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "àààà-àààààà:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "ààààà àààà àààà ààààà(_y)"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "àààà àààà(_k):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "ààà àààà"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "ààààà ààà:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_àà àààà (àààà/ ààà)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_àà àààà"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "àààààà ààààà àààà ààààà ààààà(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "ààààà ààà àààà àààà-ààà ààààà(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "ààà àààà(_D):"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "àààààà(_F)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "àààààà ààà àà àààà àààà ààà(_H)"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "ààà(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "àààà ààààà ààà(_O):"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "ààààà(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "àààà ààà ààààà ààà àààà àààààà ààààà(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "àààà ààà(_T):"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "àààà(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "àààà(_W)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "àààà ààààà-ààà/àààààà ààà àààààà"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "àà ààààààà ààà àààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ààààà àààà"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "àààààà ààààà àààà ààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "ààà àà ààààà àà ààààààààà ààà, \"#rrggbb\" àààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "ààà àà ààà, ààààà àà àààà ààà ààààà àà, \"#rrggbb\" àààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "àààààà àà ààààà-ààà ààààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "àààààà àà ààààà-ààà ààààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "àààààà àà ààààà-ààà ààààààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "ààààà ààààà àà àààààà"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
+msgstr "ààààààà ààààà àà àààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "àààà àààà àààà àààààà àààà àààà ààààà àà ààà (ààà àààà àà)à"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ààà ààà àààà àààààà àààà àààà àà ààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "ààààà ààà àààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "ààà àààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ààà, ààààà ààà àààààààà àààà àààà ààà ààà ààààà àà, àààààà àà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ààà ààààààà ààà-àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "àààààà ààààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ààà ààààààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "ààààà àààà àààààà ààà àààààà àà ààààààààà"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
+msgstr "ààààààà àààà àààààà àààààà àà ààààààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "ààààà/ààààà àààà URL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "ààààà/àààààà àààààà URL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "àààààà ààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "ààà àààààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "ààà àààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "àààààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "àààààààà ààà ààà ààà ààà àààà, ààààà àààà àààààà àààà à ààà àà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "àààààààà ààà àààà ààà ààà àààà, ààààà àààà àààààà àààà à ààà àà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "àà àààà àààà àààà ààà, àààà ààààà àààà àààà ààà àààà ààààà ààààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "àà àààà àààà àààà ààà, àààà ààààà àààà àààà ààà àààà ààààà ààààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ààà ààà ààà àà àààà ààà àààà àààààà, àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "àààà ààààà àààà"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#| msgid "Last alarm time"
+msgid "Last reminder time"
+msgstr "ààààà ààààààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "ààà ààà àààà ààààà àààà àààà àààà-àààà àà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "ààààà/ààààà ààààààààà àà àààà URL àà àààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "àààààà àààà àààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "àààààà àààà àààà ààà - ààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "àààààà àààà àààà ààà - àààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
-msgstr "'day_second_zones' àààà ààà àààà àà ààààà àààà àààà-àààààà àà àààà-ààà ààààà"
+msgstr ""
+"'day_second_zones' àààà ààà àààà àà ààààà àààà àààà-àààààà àà àààà-ààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ààà àààà àà ààààà àààà àààà-àààààà àà àààà-ààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "àààà ààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "àààà ààà àààà ààààà (ààààààà)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "àààà ààà àààà ààààà (àààààà)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ààà ààà àà àààà ààà ààà, à ààà àà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ààà ààà àà àààà àààà ààà, à ààà àà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "àààààà àààà àà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "ààààà àààà ààààààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 #, fuzzy
 #| msgid "Number of units for determining a default reminder."
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "ààà ààà-àààà àààà àà àààààà àà ààààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "ààà ààà-àààà àààà àà àààààà àà ààààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "ààà àààà ààà àà ààà ààà àà àààààà àà ààààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "àààà ààààà ààà àà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"àààààà àààà àà ààààà ààààà àààà, àà àà àààà àà àààà àààààà ààà ààà àààà àààà ààààà àà, àà "
+"àààààà àààà àà ààààà ààààà àààà, àà àà àààà àà àààà àààààà ààà ààà àààà àààà "
+"ààààà àà, àà "
 "àà ààààà àà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"àààààà àààà àà ààààà ààààà àààà, àà àà àààà àà àààà àààààà ààà ààà àààà àààà ààààà àà, àà "
+"àààààà àààà àà ààààà ààààà àààà, àà àà àààà àà àààà àààààà ààà ààà àààà àààà "
+"ààààà àà, àà "
 "àà ààààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "àààà ààà àààà àà ààààà, àààà ààààà àààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "àààà ààà àààà àà ààààà, àààà ààààà ààààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "àààà ààà àààà àà ààààà, àààà ààààà àààààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
-msgstr "ààààààà àààà àà ààààà, àà àà àààààà àààà ààà àààà àààààààà àààààà àààà àààà àààà ààà"
+msgstr ""
+"ààààààà àààà àà ààààà, àà àà àààààà àààà ààà àààà àààààààà àààààà àààà àààà "
+"àààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"ààààààà àààà àà ààààà ààààààà àààà, àà àà àààà ààà àààà àààààà ààà ààà àààà àààà ààààà àà, "
+"ààààààà àààà àà ààààà ààààààà àààà, àà àà àààà ààà àààà àààààà ààà ààà àààà "
+"àààà ààààà àà, "
 "àààà àà ààààà àààà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"ààààààà àààà àà ààààà ààààààà àààà, àà àà àààà ààà àààà àààààà ààà ààà àààà àààà ààààà àà, "
+"ààààààà àààà àà ààààà ààààààà àààà, àà àà àààà ààà àààà àààààà ààà ààà àààà "
+"àààà ààààà àà, "
 "àààà àà ààààà àààà àà ààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "àààààààà àààààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "àààààààà àààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "àààààààà àààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "ààààà àààà àààà àààà àààà"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
+msgstr "àààààààà, àà àà ààààààà àààà ààààà àà ààààààà ààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "ààà ààà àààà àààà ààààà àààà àààà àààà"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-#| msgid "Recurrence date is invalid"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "ààà-ààà àààà ààààà ààààà"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "ààààààà àààààààà"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "ààààà àààà àà ààààààààà àààààà"
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
+msgstr "ààààààà àààà àà àààààà ààààààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14104,11 +14648,13 @@ msgstr "àààà/ààà/àààààà àààààà ààà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr "àààà àààà ààààà àààààà àààà ààà ààààà àààà ààààà àà ààà ààààà ààà 'à àààààà"
+msgstr ""
+"àààà àààà ààààà àààààà àààà ààà ààààà àààà ààààà àà ààà ààààà ààà 'à àààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "ààààààààààà ààà àààà ààààà àààà"
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
+msgstr "ààààààà ààààààààààà ààà àààà ààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14138,7 +14684,9 @@ msgstr "ààà ààà, ààà ààààà ààà ààà à
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
-msgstr "ààà ààà àààà àààà àààà-àààà ààààà àà àààà àààà àààà àààà 'timezone' ààààà àààà àààà àààà àà"
+msgstr ""
+"ààà ààà àààà àààà àààà-àààà ààààà àà àààà àààà àààà àààà 'timezone' ààààà "
+"àààà àààà àààà àà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
@@ -14160,7 +14708,8 @@ msgstr "ààà àà ààà àà ààà"
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view."
-msgstr "'àààààà' ààà àà àààà àààà àààà (ààà \"àààààààà\") ààààààà àààà àà UID ààà"
+msgstr ""
+"'àààààà' ààà àà àààà àààà àààà (ààà \"àààààààà\") ààààààà àààà àà UID ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
@@ -14180,7 +14729,8 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"ààààà/ààààà àààà àààà àà URL àààààà àààà, %u ààà àààà àààààà àà ààààà àààà ààà %d ààà ààààà ààà "
+"ààààà/ààààà àààà àààà àà URL àààààà àààà, %u ààà àààà àààààà àà ààààà àààà "
+"ààà %d ààà ààààà ààà "
 "ààààà àà ààààà ààààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
@@ -14188,7 +14738,8 @@ msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"àààààà àààà àààà àà àààà àà àààà àà ààà àààà-àààà, ààà àà-àààààà ààààà àààà-àààà ààààààà "
+"àààààà àààà àààà àà àààà àà àààà àà ààà àààà-àààà, ààà àà-àààààà ààààà "
+"àààà-àààà ààààààà "
 "àààà, ààààà àà \"America/New York\" àààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
@@ -14198,7 +14749,8 @@ msgid ""
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 "ààààà ààààà ààà àààà àà àà àààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà \"0"
-"\" (àààààà ààà) ààà àààà ààà àààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) ààà "
+"\" (àààààà ààà) ààà àààà ààà àààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) "
+"ààà "
 "àààà ààà àààà àààà àà ààà ààààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
@@ -14208,7 +14760,8 @@ msgid ""
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 "ààààà ààààà ààà àààà àà àà àààà àààà ààà àààààà ààà àààà ààààà ààààà ààààà \"0"
-"\" (àààààà ààà) ààà àààà ààà àààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) ààà "
+"\" (àààààà ààà) ààà àààà ààà àààà àààà ààààà àààààààà ààà \"1\" (àààààà ààà) "
+"ààà "
 "àààà ààà àààà àààà àà ààà ààààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
@@ -14226,8 +14779,9 @@ msgid "Time divisions"
 msgstr "àààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "àààà àààà ààààà ààààà, àààà àààà(_t)à"
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "àààà àààà ààààààà ààààà, àààà àààà(_t)à"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14238,18 +14792,19 @@ msgid "Twenty four hour time format"
 msgstr "ààààà àààà àààà àààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
-msgstr "àààààà ààà ààààà-ààà ààààààà àà ààààà àà, \"àààà\", \"àààà\" ààà \"ààà\""
+msgstr ""
+"àààààà ààà ààààà-ààà ààààààà àà ààààà àà, \"àààà\", \"àààà\" ààà \"ààà\""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "àààààà ààààààà àà àààààà àà, \"àààà\", \"àààà\" ààà \"ààà\""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "àààà àààà ààà àà àààà àà àààààà, \"àààà\", \"àààà\" ààà \"ààà\""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
@@ -14273,8 +14828,9 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "àààà àààà ààà àà ààà, ààààà (à) ààà àààààààààà (à)à"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "ààààà àààààà àà ààààà àààà àààà ààààà àààà ààà ààà"
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "ààààààà àààààà àà ààààààààààà ààà àààà ààààà àààà ààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14282,14 +14838,15 @@ msgstr "àà ààààààà ààà ààà ààààà àà
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "àà àààààà ààà ààà ààààà àà ààààà ààààà àààà ààà àà"
+msgstr "àà ààààààà ààà ààà ààààà àà ààààà ààààà àààà ààà àà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
-"àà ààààà ààà àààà àààààà ààà ààààà àààà àà ààà àà àààààààààà ààà ààààà ààà ààà ààà àà ààà àà "
+"àà ààààà ààà àààà àààààà ààà ààààà àààà àà ààà àà àààààààààà ààà ààààà ààà "
+"ààà ààà àà ààà àà "
 "àààààà ààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
@@ -14297,7 +14854,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "àà àààà àà ààààà ààà àààà àààà àà àààà ààà ààààààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "àà àààààà àààà àààààà àààà àààà (àààààà àààà àà àààà) àààààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -14313,7 +14871,6 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "àà ààààààà àà ààà ààààààà ààààà àààà ààà ààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-#| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries."
 msgstr "àà àààààà àà ààààà-ààà àà ààà ààààààà ààààà àààà ààà ààà"
 
@@ -14334,7 +14891,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "àà àààà/ààà/àààààà àààààà àààà àààà àààà ààààààà àà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "àà àààà ààààà/ààà àà àààà à àààààà àààà àààààà ààààà"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -14369,424 +14927,437 @@ msgstr "àààààààà àààà àààà"
 msgid "Workday start minute"
 msgstr "àààààààà àààà àààà"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "àààààà(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:343
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "àààààà àààà"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:370
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "ààà àààà àààà"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:380
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "àààààà àààà àààààà ààà(_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:387
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "ààà àààààà(_m)"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "ààààààà àà àààà àààààà"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "àààà àà àààà(_m):"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "àààà àààà(_D):"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
-#: ../modules/calendar/e-cal-shell-migrate.c:192
-#: ../modules/calendar/e-memo-shell-backend.c:98
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
-#: ../modules/calendar/e-task-shell-migrate.c:158
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "àààà àà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../plugins/calendar-weather/calendar-weather.c:120
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "ààà-ààà àà ààà-ààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ààààààà(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "àààà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "àààà ààà àà ààààààà(_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "àààà àààà-ààà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "àààààà(_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "àààà àààààà àà ààààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "àààààà(_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "àààà àààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "àààààà àà ààà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:213
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "àààààà ààà àààà àà ààà àà"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:634
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "àààà àààààà(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:651
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "àààààà àààààà "
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:994
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ààà àààààà ààààààà àà àààà àà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "ààààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
-"àà àààà àààà ààà àààààààà ààààààà ààà ààààà àà ààà ààààààà àààà ààààà àààà ààà ààà, àà ààààààà "
+"àà àààà àààà ààà àààààààà ààààààà ààà ààààà àà ààà ààààààà àààà ààààà àààà "
+"ààà ààà, àà ààààààà "
 "ààà àààààà àààà àà àààààààà"
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "àà ààà àààààààà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "àààààà àà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 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:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
 msgstr "iCalendar àààà àààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "àààà ààà(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "àààààà àààà(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
 msgstr "ààààà àààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "ààààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "àààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "ààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "àààà àààà(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
 msgstr "ààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "àààà àààààà(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "ààààà(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
 msgstr "àààààà ààààààà ààà àààààààà àààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "ààà-àààà(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
 msgstr "àààà àààààà ààààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
 msgstr "àààà àààààà àà ààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "ààààà àà àààààà àà àààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "àààààà àààà àààà ààà(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "ààààààà àààààà(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "ààààààà àààà(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
 msgstr "àààà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "àà ààààààà àààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
 msgstr "àà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "àààààà ààààààààà àààà(_u)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
 msgstr "àà ààààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "àààà àààà ààà àà ààààà(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
 msgstr "àààà àààà ààà àà ààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar àààà àààà àààà(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "àààà àààààà(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
 msgstr "àààà àààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "àààààà àààà àààà(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "àààà ààààààà(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "àà ààààààà ààà ààà àààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "ààààààà àààààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
 msgstr "àààààà ààààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "àààà(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "iCalendar àààà àààààà..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "àààààà àààà àààà(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
 msgstr "ààààààà ààà àààààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "àààààà 'à àààà(_e)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
 msgstr "àààààà ààà ààààààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "ààà ààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "àààà àà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "ààà ààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "ààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "ààà ààà ààààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "ààààà ààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "àààà à ààà àààà ààààààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1698
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "ààààà àààà ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1705
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "ààààà àààà ààààà àà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "àà àààààà ààààà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "ààààà ààà àààà àààààà àà ààà"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+msgid "Save as iCalendar..."
+msgstr "iCalendar àààà àààààà..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 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:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "àààà àààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
 msgstr "ààà àààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "àààà àààààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
 msgstr "ààààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "àààà àààà àààààà(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
 msgstr "ààààà àààà ààààà ààà"
 
@@ -14794,867 +15365,820 @@ msgstr "ààààà àààà ààààà ààà"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "àààà"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "ààà àààà ààà(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "àààààà àààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
 msgstr "àààà ààà ààà àààà àà ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "àà-àààà àààà(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
 msgstr "àààà ààà ààà àààà àà ààààà"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "àààà ààà(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
 msgstr "àààà ààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "ààà àààààà(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
 msgstr "àààà àààà àààà"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "iCalendar àààà àààààà(_S)..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "àààà àààà ààààà ààà"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "ààààà àà àààà àààààà"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "àààà àà àààà(_m):"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "àààà àààà(_D):"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "_Save as iCalendar..."
+msgstr "iCalendar àààà àààààà(_S)..."
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "àààà(_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ààààà àààà(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "àààà ààààà àààà àààà"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "àààà àààà(_s)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
 msgstr "àààà àààà àààà àààà"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "àààà ààà àà àààà àà"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:587
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "àààà àààà àààààà"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:892
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s àààà àààà ààà àààà àà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "àààà ààààà ààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "àààà àààà(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "àààà 'à ààà(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
 msgstr "àààà ààà àààà àààà ààààà àà ààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
 msgstr "àààà àààà àààà(_e)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
 msgstr "àààà àààà àààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "àààà àààà àààà(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
 msgstr "àààà àààà àààà ààààà ààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
 msgstr "àààà àààà àààà àà ààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "àààà àà àààà àààà àààà(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "àààà ààà(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
 msgstr "àààà ààà ààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
 msgstr "àààà àààà àà ààààà àààà ààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
 msgstr "àààà àààà àà ààà àààà ààà àààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "àààà àà àààà ààààà ààà"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
 msgstr "ààààà àààà ààà àààà àààà àà àààà àà ààà"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "àààà àààà"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "àààà àààà"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d àààà"
 msgstr[1] "%d àààà"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d ààààà"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "àààà àààà"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "àààà àààà"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "ààà(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ààààà ààà(_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "àààà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "àààà àààà(_k)"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
 msgstr "àààà àààà àààà àààà"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "àààà ààà àààà àà ààà àà"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:587
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "àààà àààà àààààà"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:892
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s àà àààà àààààà àà ààà àà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "àààà ààààà ààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"àà àààààà ààà àààà àààààà àààààààà ààààà àà àààààà àààààààà àààà ààààà àààà ààààà ààà àà "
+"àà àààààà ààà àààà àààààà àààààààà ààààà àà àààààà àààààààà àààà ààààà àààà "
+"ààààà ààà àà "
 "àààà ààà ààà àà àààààà\n"
 "\n"
 "àà ààààà ààààà àààààà ààà ààààà àà ààààà àà?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:591
+msgid "Do not ask me again"
+msgstr "ààààà ààà àà àààààà"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "àààà àààà(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "àààà 'à ààà(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "àààà ààà àààà àààà ààààà àà ààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "àààà..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "ààà àààà àààà(_e)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
 msgstr "àààà ààà àààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "àààà àààà àààà(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
 msgstr "àààà àààà àààà ààààà ààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
 msgstr "àààà àààà àààà àà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "àà àààà àààà àà àààà(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "ààààà àààà ààààààààà(_k)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
 msgstr "ààààà àààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "àààà ààà(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
 msgstr "àààà ààà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
 msgstr "àààà àààà ààààà àààà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
 msgstr "àààà àààà ààà àààà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "ààààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "ààààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "àààà à ààà àààà àààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "àààà ààààààà àààààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "àààààààà ààà àààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
 msgstr "àààà àààà ààààà ààà"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Preview the list of tasks to be printed"
 msgstr "ààààà àààà ààà àààà àààà àààà àà ààà"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "àààà àààà"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "àààà àààà"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "àààààà"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d àààà"
 msgstr[1] "%d àààà"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "àààà àààà"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "ààààààà àààààà ààààà"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "àààà àààà"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "àààààà àààààà"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d àààààà àààà àààà"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ààà àààà"
-
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "àààà àààààà(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:172
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "ààà àààà ààà àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "àààà ààààà(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:182
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "àààà àààà ààààà àààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:481
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "àààà àààààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "àààà àààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "ààààààà àààà"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "ààààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1047
-#: ../modules/mail/e-mail-shell-view.c:954
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "àààààà àààà(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Disable this account"
 msgstr "àà àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "àà ààààààà ààà àà àààà àààààà àààà ààà àààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
-msgid "C_reate Search Folder From Search..."
-msgstr "ààà ààà ààà ààààà àààà(_r)..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1068
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_Download Messages for Offline Usage"
 msgstr "àààààà àà àààààà ààààààà ààà(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "àààààà ààààà àà àààà àààà àààààà ààà ààààà àà àààààà ààààààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1075
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
 msgid "Fl_ush Outbox"
 msgstr "ààààààà ààààà(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1082
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "_Copy Folder To..."
 msgstr "ààààà àààà àààà ààà(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Copy the selected folder into another folder"
 msgstr "àààà ààààà ààà ààà ààà ààààà àààà àààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Permanently remove this folder"
 msgstr "àà ààààà àààààà àà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1096
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "E_xpunge"
 msgstr "ààààà(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "àà àààà àààààà àà ààààà àààààà ààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Mar_k All Messages as Read"
 msgstr "àà àààààà ààààà àààà(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Mark all messages in the folder as read"
 msgstr "ààààà àààà àà àààààà ààààà àààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Move Folder To..."
 msgstr "ààààà àààà àààà(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Move the selected folder into another folder"
 msgstr "àààà ààààà ààà ààà ààààà àààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_New..."
 msgstr "àààà(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Create a new folder for storing mail"
 msgstr "àààààà àààààà ààà àààà ààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Change the properties of this folder"
 msgstr "àà ààààà àààà àààààààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Refresh the folder"
 msgstr "ààààà ààààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Change the name of this folder"
 msgstr "àà ààààà àà ààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
 msgid "Select Message _Thread"
 msgstr "àààààà ààààà àààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select all messages in the same thread as the selected message"
 msgstr "àààà àààà àà àààà àààààà àààà àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Select Message S_ubthread"
 msgstr "àààààà àà-ààààà àààà(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Select all replies to the currently selected message"
 msgstr "àààààà àààààà àà àà àààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Empty _Trash"
 msgstr "àààà àààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "àà àààààà ààà àààà àààààà ààààà àà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "_New Label"
 msgstr "àààà àààà(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "N_one"
 msgstr "ààà àààà(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Manage Subscriptions"
 msgstr "àààààà ààààà(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ààààà àààà àààà ààààààà àà ààààà ààà ààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Send / _Receive"
 msgstr "àààà / ààà(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Send queued items and retrieve new items"
 msgstr "ààààààà àààààà àààà ààà àààà àààààà àààààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
-#| msgid "_Decline all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "R_eceive All"
 msgstr "àà ààà(_e)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
-#| msgid "Permanently remove all the deleted messages from all accounts"
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Receive new items from all accounts"
 msgstr "àà àààààà ààà ààààà àààààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
-#| msgid "_Send all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Send All"
 msgstr "àà àààà(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
-#| msgid "Send queued items and retrieve new items"
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send queued items in all accounts"
 msgstr "àà àààààà àààà ààààààà àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "ààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Cancel the current mail operation"
 msgstr "àààààà ààà àààààà ààà ààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Collapse All _Threads"
 msgstr "àà ààààà ààààà(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "Collapse all message threads"
 msgstr "àà àààààà ààààà ààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "E_xpand All Threads"
 msgstr "àà ààààà ààààà(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Expand all message threads"
 msgstr "àà àààààà ààààà ààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "_Message Filters"
 msgstr "àààààà ààààà(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Create or edit rules for filtering new mail"
 msgstr "àààà ààà ààà ààààà ààà àà àààà àààà ààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
-msgid "Search F_olders"
-msgstr "ààààà ààà(_o)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
-msgid "Create or edit search folder definitions"
-msgstr "ààà ààààà àààààààà ààà àààà ààà àààà"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
 msgid "_Subscriptions..."
 msgstr "àààààà(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "F_older"
 msgstr "ààààà(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "_Label"
 msgstr "àààà(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
+msgid "C_reate Search Folder From Search..."
+msgstr "ààà ààà ààà ààààà àààà(_r)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
+msgid "Search F_olders"
+msgstr "ààààà ààà(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
+msgid "Create or edit search folder definitions"
+msgstr "ààà ààààà àààààààà ààà àààà ààà àààà"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Folder..."
 msgstr "àààà ààààà(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Show Message _Preview"
 msgstr "àààààà ààà àààà(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Show message preview pane"
 msgstr "àààààà ààà ààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Show _Deleted Messages"
 msgstr "àààà àà àààààà àààà(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Show deleted messages with a line through them"
 msgstr "àààà àà àààààààà ààà àààààà 'à àààà àà àà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Group By Threads"
 msgstr "ààààà ààà ààààà(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Threaded message list"
 msgstr "àààà àààààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Show message preview below the message list"
 msgstr "àààààà àààà àà ààààà àààààà ààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Show message preview alongside the message list"
 msgstr "àààààà àààà àà ààà àààààà ààà àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "All Messages"
 msgstr "àà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
 msgid "Important Messages"
 msgstr "ààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Last 5 Days' Messages"
 msgstr "àààà à ààààà àà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Messages Not Junk"
 msgstr "àà-ààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Messages with Attachments"
 msgstr "àààààààà àààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "No Label"
 msgstr "ààà-àààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1460
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Read Messages"
 msgstr "ààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Recent Messages"
 msgstr "ààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Unread Messages"
 msgstr "àà-ààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Subject or Addresses contain"
 msgstr "àààà ààà àààà àààààà 'à àà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "All Accounts"
 msgstr "àà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Current Account"
 msgstr "àààààà àààààà"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Current Folder"
 msgstr "àààààà ààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "àà àààààà ààà"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "àààààà ààà"
+
+#: ../modules/mail/e-mail-shell-view.c:947
+msgid "Proxy _Logout"
+msgstr "àààààà àààààà(_L)"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " %d ààààà, "
 msgstr[1] " %d àààà, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d àààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ààà"
 msgstr[1] "%d ààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d ààààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d àà-ààààà"
 msgstr[1] "%d àà-àààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ààààà"
 msgstr[1] "%d àààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d àà-ààààà, "
 msgstr[1] "%d àà-ààààà, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d àààà"
 msgstr[1] "%d àààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1107
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "àààà"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1466
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "àààà / ààà"
 
-#: ../modules/mail/e-mail-shell-view.c:564
-msgid "All Account Search"
-msgstr "àà àààààà ààà"
-
-#: ../modules/mail/e-mail-shell-view.c:747
-msgid "Account Search"
-msgstr "àààààà ààà"
-
-#: ../modules/mail/e-mail-shell-view.c:952
-msgid "Proxy _Logout"
-msgstr "àààààà àààààà(_L)"
-
-#: ../modules/mail/em-account-prefs.c:219
-msgid "Evolution Account Assistant"
-msgstr "ààààààà àààààà ààààà"
-
-#: ../modules/mail/em-account-prefs.c:268
-msgid "Account Editor"
-msgstr "àààààà àààààà"
-
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../modules/mail/em-composer-prefs.c:493
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ààà àààà"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "àààà"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "àà àààà"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ààà àààà ààààà"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "àààà àààà ààààà"
 
-#: ../modules/mail/em-mailer-prefs.c:95
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ààààà àààà ààààà"
 
-#: ../modules/mail/em-mailer-prefs.c:177
-msgid "Add Custom Junk Header"
-msgstr "àààà ààà ààààà ààààà"
-
-#: ../modules/mail/em-mailer-prefs.c:185
-msgid "Header Name:"
-msgstr "ààààà ààà:"
-
-#: ../modules/mail/em-mailer-prefs.c:186
-msgid "Header Value Contains:"
-msgstr "ààààà àààà ààààà àà:"
-
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "ààààà"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "àààà ààààà àà"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s àààààà àààààà àà ààà àààààà àààààà ààà"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s àààààà àààààà àààà ààà àààà ààà àà àà ààààà àààààà ààà"
-
-#: ../modules/mail/em-mailer-prefs.c:737
-msgid "No junk plugin available"
-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:1140
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "àààà ààààà(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1032
 msgid "Show _original header value"
 msgstr "àààà ààààà àààà àààà(_o)"
 
@@ -15663,8 +16187,10 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "àààà ààà àà àà àààààààà àààààà àààà àà"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "àà ààà àààà àà àààààààà ààà ààà àààà ààà àà àà àààààà àààà àà ààà ààààà"
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"àà ààà àààà àà àààààààà ààà ààà àààà ààà àà àà àààààà àààà àà ààà ààààà"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
@@ -15675,7 +16201,6 @@ msgid "Click 'Work Online' to return to online mode."
 msgstr "àààààà ààà 'à ààà àà 'àààààà ààà ààà' àààà àààà"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid "Evolution is currently offline due to a network outage."
 msgstr "ààààààà àà àààà ààà