[evolution-data-server] updated Tamil translation



commit 87979859f2d2b51391bb68c6485a0e8e71202593
Author: Dr.T.Vasudevan <agnihot3 gmail com>
Date:   Sat Sep 1 17:39:42 2012 +0530

    updated Tamil translation

 po/ta.po | 4281 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2416 insertions(+), 1865 deletions(-)
---
diff --git a/po/ta.po b/po/ta.po
index 23959e7..0ebfee1 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,1266 +5,1378 @@
 #
 # Jayaradha N <jaya pune redhat com>, 2004.
 # Felix <ifelix25 gmail com>, 2006.
-# Dr.T.Vasudevan <agnihot3 gmail com>, 2007, 2008, 2009, 2010.
+# Dr.T.Vasudevan <agnihot3 gmail com>, 2007, 2008, 2009, 2010, 2012.
 # I. Felix <ifelix redhat com>, 2009.
 # I Felix <ifelix redhat com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-08-31 16:22+0000\n"
-"PO-Revision-Date: 2011-09-09 15:25+0530\n"
-"Last-Translator: I Felix <ifelix redhat com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-31 09:52+0530\n"
+"PO-Revision-Date: 2012-09-01 17:33+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
 "Language-Team: Tamil <kde-i18n-doc kde org>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\\n"
 "\n"
 "\n"
-"X-Generator: Lokalize 1.2\n"
-"Language: ta\n"
+"X-Generator: Lokalize 1.1\n"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1232
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4785
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
+#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:524
+#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../libedataserver/e-client.c:165
+msgid "Unknown error"
+msgstr "ààààààà àààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:141
+#, c-format
+msgid "Failed to remove file '%s': %s"
+msgstr "àààààà ààààààààààà àààààà '%s': %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:164
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:616
+#, c-format
+msgid "Failed to make directory %s: %s"
+msgstr "%s ààààà àààààààààààààà àààààà : %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:459
+#, c-format
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "'%s' àààààààààà ààààààààààà àààààààààààààà àààààà : %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
+msgid "No UID in the contact"
+msgstr "ààààààààà UID ààààà"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:823
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "àààààààààà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:826
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "ààààààààà..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr "àààààààà àààààààà %s ààààà ààà ààààààààààà àààààààààààààà àààààààààààààà"
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:788
+#: ../addressbook/backends/google/e-book-backend-google.c:645
 msgid "Querying for updated contactsâ"
-msgstr "àààààààààààààààààà ààààààààààààààà àààààà..."
-
-#: ../addressbook/backends/google/e-book-backend-google.c:839
-#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1337
-#: ../libedataserver/e-client.c:1851
-msgid "Personal"
-msgstr "ààààààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:841
-#| msgid "Favorites"
-msgid "Friends"
-msgstr "ààààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:843
-#| msgid "Family Name"
-msgid "Family"
-msgstr "ààààààààà"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:845
-msgid "Coworkers"
-msgstr "àà ààààààààààà"
+msgstr "ààààààààààààààààà ààààààààààààààà àààààà..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:924
+#: ../addressbook/backends/google/e-book-backend-google.c:782
 msgid "Querying for updated groupsâ"
-msgstr "àààààààààààààààààà àààààààààààààà àààààà..."
+msgstr "ààààààààààààààààà àààààààààààààà àààààà..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1202
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+msgid "The backend does not support bulk additions"
+msgstr "àààààààà ààààààààà ààààààà ààààààà àààààààààà"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1329
+#: ../addressbook/backends/google/e-book-backend-google.c:1234
 msgid "Creating new contactâ"
 msgstr "ààààà ààààààà àààààààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1433
+#: ../addressbook/backends/google/e-book-backend-google.c:1323
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+msgid "The backend does not support bulk removals"
+msgstr "àààààààà ààààààààà ààààààà ààààààà àààààààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1351
 msgid "Deleting contactâ"
 msgstr "ààààààà àààààààààà..."
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1601
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+msgid "The backend does not support bulk modifications"
+msgstr "àààààààà ààààààà ààààààà ààààààà ààààààà àààààààààà"
+
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1699
+#: ../addressbook/backends/google/e-book-backend-google.c:1639
 msgid "Modifying contactâ"
 msgstr "ààààààà àààààààààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1892
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1809
 msgid "Loadingâ"
 msgstr "àààààààààà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2047
-#| msgid "Authentication Required"
-msgid "Authenticating with the serverâ"
-msgstr "ààààààààààààà ààààààààààààààà..."
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "ààààààààà"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1563
+msgid "Friends"
+msgstr "àààààà"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1564
+msgid "Family"
+msgstr "ààààààààà"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1565
+msgid "Coworkers"
+msgstr "àà ààààààààààà"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "àààààààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "àààààààààà ààààà àààààààààààààààà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "àààààààààà àààààà àààààààààààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr " v3 àààààà v2 ààààààààà ààààààààààà àààààààààà ààààààà àààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ààààààààààààà àààààààà àààààààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "àààààààààààààà ààààà àààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1231
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4784
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr "LDAP àààà 0x%x (%s)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP àààààààààààà ààààààà ààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP  àààààààààààààààààà ààààààà  ààààààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2405
+#, c-format
+msgid "%s: NULL returned from ldap_first_entry"
+msgstr "%s: NULL  ldap_first_entry ààààààààà ààààààààààààààà."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2265
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2456
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr "%s: ààààààààààà àààà ààà %d ààààààààààààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
-msgstr "LDAP àààà àààà ààààààààà ààààààà ààààààààà"
+msgstr "LDAP àààà àààà ààààààààà ààààààà ààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2673
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr "%s: ààààààààààà ààààà àààà ààà %d ààààààààààààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ààà ààààààà àààààà ààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "ààààààà ààààààààààà àààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "àààààààààà ààààààààààà ààààààààà (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:442
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4439 ../calendar/libecal/e-cal-client.c:140
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imapx/camel-imapx-server.c:2250
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
-#: ../libedataserver/e-client.c:152
-msgid "Unknown error"
-msgstr "ààààààà àààà"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
+#, c-format
+msgid "Failed to get the DN for user '%s'"
+msgstr "ààààà '%s' àààà ààààà à ààààààà ààààààààààààà"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
+#, c-format
+msgid "Failed to open addressbook at '%s': %s"
+msgstr " '%s' ààà àààààà àààààààààà àààààà ààààààààààà: %s"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "àààààà '%s' à HTTP ààààààààà àààààààà ààààààààààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3158
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: UID àààà ààààà ààààààà ààààà`%s' gconfàà ààààààààààààààààààà."
+msgid "DELETE failed with HTTP status %d"
+msgstr "ààààààààà HTTP àààà %d ààààà ààààààààààààà"
 
-#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1317
-#: ../libedataserver/e-client.c:1846
-msgid "On This Computer"
-msgstr "àààà ààààààààààààà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+msgid "Contact on server changed -> not modifying"
+msgstr "àààààààààààà ààààààà ààààààààààà ->  ààààààààààà"
 
-#: ../addressbook/libebook/e-book.c:3592
-#: ../addressbook/libebook/e-book-client.c:635
-#: ../addressbook/libedata-book/e-data-book.c:310
-msgid "Address book does not exist"
-msgstr "àààààà àààààààà ààààà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#, c-format
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "ààààààà ààààààààà HTTP àààà %d ààààà ààààààààààààà (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+msgid "Loading Addressbook summary..."
+msgstr "àààààà àààààà ààààààààààà àààààààààà..."
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#, c-format
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr "webdav ààà PROPFIND,  HTTP àààà %d ààààà ààààààààààààà (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+msgid "No response body in webdav PROPFIND result"
+msgstr "webdav PROPFIND àààààààà ààààà ààààààà ààààà."
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#, c-format
+msgid "Loading Contacts (%d%%)"
+msgstr "àààààààààà àààààààààà (%d%%)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+msgid "Cannot transform SoupURI to string"
+msgstr "SoupURI à ààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-book-client.c:85
-#| msgid "No such folder %s"
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ààà ààààà àààààààà ààààà"
 
-#: ../addressbook/libebook/e-book-client.c:87
-#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "ààààààà ààààààààà"
 
-#: ../addressbook/libebook/e-book-client.c:89
-#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "ààààààà àààààà ààà àààààààà àààààà"
 
-#: ../addressbook/libebook/e-book-client.c:91
-#| msgid "No such message"
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "ààà ààààà ààààà ààààà"
 
-#: ../addressbook/libebook/e-book-client.c:93
-#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-book-client.c:449
-#| msgid "Failed to encode data"
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "àààààà àààààààààààà ààààà ààààààààààà"
 
-#: ../addressbook/libebook/e-book-client.c:459
-#: ../addressbook/libedata-book/e-data-book-factory.c:375
-#: ../addressbook/libedata-book/e-data-book-factory.c:433
-#: ../calendar/libecal/e-cal-client.c:565
-#: ../calendar/libedata-cal/e-data-cal-factory.c:395
-#, c-format
-msgid "Invalid source"
-msgstr "àààààà ààààà."
-
-#: ../addressbook/libebook/e-book-client.c:560
-#: ../calendar/libecal/e-cal-client.c:678
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "ààààà uri '%s'"
-
-#: ../addressbook/libebook/e-book-client.c:598
-#| msgid "Failed on message %d"
-msgid "Failed to find system book"
-msgstr "ààààà àààààààààà ààà ààààààààààà"
-
-#: ../addressbook/libebook/e-book-client.c:705
-#: ../calendar/libecal/e-cal-client.c:826
-#, c-format
-#| msgid "%s: there was no source for UID '%s' stored in GConf."
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "UID '%s' ààààà ààààà ààààà ààà ààà ààààààààààààààà ààààààààààààà."
-
-#: ../addressbook/libebook/e-book-client.c:2094
-#: ../calendar/libecal/e-cal-client.c:4132
-#| msgid "Cannot get contact list: %s"
+#: ../addressbook/libebook/e-book-client.c:2244
+#: ../calendar/libecal/e-cal-client.c:4602
 msgid "Cannot get connection to view"
 msgstr "àààààààààààà  ààààààà ààà ààààààààààà"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "àààààààààà ààààààà ID"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "àààà àààà àààààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
-msgid "Book URI"
-msgstr "àààààà(URI)  àààààààà"
+#: ../addressbook/libebook/e-contact.c:128
+msgid "Book UID"
+msgstr "àààààà ààààààà(UID)  "
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#. * so we can set the N property (since evo 1.4 works fine with
+#. * vcards that don't even have a N attribute.  *sigh*)
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "ààààààààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ààààààààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "àààààààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "àààààààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "àààààààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "àààààààààà 4 "
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "àààààààààà ààààààààààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "àààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "àààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "àààà ààààà ààààààààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ààààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "ààààààà àààààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "ààààààààààààààà ààààà ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "àààààà àààààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "àààààààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ààààààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "ààààààà àààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ààààààà àààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "àààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "àààààààààà àààààà(URI)"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ààààà/ààààààà àààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà àààààà"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "àààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM Home Screen Name 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM Home Screen Name 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM Home Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM Work Screen Name 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM Work Screen Name 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM Work Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààààà àààà àààààà àààààààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààààà àààà àààààà àààààààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààààà àààà àààààà àààààààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààààà àààà àààà àààààààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààààà àààà àààà àààààààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààààà àààà àààà àààààààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "ààààà(Jabber) àààà àààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "ààààà(Jabber) àààà àààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "ààààà(Jabber) àààà àààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "ààààà(Jabber) àààà àààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "ààààà(Jabber) àààà àààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "ààààà(Jabber) àààà àààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "àààà!(Yahoo!) àààà àààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "ààààààààà(MSN) àààà àààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "ààààààààà(MSN) Home Screen Name 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "ààààààààà(MSN) Home Screen Name 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "ààààààààà(MSN) àààà àààà àààà1 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "ààààààààà(MSN) àààà àààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "ààààààààà(MSN) àààà àààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ààààààà(ICQ) àààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ààààààà(ICQ) àààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ààààààà(ICQ) àààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ààààààà(ICQ) àààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ààààààà(ICQ) àààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ààààààà(ICQ) àààà ààà 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ààààà ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:233
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ààààà àààààà àààààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "àààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "àààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "àààà ààààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "ààà àààààààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:248
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "àààààààààà àààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM àààà ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "àààààààààà  ID  àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "ààààààà ID àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "àààà! àààà ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "ààààààààà(MSN) àààà ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ààààààà(ICQ) ID àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML àààààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:262
-msgid "List Show Addresses"
-msgstr "ààààààààààà àààààààà àààààà"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+msgid "List Shows Addresses"
+msgstr "ààààààààà àààààààà ààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "àààààààààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "àààà-àààà(IGadu-Gadu) àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "àààà-àààà(IGadu-Gadu)  àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "àààà-àààà(IGadu-Gadu) àààà ID  3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "àààà-àààà(IGadu-Gadu)  àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "àààà-àààà(IGadu-Gadu) àààà ID  2"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "àààà-àààà(IGadu-Gadu) àààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "àààà-àààà(IGadu-Gadu) ID àààààààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ààààààààà àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "àààààààà "
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype àààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype àààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype àààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype ààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype ààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype ààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Skype ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP àààààà"
 
-#: ../addressbook/libebook/e-contact.c:293
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "àààààà àààà  ààààààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:294
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "àààààà àààà  ààààààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:295
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "àààààà àààà  ààààààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:296
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "àààààà àààà  ààà ààààà 1"
 
-#: ../addressbook/libebook/e-contact.c:297
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "àààààà àààà  ààà ààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:298
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "àààààà àààà  ààà ààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:299
-#| msgid "Skype Name List"
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "àààààà àààà ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:1550
-#: ../addressbook/libebook/e-destination.c:868
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "ààààààààà ààààà àààààààà"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "àààààààààà àààààààà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "ààààààààààà ààààààààààà, àààààà àààààààà àààààààààà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:92
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
-#| msgid "Unknown error: %s"
 msgid "Unknown book property '%s'"
 msgstr "ààààààà àààààà ààààà '%s'"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
-#| msgid "Cannot create folder '%s': %s"
 msgid "Cannot change value of book property '%s'"
 msgstr "àààààà ààààà '%s' ààààààà ààààà ààààààààààà"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
-#: ../camel/camel-db.c:470
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "àààààààà ààààààààà "
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "ààààààà  '%s'  à ààààààààà"
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../addressbook/libedata-book/e-data-book.c:209
-#: ../addressbook/libedata-book/e-data-book.c:694
-#| msgid "Invalid query: %s"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "ààààà àààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4407 ../calendar/libedata-cal/e-data-cal.c:415
-#: ../libedataserver/e-client.c:111
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4001 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "àààààààà àààà àààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ààààààà ààààààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4421 ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:125
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4015 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "àààààà àààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "àààààà ààààààààààààà ààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
 msgstr "àààààà ààààààààààààà  àààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "ààààààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:133
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "ààààààààààà ààààà àààààààà ààààààààà "
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:135
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "àààààààà (TLS) ààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "àààààà àààààààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "àààààààà ààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "ààààààààààà àààààààà  àààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "àààà àààà àààààà ààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "àààà ààààà àààààà ààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "àààààààààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:143
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "àààààà àààààààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:129
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "ààààà ààààà àààààààà"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "ààààà àààààà ààààààà "
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4405 ../calendar/libedata-cal/e-data-cal.c:438
-#: ../libedataserver/e-client.c:109
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3999 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "ààààà àààààà"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:440
-#: ../libedataserver/e-client.c:131
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ààààà ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
-#| msgid "Backend is busy"
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "àààààààà àààààà àààààààààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:332
-#: ../calendar/libecal/e-cal-client.c:573
-#: ../calendar/libedata-cal/e-data-cal.c:449 ../libedataserver/e-client.c:147
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:619
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "àààà àààà"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:536
-#: ../addressbook/libedata-book/e-data-book.c:866
-#| msgid "Cannot get contact: %s"
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "ààààààà ààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
-#: ../addressbook/libedata-book/e-data-book.c:580
-#| msgid "Empty query: %s"
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "àààààà àààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:602
-#: ../addressbook/libedata-book/e-data-book.c:932
-#| msgid "Cannot add contact: %s"
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "ààààààà ààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:624
-#: ../addressbook/libedata-book/e-data-book.c:951
-#| msgid "Cannot modify contact: %s"
-msgid "Cannot modify contact: "
-msgstr "ààààààà ààààà ààààààààààà: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:717
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#| msgid "Cannot authenticate user: %s"
-msgid "Cannot authenticate user: "
-msgstr "ààààà ààààààààààà ààààààààààà:"
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
+msgid "Cannot modify contacts: "
+msgstr "àààààààààà ààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:779
-#| msgid "Cannot open book: %s"
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "àààààààààà àààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:793
-#| msgid "Cannot remove book: %s"
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "àààààààààà ààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:818
-#| msgid "Cannot refresh calendar: %s"
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "àààààà àààààààààà ààààààààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:834
-#| msgid "Cannot create calendar object: %s"
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "àààààààà ààààà ààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:850
-#: ../calendar/libedata-cal/e-data-cal.c:1001
-#| msgid "Cannot send calendar objects: %s"
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "àààààààà ààààà àààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:881
-#| msgid "Cannot get contact list: %s"
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "ààààààà àààààààà àààààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:905
-#| msgid "Cannot get contact list: %s"
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "uids ààààààà àààààààà àààààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:969
-#| msgid "Cannot remove contacts: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "àààààààààà ààààà ààààààààààà:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:359
-#: ../addressbook/libedata-book/e-data-book-factory.c:392
-#: ../calendar/libedata-cal/e-data-cal-factory.c:410
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "ààààà  '%s' àà àààààààààà ààààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "ààààà '%s' ààà ààààà ààààààààà ààààà '%s'"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "ààà UID ààààààààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-msgid "Empty URI"
-msgstr "àààààà àààààà"
+msgid "No such source for UID '%s'"
+msgstr "UID '%s' àààà ààà ààààà ààààà ààààà"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "àààààààààà àààà ààààààààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "ààààààààà ààààààààààà ààà ààààààààààààà àààààààààà àààààà: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+"SSL ààà ààààààààààà ààà ààààààààààààà àààààààà àààààààààààààà. ààààààààà ààààà "
+"ààààààààààà àààààààààààààà àààààà ààà ààààààà àààààààààààààà. àààààààà ààààà "
+"ààààààààààààà ààààààààààà àààààààààààààà ààààà ààààààà ààààà àààààààààà àààà àààààààààà "
+"àààààààààààààà àààààà 'ààààà SSL àààààààààà àààààààà' àààà ààààààààààà àààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
 #, c-format
-#| msgid "Unexpected HTTP status code %d returned"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "àààààààààà HTTP àààà àààààààà %d ààààààààààààààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
+msgid "CalDAV backend is not loaded yet"
+msgstr "àààààààà àààààààà àààààà àààààààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+msgid "Invalid Redirect URL"
+msgstr "ààààààà ààààààààààààààààààà  àààààà(URI) "
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
-"àààààààààà àààà ààààààààààà, ààààààà-ààààààà àààààààà àààààààààà "
-"àààààààààààààà.\n"
+"àààààààààà àààà ààààààààààà, ààààààà-ààààààà àààààààà àààààààààà àààààààààààààà.\n"
 "àààà àààààà: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2639
+msgid "Cannot create local store"
+msgstr "àààààà àààààààààààààààà àààààààà ààààààààààà:"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2648
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "àààààà ààààààààà ààààà   '%s' à àààààààà ààààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2659
+msgid "Could not create synch slave thread"
+msgstr "àààààààà àààà ààààà àààààààà ààààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3671
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV àààààààà ààààààààà àààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3773
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV àààààààà ààààààà ààààààà àààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3941
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV àààààààà ààààààààà àààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4600
 msgid "Calendar doesn't support Free/Busy"
 msgstr "àààààààààà ààààà/àààààààà à ààààààààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4608
+msgid "Schedule outbox url not found"
+msgstr "àààààààà àààààà  ààà ààààààààà àààààààà à ààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4707
+msgid "Unexpected result in schedule-response"
+msgstr "ààààà àààààààà àààààààààààà àààààààààà ààààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "àààààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "àààààà àààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ààààààààà: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ààààà àààààà(URI) àààààààààà àààà ààààààà àààààààà : "
 
+#: ../calendar/backends/file/e-cal-backend-file.c:242
 #: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "àààààààààà àààà ààààààà àààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:482
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "ààààààà URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:543
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ààààààà àààààà(URI) àààà àààà ààààààààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:443
+#: ../calendar/backends/http/e-cal-backend-http.c:580
+#, c-format
 msgid "Bad file format."
 msgstr "àààààà àààààà ààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:450
+#: ../calendar/backends/http/e-cal-backend-http.c:590
+#, c-format
 msgid "Not a calendar."
 msgstr "àààààààààà ààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:764
-#: ../calendar/backends/http/e-cal-backend-http.c:765
-#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+#: ../calendar/backends/http/e-cal-backend-http.c:886
+#: ../calendar/backends/http/e-cal-backend-http.c:890
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "àààààààà àààààà àààààààà ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "àààààà àààààà àààààà àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "àààààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "àààààà: ààà ààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "àààààà: ààà ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "àààààà: àààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "àààààà: ààààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "àààààà: àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "àààààà: ààààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "àààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "àààààà: ààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:439
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal.c:867 ../libedataserverui/e-book-auth-util.c:198
-#: ../libedataserverui/e-book-auth-util.c:417
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s àààà àààààààààààà àààààààààà (ààààà %s)"
-
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:881
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s ààààààààà ààààààà ààààààààààà %sàààà àààààààààààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:4409
+#: ../calendar/libecal/e-cal.c:4003
 msgid "Repository is offline"
 msgstr "ààààààà ààààààààààààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4411 ../calendar/libecal/e-cal-client.c:127
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "àààààà ààà àààààààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4413 ../calendar/libecal/e-cal-client.c:129
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal.c:4007 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "àààààà ààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4415 ../calendar/libecal/e-cal-client.c:131
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:4009 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "àààààà ààààààà"
 
-#: ../calendar/libecal/e-cal.c:4417
+#: ../calendar/libecal/e-cal.c:4011
 msgid "URI not loaded"
 msgstr "àààààà(URI) àààààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4419
+#: ../calendar/libecal/e-cal.c:4013
 msgid "URI already loaded"
 msgstr "àààààà(URI) àààààààà àààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4423
+#: ../calendar/libecal/e-cal.c:4017
 msgid "Unknown User"
 msgstr "ààààààààààààà ààààààààààààà "
 
-#: ../calendar/libecal/e-cal.c:4425 ../calendar/libecal/e-cal-client.c:135
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:4019 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "ààààààà ID àààààààà ààààààààààààà àààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4427
+#: ../calendar/libecal/e-cal.c:4021
 msgid "Protocol not supported"
 msgstr "àààààààààààà ààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4429
+#: ../calendar/libecal/e-cal.c:4023
 msgid "Operation has been canceled"
 msgstr "ààààààààà ààààà ààààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4431
+#: ../calendar/libecal/e-cal.c:4025
 msgid "Could not cancel operation"
 msgstr "ààààààààààà ààààà ààààà ààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4433 ../libedataserver/e-client.c:117
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "ààààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4435
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-#: ../libedataserver/e-client.c:119
+#: ../calendar/libecal/e-cal.c:4029
+#: ../camel/providers/smtp/camel-smtp-transport.c:857
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "àààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4437
+#: ../calendar/libecal/e-cal.c:4031
 msgid "A D-Bus exception has occurred"
 msgstr "ààà ààààà(DBUS) àààà ààààààààà"
 
-#: ../calendar/libecal/e-cal.c:4441
+#: ../calendar/libecal/e-cal.c:4035
 msgid "No error"
 msgstr "àààà ààààà"
 
-#: ../calendar/libecal/e-cal-client.c:133
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "ààààààà ààààà "
 
-#: ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:418
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "àààààààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal-client.c:555
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "àààààààààà àààààààààààà ààààà ààààààààààà"
 
-#: ../calendar/libecal/e-cal-client.c:717
-#| msgid "Failed to encode data"
-msgid "Failed to find system calendar"
-msgstr "ààààà àààààààààààà ààà ààààààààààà"
-
-#: ../calendar/libecal/e-cal-client.c:755
-#: ../calendar/libedata-cal/e-data-cal.c:428
-msgid "Calendar does not exist"
-msgstr "àààààààààà ààààààààà ààààà."
-
-#: ../calendar/libecal/e-cal-client.c:865
-#| msgid "Invalid source"
-msgid "Invalid source type"
-msgstr "ààààà ààà ààà"
-
-#: ../calendar/libecal/e-cal-component.c:1298
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "àààààààààààà ààà àààààààà"
 
@@ -1392,120 +1504,128 @@ msgstr "30 àààà"
 msgid "31st"
 msgstr "31 àààà"
 
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
-#| msgid "High"
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
-#| msgid "Normal"
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
-#| msgid "Low"
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "ààààààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:702
-#| msgid "Undefined"
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
-#| msgid "Cannot remove calendar object: %s"
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "ààààààààààà ààààààààààà, àààààààààà àààààààààà àààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:207
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
-#| msgid "Unknown error: %s"
 msgid "Unknown calendar property '%s'"
 msgstr "ààààààà àààààààààà ààààà '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:219
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
-#| msgid "Cannot create calendar object: %s"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "àààààààààà ààààà '%s' ààààààà ààààà ààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" àààààààà àààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ààà àààààààà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ààààà àààààà ààààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr ""
-"\"%s\" ààààà àààààà ISO 860 àààà/ààà ààààà àààààà àààààààà àà àààààààààààààààà"
+msgstr "\"%s\" ààààà àààààà ISO 860 àààà/ààà ààààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" àààààà ààààààààààà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ààààà àààààà time_t ààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ààààààààà àààààà  àààààààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#, c-format
+msgid "\"%s\" expects two or three arguments"
+msgstr "\"%s\" àààààà  àààààà àààààà ààààààààààà àààààààààààààààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ààààààààà àààààà time_t ààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, c-format
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "\"%s\" ààààà àààààà ààààààààà àààààààà àààààààààààààààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, c-format
+msgid "\"%s\" expects none or two arguments"
+msgstr "\"%s\" ààààààà àààààà àààààà ààààààààààà àààààààààààààààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ààààààààà àààààà àààààà àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1513,205 +1633,178 @@ msgid ""
 "\"classification\""
 msgstr ""
 "\"%s\" ààààà àààààà \"any\", \"summary\", àààààà\"description\", àààààà "
-"\"location\" àààààà \"attendee\", àààààà \"organizer\", àààààà "
-"\"classification"
+"\"location\" àààààà \"attendee\", àààààà \"organizer\", àààààà \"classification"
 "\" àà àààààà àààààààà àà àààààààààààààààà."
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ààà ààààààààààà àààààà àààààààà àà àààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" ààààà ààààààààààààà ààààààà àààààà ààà ààà àààààà ààààààà ààààààà "
-"ààààààà "
+"\"%s\" ààààà ààààààààààààà ààààààà àààààà ààà ààà àààààà ààààààà ààààààà ààààààà "
 "ààààààà(#f) àààààà àààààààà àà àààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "ààààà àààààà àààààà"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "àààààààààà ààààààààà ààààà."
+
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:909
-#| msgid "Cannot open calendar: %s"
 msgid "Cannot open calendar: "
 msgstr "àààààààààààà àààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:930
-#| msgid "Cannot remove calendar: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "àààààààààààà ààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:955
-#| msgid "Cannot refresh calendar: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "àààààààààààà ààààààààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:979
-#| msgid "Cannot retrieve calendar address: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "àààààààà ààààà ààààààààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1025
-#| msgid "Cannot retrieve calendar object path: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "àààààààààà àààààà àààààà ààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1050
-#| msgid "Cannot retrieve calendar object list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "àààààààààà àààààà àààààààà ààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
-#| msgid "Cannot retrieve calendar free/busy list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "àààààààààà àààààà/ààààààààà àààààààà ààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1101
-#| msgid "Cannot create calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "àààààààààà àààààà àààààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
-#| msgid "Cannot modify calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "àààààààààà àààààà àààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1156
-#| msgid "Cannot remove calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "àààààààààà àààààà ààààà ààààààààààà : "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1179
-#| msgid "Cannot receive calendar objects: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "àààààààààà ààààààààà ààà ààààààààààà :"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1204
-#| msgid "Cannot send calendar objects: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "àààààààààà  ààààààààà àààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1231
-#| msgid "Could not retrieve attachment list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "ààààààà uris à ààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1255
-#| msgid "Could not store folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "àààààààààààà àààààààààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1279
-#| msgid "Could not retrieve calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "àààààààààà àààààà àààààà ààà ààààààààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1304
-#| msgid "Could not retrieve calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "àààààààààà ààà ààààààààà ààààààààààà ààààààààààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1326
-#| msgid "Could not add calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "àààààààààà ààà ààààààààà ààààààà ààààààààààà: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
-#| msgid "Invalid range"
 msgid "Invalid call"
 msgstr "ààààà ààààààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:424
-#, c-format
-msgid "Invalid URI"
-msgstr "ààààààà àààààà"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr " '%s' ààà '%s' àààà àààààààààà àààààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:485
-#, c-format
-msgid "Could not instantiate backend"
-msgstr "àààà  àààààààà àààààà ààààààààààà"
-
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ààààààààà àààààààààààààà ààààà ààààà"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ààààààààà ààà ààààààààààààà ààààà ààààà"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ààààààààà àààààààààààààààààààààà ààààà ààààà"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ààààààààà ààààààà àààààààààààààà ààààà ààààà"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ààààààààà àààààààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ààààààààà àààààààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "àààààààà àààààà"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "àààààà ààààààààààààààààààààààà"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "àààààà ààààààà ààààààà ààààààààààààààà"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "àààààààà ààààààà àààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-data-cache.c:495
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "àààààààà àààààààà àààààààààà"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "àààààààà ààààààà ààààà ààààà ààààààààààà: %s: %s"
 
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1722,8 +1815,8 @@ msgstr ""
 "ààà ààààà ààààààààà ààààààààà àààààààà ààààààà àààà \n"
 "àààààààà ààààà àààààààà."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:300
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1734,176 +1827,184 @@ msgstr ""
 "%s\n"
 "àààà ààààààà àààààààààààà àààààààààà àààààààààààààà àààààààà"
 
-#: ../camel/camel-disco-diary.c:304
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "ààààààà àààààààà ààààààààà àààààààààà"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "àààààààààà àààààààà àààà ààààà ààààà àààààààà ààààààààààà ààààààààà"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààààààààààààààà ààààààààà '%s' ààààà àààààààààà"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
-msgstr "àààààààààà àààààààà àààà ààààà ààààà àààààà ààààààààà ààààààààààààà"
-
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1153
-#: ../camel/providers/imap/camel-imap-store.c:1925
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imap/camel-imap-store.c:3171
-#: ../camel/providers/imapx/camel-imapx-folder.c:311
-#: ../camel/providers/imapx/camel-imapx-folder.c:344
-#: ../camel/providers/imapx/camel-imapx-folder.c:398
-#: ../camel/providers/imapx/camel-imapx-folder.c:444
-#: ../camel/providers/imapx/camel-imapx-folder.c:478
-#: ../camel/providers/imapx/camel-imapx-folder.c:518
-#: ../camel/providers/imapx/camel-imapx-folder.c:554
-#: ../camel/providers/imapx/camel-imapx-store.c:238
-#: ../camel/providers/imapx/camel-imapx-store.c:1278
-#: ../camel/providers/imapx/camel-imapx-store.c:1366
-#: ../camel/providers/imapx/camel-imapx-store.c:1412
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
+msgid "Copy folder content locally for _offline operation"
+msgstr "_o àààààààààà àààààààà àààà ààààà ààààààà àààààààààààà ààààààààà ààààààààààààà"
+
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
+#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
+#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
+#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
+#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:276
+#: ../camel/camel-imapx-store.c:1390 ../camel/camel-imapx-store.c:1479
+#: ../camel/camel-imapx-store.c:1528
+#: ../camel/providers/imap/camel-imap-store.c:1268
+#: ../camel/providers/imap/camel-imap-store.c:2030
+#: ../camel/providers/imap/camel-imap-store.c:2502
+#: ../camel/providers/imap/camel-imap-store.c:3265
+#: ../camel/providers/pop3/camel-pop3-folder.c:524
+#: ../camel/providers/pop3/camel-pop3-folder.c:654
+#: ../camel/providers/pop3/camel-pop3-folder.c:844
+#: ../camel/providers/pop3/camel-pop3-folder.c:1046
+#: ../camel/providers/pop3/camel-pop3-store.c:408
+#: ../camel/providers/pop3/camel-pop3-store.c:831
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "àààà ààààà ààààààà ààààààààààà àààà"
 
-#: ../camel/camel-file-utils.c:722
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ààààààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
+#: ../camel/camel-filter-driver.c:897 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àààà ààààà àààààààààààààà àààààà '%s': %s"
 
-#: ../camel/camel-filter-driver.c:866
+#: ../camel/camel-filter-driver.c:945
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ààààààà àààààà ààààààà  %s: àààààààà ààààààààààà %s"
 
-#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
+#: ../camel/camel-filter-driver.c:1141 ../camel/camel-filter-driver.c:1148
 msgid "Syncing folders"
 msgstr "àààààààà àààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
+#: ../camel/camel-filter-driver.c:1242 ../camel/camel-filter-driver.c:1707
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "àààààààààà ààààààààà àààà àààà : %s: %s"
 
-#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
+#: ../camel/camel-filter-driver.c:1253 ../camel/camel-filter-driver.c:1718
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààààààààà àààààààà àààà àààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258
+#: ../camel/camel-filter-driver.c:1349
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "àààààà ààààà àààààà ààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1361
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "àààààà ààààà ààààààààààà ààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1379
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) àààààààà ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1386 ../camel/camel-filter-driver.c:1408
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d àààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
+#: ../camel/camel-filter-driver.c:1423 ../camel/camel-filter-driver.c:1529
 msgid "Syncing folder"
 msgstr "ààààà àààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1535
 msgid "Complete"
 msgstr "ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1396
+#: ../camel/camel-filter-driver.c:1487
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d àààà %d àààààààà ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1414
+#: ../camel/camel-filter-driver.c:1505
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àààà %d àààààààà àààààààààà àààààà"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "àààààààà àààààààààà àààà"
 
-#: ../camel/camel-filter-search.c:403
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "ààààààà àààààà (system-flag)"
 
-#: ../camel/camel-filter-search.c:418
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "ààààààà àààààà (user-tag)"
 
-#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
+#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "àààààààà ààààà àààààààà àààà àààà : %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ààà ààààà àààààà àààààààà àààààààààààà àààààà"
 msgstr[1] "'%s' ààà ààààà àààààà ààààààààà àààààààààààà àààààà"
 
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ààà ààààà àààà àààààà àààààààà àààààààààààà àààààà"
 msgstr[1] "'%s' ààà ààààà àààà àààààà ààààààààà àààààààààààà àààààà"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ààà ààààà àààààààà ààààààààààààà"
 msgstr[1] "'%s' ààà ààààà ààààààààà ààààààààààààà"
 
-#: ../camel/camel-folder.c:898
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "ààààààààà ààààààààààààà"
 
-#: ../camel/camel-folder.c:901
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ààààààààà àààààààààààààà"
 
-#: ../camel/camel-folder.c:1156
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "àààààààà '%s' ààààà ààààààààà ààààààààà ààààààààààààààà"
 
-#: ../camel/camel-folder.c:3265
+#: ../camel/camel-folder.c:3371
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "'%s' ààààà àààààààààà"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
-#| msgid "Retrieving POP message %d"
 msgid "Retrieving message '%s' in %s"
 msgstr "'%s' ààà %s àààààààà ààààààààààààààà"
 
-#: ../camel/camel-folder.c:3390
+#: ../camel/camel-folder.c:3753
 #, c-format
-#| msgid "Fetching summary information for new messages in %s"
 msgid "Retrieving quota information for '%s'"
 msgstr "'%s' ààààà àààààààààààààà ààààààààà ààààà"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder.c:3985
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "'%s' ààààà ààààààààààààààà"
+
+#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1912,8 +2013,7 @@ msgstr ""
 "ààà ààààà àààààààà àààààà àààààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1923,47 +2023,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àààà ààà ààà ààààààà àààà àààààààààààààà"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:941
+#: ../camel/camel-folder-search.c:932
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) à %s ààààà ààààààààààà ààààààà àààààà ààààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ààààààààààààà ààààààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:984
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ààà àààà àààààààààààààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:994
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s)  ààààà àààààà ààààààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
-#: ../camel/camel-gpg-context.c:1272
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpgàà ààààà ààààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Unknown"
 msgstr "àààààààà"
 
-#: ../camel/camel-gpg-context.c:711
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1974,17 +2074,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:728
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg ààààààààààà àààààà ààà àààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg àààààààààà àààààààààà àààààààà àààààààààààààà"
 
-#: ../camel/camel-gpg-context.c:789
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1993,7 +2093,7 @@ msgstr ""
 "ààààààà àààààààààààààà àààààà \n"
 "àààààà àààààààààà àààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2002,85 +2102,356 @@ msgstr ""
 "àààà ààààààààà àààààà àààààà àààààààààà àààà \n"
 ": \"%s\""
 
-#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' àààà àààààààà àààààààààà àààààààààà àààààààààà"
 
-#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4962
-#: ../camel/providers/imapx/camel-imapx-server.c:4979
-#: ../camel/providers/imapx/camel-imapx-store.c:159
-#: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../libedataserver/e-client.c:127 ../libedataserverui/e-book-auth-util.c:221
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"ààààààààààà ààààààààààà àààààààààààààà ààààààà àààààà ààààà ààààà àààààà ààààààààà ààààààààà, "
+"àààà ààààààààààààààààà ààààààà ààààààààà ààààààààààààà àààààààààà àààààààààààà."
+
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ààààà ààààààààààààà"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà àààààà àààààà ààààààààààà 3 àààà ààààà àààààààààà àààààààààà"
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àààààààààà àààààààààà àààààààà : %s"
 
-#: ../camel/camel-gpg-context.c:989
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààààààààà ààààààààààà: àààààà ààààààà ààààààààààààààààààà"
 
-#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
 msgstr " àààààà ààààà àààààààà ààààààààààà: "
 
-#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
-#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
-#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "gpg àà ààààà ààààààààààà"
 
-#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
-#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
-#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
-#: ../camel/camel-smime-context.c:973
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àààààà ààààààààààà àààààààààà ààààààààààà: ààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1741
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
 msgstr "àààààà ààààààààààà àààààààààà ààààààààààà: "
 
-#: ../camel/camel-gpg-context.c:1864
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
 msgstr "ààààààààààààààà ààààà àààààààà ààààààààààà: "
 
-#: ../camel/camel-gpg-context.c:1917
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "ààà ààààààà ààààààààààà ààààààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
-#: ../camel/camel-gpg-context.c:2007
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àààààààà àààààààà ààààà àààààààà: ààààà àààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1995
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ààààààà àààààààààà ààààààà ààààààààààààà: àààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ààààààààààà ààààààààààà ààààà"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "CamelHttpStream àààà àààààààààààà ààààààà ààààààà ààààààààààààà"
+#: ../camel/camel-imapx-folder.c:104
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "%s ààààà ààààà ààààààààààà àààààààà ààààààààààà"
+
+#: ../camel/camel-imapx-folder.c:112
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "%s ààààà àààààààà ààààààààààà àààààààà ààààààààààà"
+
+#: ../camel/camel-imapx-folder.c:794
+#: ../camel/providers/imap/camel-imap-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+msgid "Apply message _filters to this folder"
+msgstr "_f àààà ààààààààà àààààà àààààààààà ààààààààà"
+
+#: ../camel/camel-imapx-server.c:1094
+msgid "Server disconnected"
+msgstr "àààààààà ààààààààààààààààà"
+
+#: ../camel/camel-imapx-server.c:1549
+msgid "Error writing to cache stream: "
+msgstr "àààààààà ààààààà ààààààààààà àààà: "
+
+#: ../camel/camel-imapx-server.c:2500
+#, c-format
+msgid "Not authenticated"
+msgstr " àààààààààà àààààààààààààààààààà"
+
+#: ../camel/camel-imapx-server.c:2580
+msgid "Error performing IDLE"
+msgstr "IDLE à ààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3464
+#: ../camel/providers/imap/camel-imap-store.c:413
+#: ../camel/providers/imap/camel-imap-store.c:467
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "IMAP àààààà %s àààà ààààààààààààà %s à àààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3465
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
+msgid "STARTTLS not supported"
+msgstr "STARTTLS ààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:3504
+#: ../camel/providers/imap/camel-imap-store.c:439
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "IMAP àààààà %s àààà àààààààààà àààààààà àààààà ààààààààààà:"
+
+#: ../camel/camel-imapx-server.c:3582
+#: ../camel/providers/imap/camel-imap-store.c:747
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP àààààààà %s,  %s ààà ààààààààààààààààààààà ààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:3593 ../camel/camel-session.c:494
+#: ../camel/providers/imap/camel-imap-store.c:1172
+#: ../camel/providers/pop3/camel-pop3-store.c:259
+#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#, c-format
+msgid "No support for %s authentication"
+msgstr "%s ààà ààààààààààààààààààààà ààààà ààààà"
+
+#: ../camel/camel-imapx-server.c:3612
+#: ../camel/providers/imap/camel-imap-store.c:1140
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+msgid "Cannot authenticate without a username"
+msgstr "àààààààààà àààààààà  ààààààààààààààà àààààààà"
+
+#: ../camel/camel-imapx-server.c:3621
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/nntp/camel-nntp-store.c:511
+#: ../camel/providers/pop3/camel-pop3-store.c:512
+#: ../camel/providers/pop3/camel-pop3-store.c:532
+msgid "Authentication password not available"
+msgstr "àààààà ààààààààààà àààààààààà ààààààààààààà"
+
+#: ../camel/camel-imapx-server.c:3823
+msgid "Error fetching message"
+msgstr "àààààààà àààààà àààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:3905
+msgid "Failed to copy the tmp file"
+msgstr "tmp àààààà ààààà àààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:3919
+msgid "Failed to close the tmp stream"
+msgstr "ààààààà ààààà ààààààààà àààààà"
+
+#: ../camel/camel-imapx-server.c:4017
+msgid "Error copying messages"
+msgstr "ààààààààà àààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4152
+msgid "Error appending message"
+msgstr "àààààà ààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4335
+msgid "Error fetching message headers"
+msgstr "ààààààààààà ààààààààààààààààà ààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4470
+msgid "Error retrieving message"
+msgstr "àààààààà àààààà àààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4592 ../camel/camel-imapx-server.c:4785
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "ààààààà àààààààààà ààààà ààààààààà '%s' ààààà àààààààà"
+
+#: ../camel/camel-imapx-server.c:4643
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "'%s' ààà ààààààààààà ààààààààààààà ààààààà"
+
+#: ../camel/camel-imapx-server.c:4686
+msgid "Error fetching new messages"
+msgstr "ààààà àààààààà àààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4876
+msgid "Error while fetching messages"
+msgstr "ààààààààà àààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:4884 ../camel/camel-imapx-server.c:4920
+#, c-format
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] " '%s' ààà %d  àààààààààà ààààààà ààààà àààààà àààààààà."
+msgstr[1] " '%s' ààà %d  ààààààààààààà ààààààà ààààà àààààà àààààààà."
+
+#: ../camel/camel-imapx-server.c:5045 ../camel/camel-imapx-server.c:5081
+msgid "Error refreshing folder"
+msgstr " ààààà ààààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5174
+msgid "Error expunging message"
+msgstr "àààààààà ààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5271
+msgid "Error fetching folders"
+msgstr "àààààààà àààààà àààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5350
+msgid "Error subscribing to folder"
+msgstr " ààààààààà ààààà ààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5411
+msgid "Error creating folder"
+msgstr "ààààà ààààààààààà àààà àààà "
+
+#: ../camel/camel-imapx-server.c:5460
+msgid "Error deleting folder"
+msgstr "ààààà àààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5521
+msgid "Error renaming folder"
+msgstr "ààààà àààààààààààà àààà àààà "
+
+#: ../camel/camel-imapx-server.c:5582
+msgid "Error performing NOOP"
+msgstr "NOOP à ààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:5678
+msgid "Error syncing changes"
+msgstr "àààààààààà àààààààààààààà àààà"
+
+#: ../camel/camel-imapx-server.c:6449
+#: ../camel/providers/imap/camel-imap-folder.c:3517
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ààààààààà àààààààà ID %s àààà ààà àààààààààààà àààààààààààààà: %s"
+
+#: ../camel/camel-imapx-server.c:6450
+#: ../camel/providers/imap/camel-imap-folder.c:3518
+msgid "No such message available."
+msgstr "àààààààààààà àààààà ààààà. ààààà "
+
+#: ../camel/camel-imapx-server.c:6605 ../camel/camel-imapx-server.c:6620
+msgid "Cannot create spool file: "
+msgstr "àààààà àààààà  àààààààà ààààààààààà:"
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:825
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP àààààààà %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:828
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ààà %s ààààà IMAP àààà"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "àààààààààà"
+
+#: ../camel/camel-imapx-store.c:253
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "àààà àààààà IMAP àààààà àààààà ààà àààààààààààà ààààààààààà àààààààààà"
+
+#: ../camel/camel-imapx-store.c:349
+#: ../camel/providers/imap/camel-imap-store.c:2061
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#, c-format
+msgid "No such folder %s"
+msgstr "àààààà ààà ààààà ààààà %s"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:374 ../camel/camel-imapx-store.c:858
+#: ../camel/providers/imap/camel-imap-store.c:274
+#: ../camel/providers/imap/camel-imap-store.c:2673
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../camel/providers/local/camel-maildir-store.c:307
+#: ../camel/providers/local/camel-maildir-store.c:699
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "ààààààààà"
+
+#: ../camel/camel-imapx-store.c:1091
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "'%s' ààààà ààààà ààààààààààààààà."
+
+#: ../camel/camel-imapx-store.c:1195
+#: ../camel/providers/nntp/camel-nntp-store.c:1769
+#, c-format
+msgid "No such folder: %s"
+msgstr "ààààà ààààà : %s"
+
+#: ../camel/camel-imapx-store.c:1412
+#: ../camel/providers/imap/camel-imap-store.c:2074
+#: ../camel/providers/imap/camel-imap-store.c:2517
+#, c-format
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ààààààà ààààà \"%s\" àààààààà àààààà ààààààà \"%c\" àààààà"
+
+#: ../camel/camel-imapx-store.c:1423
+#: ../camel/providers/imap/camel-imap-store.c:2530
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "ààààààà ààààààà ààààà: %s"
+
+#: ../camel/camel-imapx-store.c:1433
+#: ../camel/providers/imap/camel-imap-store.c:2137
+#: ../camel/providers/imap/camel-imap-store.c:2581
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "àààà ààààààà ààààààààà àààà àààààààà àààààààà àààààà ààààà"
+
+#: ../camel/camel-imapx-stream.c:97
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ààà ààà àààà ààààà ààààààààààààà"
+
+#: ../camel/camel-imapx-stream.c:106
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ààà ààà ààààààààààààà"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2171,7 +2542,7 @@ msgstr "àààààààààà àààààà ààààààà
 msgid "Error writing mail temp file: %s"
 msgstr "àààààààààà àààààààà àààààààà ààààààààààà àààà: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "àààààààààà àààààààà àààààààà àààààààààààà àààà àààà: %s"
@@ -2191,57 +2562,47 @@ msgstr "ààààààààà ààààà ààààààààà
 msgid "parse error"
 msgstr "ààààààààà àààà"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "àààààà ààààààààààà ( %s: %s)"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "SSL ààààààààààààà"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%s àààà àààààà ààààààààààà: "
-
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "àààààààààààààààà: %s"
 
-#: ../camel/camel-net-utils.c:718
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "ààààààà ààà ààààààààààà''"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ààààààà ààà ààààààààààà (: %s: %s)''"
 
-#: ../camel/camel-net-utils.c:845
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "àààààààà àààààààà ààààààààààààà"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ààààà ààà ààààààààààà"
 
-#: ../camel/camel-net-utils.c:872
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "''ààààà ààà ààààààààààà (: %s)''"
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-network-service.c:114
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s àààà àààààà ààààààààààà: "
+
+#: ../camel/camel-offline-folder.c:210
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ààààààààà '%s' àààààààààà àààààààààààààààààà ààààààààà"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr ""
-"ààààà àààààààààààà ààààà %s' àààà ààààààààààà àààààààà àààà àààààààà : %s"
+msgstr "ààààà àààààààààààà ààààà %s' àààà ààààààààààà àààààààà àààà àààààààà : %s"
 
 #: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
@@ -2251,22 +2612,22 @@ msgstr "ààààààààà ààààà ààààààààà
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà ààààààà àààà àààààààààààààà àààààààààà àààààààààà"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s àààà ààààààààààà: ààààààà ààààààà ààààààààààà ààààà àààààà ààààà"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "àààà ààààààààààà %s: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "àààà ààààààààààà %s: àààà ààààààààà àààààà àààààààà ààààà"
 
-#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ààà àààà '%s' àààà  ààààààà ààààà"
@@ -2311,193 +2672,181 @@ msgstr ""
 "ààààààà ààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"àààà àààààà àààààà ààààààààà CRAM-MD5 àààààààààààà ààààààààààà àààààààà "
-"ààààààààà. "
+"àààà àààààà àààààà ààààààààà CRAM-MD5 àààààààààààà ààààààààààà àààààààà ààààààààà. "
 "àààààà àààààà ààààà àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"àààà àààààà àààààà ààààààààà DIGEST-MD5 àààààààààààà ààààààààààà àààààààà "
-"ààààààààà. "
+"àààà àààààà àààààà ààààààààà DIGEST-MD5 àààààààààààà ààààààààààà àààààààà ààààààààà. "
 "àààààà àààààà ààààà àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àààààààààààà àààààààà  ààààààààààààà (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "àààààà ààààà àààààààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:872
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "àààààà àààààààààà ààààààà àààààààààààààààà \"ààààà àààààààààà\"àààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "àààààà ààààààà àààààà ààààà ààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:894
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "àààààà ààààààà ààààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "àààààààààààà ààààà ààààààààààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "àààà àààààà ààààààààà àààààààààààà ààààààààààà ààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr ""
-"ààààààààààà ààààààààà ààààààà ààààà ààààà àààààà ààààààààààà ààààààààààààà "
-"ààààààààààà."
+msgstr "ààààààààààà ààààààààà ààààààà ààààà ààààà àààààà ààààààààààà ààààààààààààà ààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ààààààààààààà ààààààà_n ààààà ààààààààà àààààà ààààààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
-"ààààààààààààà ààààààà_ n àààààààààà àààààààààà ààààààà àààààà ààààà àààààà "
-"ààààà àààààà."
+"ààààààààààààà ààààààà_ n àààààààààà àààààààààà ààààààà àààààà ààààà àààààà ààààà àààààà."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
-"input_token ààà àààà àààààààà ààààààààààààààààààààààà nput_chan_bindings "
-"àààààà "
+"input_token ààà àààà àààààààà ààààààààààààààààààààààà nput_chan_bindings àààààà "
 "àààààà ààààààààà àààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr ""
-"input_token ààà ààààààà ààààààààà àààààà àààààà àààààààààààà ààààààààà àààààà."
+msgstr "input_token ààà ààààààà ààààààààà àààààà àààààà àààààààààààà ààààààààà àààààà."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
-msgstr ""
-"ààààà àààààà ààààààààààààà àààààààà àààààà àààààà ààààà àààààààà àààà "
-"ààààààààààà"
+msgstr "ààààà àààààà ààààààààààààà àààààààà àààààà àààààà ààààà àààààààà àààà ààààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ààààààààààà ààààà àààààà ààààà ààààààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ààààààààààà ààààààààà ààààààààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "àààààààààà ààààààààààà ààààààààà ààààààààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ààààààààààààà ààààà ààààààà ààààà ààààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
-#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1228
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:384 ../camel/camel-sasl-gssapi.c:401
+#: ../camel/providers/smtp/camel-smtp-transport.c:575
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "àààààààààààààà àààààà àààààà ààààà ààààà"
 
-#: ../camel/camel-sasl-gssapi.c:385
+#: ../camel/camel-sasl-gssapi.c:413
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ààààà àààààà àààààààààà ààààààà"
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ààààààà"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "àààà àààààà ààààààà àààààààààààà ààààààààààà ààààààààà ààààààà."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ààààààà àààààà àààààààààààà àààà."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"NTLM/ ààààààààààà àààààààààà àààààà àààààà ààààààààààà àààààààà ààààààà "
-"ààààààààà àààà "
+"NTLM/ ààààààààààà àààààààààà àààààà àààààà ààààààààààà àààààààà ààààààà ààààààààà àààà "
 "àààà àààà ààààààààà."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP àààà àààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "àààà àààààà SMTP ààààààààààà ààààààààààà àààà àààà ààààààà àààààààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
-#| msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
 msgstr "POP ààà UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "SMTP àààààààààà àààà POP ààààà ààààààà àààààààààààààà."
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
-#| msgid "POP Before SMTP authentication using a non-POP source"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ààà %s ààààààààà àààààààààà àààà SMTP àààààààààà àààààààààààààààààà"
 
@@ -2506,412 +2855,424 @@ msgstr "ààà %s ààààààààà àààààààààà
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ààààààà àààààà ààààààààà ààààààààààààà: %s: %s"
 
-#: ../camel/camel-service.c:526
-#, c-format
-#| msgid "URL '%s' needs a username component"
-msgid "URL '%s' needs a user component"
-msgstr "URL '%s' ààà ààààà  àààà àààààààààààààà"
-
-#: ../camel/camel-service.c:537
+#: ../camel/camel-session.c:415
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' ààààààà ààààà àààà"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ààààà GType àààà àààààààà '%s' ààààà àààààààààààààààààà"
 
-#: ../camel/camel-service.c:548
+#: ../camel/camel-session.c:509
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' àààà àààà àààà"
+msgid "%s authentication failed"
+msgstr "%s àààààà ààààààààààààà àààààà"
 
-#: ../camel/camel-session.c:361
-#, c-format
-#| msgid "No provider available for protocol '%s'"
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "ààààà GType àààà àààààààà '%s' ààààà àààààààààààààààààà"
+#: ../camel/camel-session.c:645
+msgid "Forwarding messages is not supported"
+msgstr "ààààààààààà àààààààààààààààà àààà ààààà"
 
-#: ../camel/camel-session.c:938
+#: ../camel/camel-session.c:1362
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "àààà àààààà %s àààààààààààà %s àààà (ààààààà %s ààà àààà) àààààààà"
 
-#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "`%s' ààààà ààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:372
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS àààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààààààà àààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:383
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààààààà àààààààà àààààà ààà àààààà"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà àààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:396
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS àààààààààààààààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:402
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "ààààààààà ààààà àààààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:408
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààààààà ààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ààààà ààààààààààààà ààààààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "ààààààààààààà ààààààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ààààààà ààààà àààààààà ààààààààààà"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "àààààààààààà"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "àààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "àààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr ""
-" àààààààààààààà àààà ààààààà àààààààààà àààààààààà àààààà ààààààà ààààààà "
-"àààààààààààààà"
+" àààààààààààààà àààà ààààààà àààààààààà àààààààààà àààààà ààààààà ààààààà àààààààààààààà"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ààààààà ààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ààààààà ààààààààààà ààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ààààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ààààààà àààààààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "àààààà àààààààààààà"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ààààààààààààà àààààààà àààààààà ààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "àààà ààààààà ààààààà ààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "ààààààààà àààààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ààààààààà àààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ààààààààà àààààààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-"ààààààààà àààààà àààààà àààààààààààà, àààààààààààà àààààààààà ààààààààà"
+msgstr "ààààààààà àààààà àààààà àààààààààààà, àààààààààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr ""
-"ààààààààààà àààààà àààààààààààà, ààààààààààà àààààààààà àààààààààà àààààà"
+msgstr "ààààààààààà àààààà àààààààààààà, ààààààààààà àààààààààà àààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ààààààà ààààààààààà àààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ààààààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "ààààààààà àààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:841
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS àààààààààààààà ààààà ààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "ààààà ààààààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "àààààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:1058
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ààààààà àààààààààààà ààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:1066
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr ""
-"ààààààààààà àààààààààààààààààààààà àààààààà àààààààààààààà ààà àààààààààà"
+msgstr "ààààààààààà àààààààààààààààààààààà àààààààà àààààààààààààà ààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:1077
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "CMS àààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ààààààà àààààààà àààààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:1089
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ààààààà àààààààà àààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "CMS ààààà àààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1104
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS  àààààààààà ààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààààààà ààààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "àààààààààààà ààààààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ààààààààà, ààààààààààààààààààà ààààààààà ààààààà ààààààà àààààà"
 
-#: ../camel/camel-store.c:1814
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "%s ààààà àààààààà àààààààà. ààà ààààààààà àààààà"
 
-#: ../camel/camel-store.c:1857
+#: ../camel/camel-store.c:1881
 #, c-format
-#| msgid "Syncing folders"
 msgid "Opening folder '%s'"
 msgstr "àààààààà '%s' àààààààààà"
 
-#: ../camel/camel-store.c:2044
+#: ../camel/camel-store.c:2066
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Scanning folders in '%s'"
 msgstr "'%s' ààà ààààààààààà àààààààà ààààààààà"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2056 ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "àààààààààààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "àààààààà"
 
-#: ../camel/camel-store.c:2521
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ààààà àààààààà ààààààààààà %s: ààààà àààààààà àààààà"
 
-#: ../camel/camel-store.c:2535
+#: ../camel/camel-store.c:2554
 #, c-format
-#| msgid "Cannot get folder '%s': %s"
 msgid "Creating folder '%s'"
 msgstr "àààààààà '%s' à àààààààààààààà"
 
-#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ààààà ààààà ààààààààààà %s: ààààààà ààààà"
 
-#: ../camel/camel-store.c:2796 ../camel/camel-vee-store.c:400
-#: ../camel/providers/local/camel-maildir-store.c:704
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ààààààà ààààà ààààà ààààààààààà %s: ààààààà ààààà"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter àààà àààààààààààà ààààààà ààààààà ààààààààààààà"
 
-#: ../camel/camel-stream-process.c:265
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream àààà àààààààààààà ààààààà ààààààà ààààààààààààà"
+
+#: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
 msgstr "ààààààà ààààà ààààààààààààà"
 
-#: ../camel/camel-stream-process.c:270
+#: ../camel/camel-stream-process.c:272
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" ààààààààààà àààà ààààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-subscribable.c:386
+#, c-format
+msgid "Subscribing to folder '%s'"
+msgstr " '%s' ààààààààà ààààà ààààààààààààà"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "ààààà '%s' àààààààà ààààà ààààààààààà"
+
+#: ../camel/camel-tcp-stream-raw.c:310
+#, c-format
+msgid "NSPR error code %d"
+msgstr "NSPR àààà àààààààà %d"
+
+#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
 #, c-format
-#| msgid "The proxy host does not support SOCKS5"
 msgid "The proxy host does not support SOCKS4"
 msgstr "àààààààà ààààààà SOCKS4 àààà ààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "àààààààà ààààààà àààààààà àààààààààà àààààààààààààà: àààààààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ààààààà àààààà5 àààà ààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:879
+#: ../camel/camel-tcp-stream-raw.c:777
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr ""
-"àààààààààà ààààààààààààà ààààà ààààà ààààààà ààààààààààà: àààààààà 0x%x"
+msgstr "àààààààààà ààààààààààààà ààààà ààààà ààààààà ààààààààààà: àààààààà 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr "àààà àààààà ààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr "àààààà ààààà ààààààà ààààààà ààààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr "àààààà àààààààààààà ààààààà àààààààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "àààààà ààààààààààààààààà ààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:895
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "ààààààà àààààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr "àààààààà ààààà ààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "àààààà àààààà  àààààààààààà ààààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "àààààà àààààààààààà àààààà ààààààà ààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "àààààà àààààààààààà ààààààà ààààààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "àààààà àààààààààààà ààààààà ààààààà àààààà ààà ààààààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:950
+#: ../camel/camel-tcp-stream-raw.c:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "àààààà ààààààààààààààààà ààààààààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:970
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ààààààà ààààà ààà àààààààà  (àààààààààà 255 àààààààààààààà)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ààààà àààààààààààààà àààààààààààààà ààààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:453
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
 "àààààààààà:            %s\n"
-"ààààààà:           %s\n"
+"àààààà:           %s\n"
 "àààààà:       %s\n"
 "ààààààààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "ààààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "àààà"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"SSL ààààààààà ààààà %s:\n"
-"\n"
-"%s\n"
+"'%s' ààààà SSL ààààààààà àààààààà ààààà. ààà àààààààààààà ààààààààààààààààà?\n"
 "\n"
-"àààà ààààààààà?"
+"ààààààààààà àààààà ààààààà ààààà:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:516
+msgid "_Reject"
+msgstr "ààààààà (_R)"
+
+#: ../camel/camel-tcp-stream-ssl.c:517
+msgid "Accept _Temporarily"
+msgstr "ààààààààààà ààààààààààà (_T)"
+
+#: ../camel/camel-tcp-stream-ssl.c:518
+msgid "_Accept Permanently"
+msgstr "àààààààààà ààààààààààà (_A)"
 
-#: ../camel/camel-tcp-stream-ssl.c:507
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2920,7 +3281,7 @@ msgstr ""
 "ààààààààà àààààààà %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:559
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2929,7 +3290,7 @@ msgstr ""
 "ààààà ààààààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:577
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2938,7 +3299,7 @@ msgstr ""
 "ààààààààà àààààààààààà: %s\n"
 "àààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:594
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2952,37 +3313,50 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s'à ààààà ààààààààààà "
 
-#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
+#: ../camel/camel-vee-folder.c:494
+#, c-format
+msgid "Updating folder '%s'"
+msgstr "ààààà '%s' à àààààààààààààààà"
+
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ààààààààà ààààààà àààààààà ààààààà ààààààààà ààààààààààà"
 
-#: ../camel/camel-vee-folder.c:1330
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ààà %s ààààà ààààà"
 
-#: ../camel/camel-vee-folder.c:1398
+#: ../camel/camel-vee-folder.c:941
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' à ààààààààààà àààà:"
 
+#: ../camel/camel-vee-folder.c:1169
+msgid "Automatically _update on change in source folders"
+msgstr "ààààà ààààààààààààà ààààààà àààààààààà ààààà àààààààà (_u)"
+
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
-#. all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#. * all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "ààààààààààààà"
 
-#: ../camel/camel-vee-store.c:376
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààà ààààà ààààààààààà: %s: àààààà ààà ààààà ààààà"
 
-#: ../camel/camel-vee-store.c:410
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ààààààà ààààà ààààà ààààààààààà: %s: àààààà ààà ààààà ààààà"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "ààààààààà àààààààààààà àààààààààààà (_U)"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "àààààààà àààààà àààààà ààààààààà ààààààààà ààààààààààà"
@@ -2991,24 +3365,33 @@ msgstr "àààààààà àààààà àààààà ààà
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààààà àààààààààà ààààààààà ààààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr " àààààààààà ààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "ààààààààà ààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "àààààààààààà àààààà ààààààà ààààààààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:425
+#, c-format
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"IMAP àààààà  %s %s ààààààààà ààààà  %s ààà àààààààààà:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:429
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3017,454 +3400,255 @@ msgstr ""
 "IMAP àààààààààààààà àààààà %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:511
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP àààààààààààààà àààààààààà ààààà : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:523
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP àààààà ààààààààààààà : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:606
 #, c-format
 msgid "Server response ended too soon."
 msgstr "àààààà ààààà ààààààààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:774
+#: ../camel/providers/imap/camel-imap-command.c:821
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP àààààààà %s àààààààààà ààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:812
+#: ../camel/providers/imap/camel-imap-command.c:859
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àààààààààààààà àààààààààà ààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
-msgstr "ààààààààà àààà ààààààà ààààà ààààààààààààà ààààààààààà"
+#: ../camel/providers/imap/camel-imap-folder.c:354
+msgid "Always check for _new mail in this folder"
+msgstr "_n ààààààààà àààà ààààààà ààààà ààààààààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:370
+#: ../camel/providers/imap/camel-imap-folder.c:445
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ààààà àààààààà ààààààààààà %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:393
+#: ../camel/providers/imap/camel-imap-folder.c:466
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ààààà ààààààààààà àààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1049
-#: ../camel/providers/imapx/camel-imapx-server.c:4018
+#: ../camel/providers/imap/camel-imap-folder.c:1135
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ààààààà ààààààààààà àààààààà ààààààààà ààààààààààà (%s)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3462
+#: ../camel/providers/imap/camel-imap-folder.c:3480
 msgid "Unable to retrieve message: "
 msgstr "àààààààà ààà ààààààààààà:"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3497
-#: ../camel/providers/imapx/camel-imapx-server.c:5291
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "ààààààààà àààààààà ID %s àààà ààà àààààààààààà àààààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3498
-#: ../camel/providers/imapx/camel-imapx-server.c:5292
-msgid "No such message available."
-msgstr "àààààààààààà àààààà ààààà. ààààà "
-
-#: ../camel/providers/imap/camel-imap-folder.c:3573
-#: ../camel/providers/imap/camel-imap-folder.c:4491
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/imap/camel-imap-folder.c:3594
+#: ../camel/providers/imap/camel-imap-folder.c:4485
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "àààà àààààà ààààààà ààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4075
-#: ../camel/providers/imap/camel-imap-folder.c:4158
-#: ../camel/providers/imapx/camel-imapx-server.c:3976
-#: ../camel/providers/imapx/camel-imapx-server.c:4126
+#: ../camel/providers/imap/camel-imap-folder.c:4059
+#: ../camel/providers/imap/camel-imap-folder.c:4140
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ààààààà àààààààààà ààààà ààààààààà %s ààààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4292
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ààààààà àààààà ààààà:%d ààààà ààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4302
+#: ../camel/providers/imap/camel-imap-folder.c:4282
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààààààààà àààààà ààààà : %d ààààààààààà UID ààààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4531
+#: ../camel/providers/imap/camel-imap-folder.c:4522
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ààààààà àààààààà ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "àààààààà ààààà àààààà ààààààààààà : "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "ààààààààààà àààààààà ààààààà ààààààààààà%s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "%s àààààààà ààààààààààà ààààààà ààààààààààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:531
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "%s à àààààààà ààààààààààààà ààààààààà àààààà:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "ààààà ààààààààààààààà ààààààààààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "ààààà àààààààààà àààààà àà ààààààà ààààààààà ààààààààààà (_h)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "(_e) ààààà ààààààààà àààààààààà ààààà àààààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "ààààààààà ààààààà"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "ààààààààààààà àààà ààààààààà àààààààààààààà (_U)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "(_m) àààààà:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "àààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "àààààààà ààààà ààààààà àààààààà àààààààààà (_S)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "àààààà-àààààààà àààààààààà àààààààààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "_p ààààà àààààààààà:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "_f ààààà àààààààààààà ààààà ààààààààààààà ààààààààà àààààààààààà "
+
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
-"àààà àààààààà àààà àààààààààààààààààààà àààà ààààààà ààààà ààààààààààààààà "
-"àààààààààà "
+"àààà àààààààà àààà àààààààààààààààààààà àààà ààààààà ààààà ààààààààààààààà àààààààààà "
 "ààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "ààààà ààààààààà àààààà àààààààààààààààà ààààààààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "Check new messages for _Junk contents"
+msgstr "_J ààààà ààààààààààà àààààà àààààààààà àààààà àà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "àààààà àààààààààà àààààà àà ààààààààà ààààààà ààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ààààà ààààààààààààà ààààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "IMAP àààààààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
-#| msgid "IMAP server %s"
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP ààà SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ààààààààààààà àààààààààà ààààààà IMAP ààààààààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
-msgid "Password"
-msgstr "àààààààààà"
-
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "àààà àààààà IMAP àààààà àààààà ààà àààààààààààà ààààààààààà àààààààààà"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:222
-#: ../camel/providers/imap/camel-imap-store.c:2587
-#: ../camel/providers/imapx/camel-imapx-store.c:333
-#: ../camel/providers/imapx/camel-imapx-store.c:771
-#: ../camel/providers/local/camel-maildir-folder.c:458
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:325
-msgid "Inbox"
-msgstr "ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:354
-#: ../camel/providers/imap/camel-imap-store.c:381
-#: ../camel/providers/imap/camel-imap-store.c:408
-#: ../camel/providers/imapx/camel-imapx-server.c:3007
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "IMAP àààààà %s àààà ààààààààààààà %s à àààààààààà àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:355
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
-msgid "STARTTLS not supported"
-msgstr "STARTTLS ààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:374
-#: ../camel/providers/imapx/camel-imapx-server.c:3046
-#, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "IMAP àààààà %s àààà àààààààààà àààààààà àààààà ààààààààààà:"
-
-#: ../camel/providers/imap/camel-imap-store.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "SSL àààààààààà ààààààààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:707
-#: ../camel/providers/imapx/camel-imapx-server.c:3141
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP àààààà %s %s ààà àààààààààà ààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:718
-#: ../camel/providers/imapx/camel-imapx-server.c:3154
-#: ../camel/providers/smtp/camel-smtp-transport.c:347
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "%s ààà àààààààààà ààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL àààààààà àààààààààààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:777
-#: ../camel/providers/imapx/camel-imapx-server.c:3199
-#, c-format
-msgid "You did not enter a password."
-msgstr "ààààààà àààààààààààà ààààààà àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:818
-#: ../camel/providers/imapx/camel-imapx-server.c:3244
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP àààààààà ààààààààà ààààààààààà.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/imap/camel-imap-store.c:874
-#: ../camel/providers/imapx/camel-imapx-store.c:142
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP àààààààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:877
-#: ../camel/providers/imapx/camel-imapx-store.c:145
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s ààà %s ààààà IMAP àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1962
-#: ../camel/providers/imap/camel-imap-store.c:2164
-#: ../camel/providers/imapx/camel-imapx-store.c:309
-#, c-format
-msgid "No such folder %s"
-msgstr "àààààà ààà ààààà ààààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:1976
-#: ../camel/providers/imap/camel-imap-store.c:2431
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "ààààààà ààààà \"%s\" àààààààà àààààà ààààààà \"%c\" àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:2040
-#: ../camel/providers/imap/camel-imap-store.c:2495
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "àààà ààààààà ààààààààà àààà àààààààà àààààààà àààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:2093
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:416
-#: ../camel/providers/local/camel-mh-store.c:547
+#: ../camel/providers/imap/camel-imap-store.c:2186
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ààààà àààààààà ààààààààààà %s: ààààà àààààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2444
-#: ../camel/providers/imapx/camel-imapx-store.c:1310
+#: ../camel/providers/imap/camel-imap-store.c:2961
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "ààààààà ààààààà ààààà: %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "'%s' ààà ààààààààààààà àààààààà ààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3214
+#: ../camel/providers/imap/camel-imap-store.c:3309
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "àààààààààààà àààààààà ààààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3217
+#: ../camel/providers/imap/camel-imap-store.c:3312
 msgid "Server unexpectedly disconnected: "
 msgstr "àààààààààààà àààààààà ààààààààààààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:88
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "%s ààààà ààààà ààààààààààà àààààààà ààààààààààà"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:96
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "%s ààààà àààààààà ààààààààààà àààààààà ààààààààààà"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
 msgstr "_Q àààààààà ààààà ààààààààà àààààà àààààààààààààààà àààààààààààà."
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "_d àààààààà ààààà ààààààààà àààààà ààà à  àààààààààààà."
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "àààààà ààààà àààààààààààààà àààà (_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "àààààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "_r àààààààààà ààà àààààà àààààààààààà ààààààààà "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "ààààà àààààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
 msgstr "àààààààààààà IMAP àààà"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1480
-msgid "Error writing to cache stream: "
-msgstr "àààààààà ààààààà ààààààààààà àààà: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2186
-#, c-format
-msgid "Not authenticated"
-msgstr " àààààààààà àààààààààààààààààààà"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3416
-msgid "Closing tmp stream failed: "
-msgstr "àààààààà ààààà ààààààà àààààà: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5437
-#: ../camel/providers/imapx/camel-imapx-server.c:5452
-msgid "Cannot create spool file: "
-msgstr "àààààà àààààà  àààààààà ààààààààààà:"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1087
-#: ../camel/providers/nntp/camel-nntp-store.c:1704
-#, c-format
-msgid "No such folder: %s"
-msgstr "ààààà ààààà : %s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "ààà ààà àààà ààààà ààààààààààààà"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "ààà ààà ààààààààààààà"
-
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
-#: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "àààààààààà àààààà: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
-msgstr "ààààààà àààààààààà ààààààààààà ààààà"
+#: ../camel/providers/local/camel-local-folder.c:499
+msgid "_Index message body data"
+msgstr "_I àààààààààà ààààààààààà ààààà ààààààààààààà"
 
-#: ../camel/providers/local/camel-local-folder.c:700
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3473,291 +3657,282 @@ msgstr ""
 "àààààà %s à %s ààààààààààààà ààà ààààààààààà\n"
 "  %s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "(_U) '.folders' ààààà ààààààààà àààààà (exmh) àààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-àààààààààà àààààààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-like àààààààààà ààààààà àààà àààààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "àààààààà ààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"àààààà ààààààààààààà mbox àààààààààààà ààààààààààà àààààààà àààààààààààà "
-"ààààààààààààà "
+"àààààà ààààààààààààà mbox àààààààààààà ààààààààààà àààààààà àààààààààààà ààààààààààààà "
 "ààààààààààààà (ààààààà)."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
-msgstr "(_A) ààààààààààààà ààààà ààààààààààààà ààààààààà àààààààààààà "
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+msgid "_Apply filters to new messages in Inbox"
+msgstr "(_A) ààààààààààààà ààààà ààààààààààààà àààààààààà àààààààààààà "
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-àààààààààà àààààààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "maildir ààààààà ààà ààààààààààààà ààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr " ààààà àààà ààà àààààààà ààààààà àààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "àààààà Unix mbox spool ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"àààà àààààààà mbox spool àààààà ààààààààààààà àààà àààààààà àààààààààààà "
-"ààààààààààààààààààà\n"
+"àààà àààààààà mbox spool àààààà ààààààààààààà àààà àààààààà àààààààààààà ààààààààààààààààààà\n"
 "Elm, Pine, àààààà Mutt àààààààà àààà ààààààààààà àààààààààà. ààààààààààà "
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "àààààà Unix mbox spool ààààà"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s à %s àà ààààà ààààààà ààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:180
 #, c-format
 msgid "Local mail file %s"
 msgstr "ààà àààààààààà àààààà %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:534
-#: ../camel/providers/local/camel-spool-store.c:571
+#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:383
+#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ààààà %s àààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ààààààà ààààà %s ààààààà ààààà ààààà"
 
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:254
+#: ../camel/providers/local/camel-local-store.c:396
+#: ../camel/providers/local/camel-maildir-store.c:137
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ààààà ààà ààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:291
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ààà ààààààààààààààà ààààààààà àààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:708
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ààààà ààààààà àààààà '%s' à àààààààààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:738
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ààààà àààà àààààà '%s' à àààààààààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ààààà àààààààà ààààààààààà'%s': %s"
 
-#: ../camel/providers/local/camel-local-summary.c:548
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ààààààààààààà àààààààà ààààààà ààààààààààà: àààààà ààààààààààà"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "ààà ààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ààààààà àààààààà ààààààààààà ààààààààààà: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "àààààà %s à %s ààààààààààààà ààà ààààààààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "àààààààà àààààà ààààààààà ààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:112
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr ""
-"àààààààààà àààààààà ààààààààààà: %s: àààààààà ààààà ààà àààààààà "
-"ààààààààààààààààà"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+msgstr "àààààààààà àààààààà ààààààààààà: %s: àààààààà ààààà ààà àààààààà ààààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:722
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
 #, c-format
-#| msgid "Folder already exists"
 msgid "Folder %s already exists"
 msgstr "àààààààà %s ààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:384
-#: ../camel/providers/local/camel-mbox-store.c:398
+#: ../camel/providers/local/camel-maildir-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:403
+#: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ààààà   '%s' à àààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:350
-#: ../camel/providers/local/camel-mh-store.c:502
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ààààà '%s' à ààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:360
-#: ../camel/providers/local/camel-mh-store.c:511
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mh-store.c:531
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ààààà '%s' à ààà ààààààààààà: ààààà ààààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:269
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ààààà '%s' à ààà ààààààààààà: àààààààààà ààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:649
+#: ../camel/providers/local/camel-maildir-store.c:338
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-mh-store.c:682
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ààààà '%s' à ààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "maildir ààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:589
+#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ààààà '%s' à àààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:713
+#: ../camel/providers/local/camel-maildir-store.c:797
 #, c-format
-#| msgid "Cannot create folder: %s: folder exists"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"àààààààààààà ààààààààà ààààààààààà: %s: àààààààà ààààà ààà àààààààà "
-"ààààààààààààààààà"
+msgstr "àààààààààààà ààààààààà ààààààààààà: %s: àààààààà ààààà ààà àààààààà ààààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:436
-#: ../camel/providers/local/camel-maildir-summary.c:566
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ààààààà àààààà àààààà ààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:557
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ààààààà ààààààààààààààààà ààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:650
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ààààà ààààààààà ààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:743
-#: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:746
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "àààààààà ààààààààààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "àààààààààà àààààààà àààààà ààààààààààà: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox àààààààà àààààààà ààààààààààà àààààààà: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "àààà ààààà àààààààààààà àààààààà ààààààààààààààà."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ààààà àààààà  %s à àààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:372
-#: ../camel/providers/local/camel-mbox-store.c:542
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "àààà ààààààà ààààà àààààààà àààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:409
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ààààà '%s' à ààà ààààààààààà: àààààààà àààààà àààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:558
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ààààà àààààààà àààààààà : %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:617
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ààààà àààààààà àààààààà : %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:576
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "ààààà àààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
-#: ../camel/providers/local/camel-mbox-store.c:632
-#: ../camel/providers/local/camel-mbox-store.c:661
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3766,89 +3941,89 @@ msgstr ""
 "ààààà '%s' à ààààà ààààààààààà':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:642
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' àààààààà àààààà àààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ààààà '%s' àààààà ààààà ààààààààààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:678
-#: ../camel/providers/local/camel-mbox-store.c:693
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ààààà ààààààà àààààà '%s' à ààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:775
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ààààà ààààààà ààààà àààà àààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:791
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ààààà '%s' à à àààààà  ààààààààààà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:874
+#: ../camel/providers/local/camel-mbox-store.c:915
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' à %s àà ààààààààà àààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:478
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààà àààààà ààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:539
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr " %s àààààààà ààààààà %s ààààààà àààààààààà àààààààà àààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:628
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ààààà %s à ààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ààààà %s à àààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "àààààààà àààààààààà àààààààà àààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:969
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:919
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ààà ààààà ààà ààààààààààà %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:755
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "àààààààà ààààà ààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ààààààààà ààààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:867
-#: ../camel/providers/local/camel-mbox-summary.c:1134
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1085
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààà ààààààà ààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:906
-#: ../camel/providers/local/camel-mbox-summary.c:1165
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1116
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3857,40 +4032,40 @@ msgstr ""
 "MBOX àààààà ààààààààà, ààà àààààà ààà ààà ààààààààà. (àààààààààà ààà "
 "àààààààààààààààààààà, ààààà ààà ààààà)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:915
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:865
+#: ../camel/providers/local/camel-mbox-summary.c:1125
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "àààààààààà àààààààà, ààààààààà ààààààà ààààààà ààààààààààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1080
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ààààààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1244
-#: ../camel/providers/local/camel-mbox-summary.c:1274
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "àààààààà àààààààààà àààààààààà ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "àààààààà àààààààààà àààààààààà ààààààà àààà àààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ààààààààààààà àààààààà ààààààààààà ààààààààààà : %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr " %s ààààà àààààààà ààààààààààà : %s "
 
-#: ../camel/providers/local/camel-mh-store.c:539
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ààààà àààà ààààààààààà.: ààààà ààààà"
@@ -3900,22 +4075,36 @@ msgstr "'%s' ààààà àààà ààààààààààà.: 
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ààààà àààààà àààààà ààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:347
+#: ../camel/providers/local/camel-spool-store.c:97
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "' %s'  àààààà ààààà àààààà àààààààà : %s"
+
+#: ../camel/providers/local/camel-spool-store.c:111
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "' %s'  àààààà ààààà àààààààà àààààà àààààà ààààà àààà"
+
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "àààààà àààààààààà àààààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "àààààà ààààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:432
+msgid "Invalid spool"
+msgstr "àààààààààààààà àààààà"
+
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ààààà '%s/%s' ààààààààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:405
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3924,12 +4113,12 @@ msgstr ""
 "àààà ààààà àààààà ààààààààààà'%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:411
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ààààà '%s' ààààààààà ààààà."
 
-#: ../camel/providers/local/camel-spool-store.c:418
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3938,51 +4127,41 @@ msgstr ""
 "'%s' ààà ààààà àààààààààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:430
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s'àààààà àààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:478
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ààààààààààààà àààààààà ààààààààà ààààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "àààààà ààààà ààààà àààààààà."
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "àààààà ààààààààà ààààààààà àààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:580
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "' %s'  àààààà ààààà àààààà àààààààà : %s"
-
-#: ../camel/providers/local/camel-spool-store.c:596
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "' %s'  àààààà ààààà àààààààà àààààà àààààà ààààà àààà"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "àààààààà ààààà %s à àààààààààà àààààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "àààààà ààààà %s à àààààààààà àààààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3991,111 +4170,97 @@ msgstr ""
 "àààààà ààààà %sà àààààààààààà ààààààààààà: %s\n"
 "ààààà àààààààààààààààààààààà, àààà '%s'ààà ààààààààààààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:207
-#: ../camel/providers/nntp/camel-nntp-folder.c:296
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àààààààààà àààà: UID ààààà àààààààààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:257
-#: ../camel/providers/nntp/camel-nntp-folder.c:261
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:692
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:610
+#: ../camel/providers/pop3/camel-pop3-folder.c:1005
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "%s àààààààà ààà ààààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:268
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:548
+#: ../camel/providers/pop3/camel-pop3-folder.c:600
+#: ../camel/providers/pop3/camel-pop3-folder.c:619
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "%s àààààààà ààà ààààààààààà:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:494
-#: ../camel/providers/nntp/camel-nntp-folder.c:500
-#: ../camel/providers/nntp/camel-nntp-folder.c:547
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ààààààààààà àààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:542
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "ààààààààààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:571
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "NNTP àààààààà àààà ààààààààà àààààà àààà àààààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ààààà ààààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"(_S) àààà ààààààààà ààààà àààààà (à-àà comp.os.linux àààà ààààà c.o.linux )"
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "(_S) àààà ààààààààà ààààà àààààà (à-àà comp.os.linux àààà ààààà c.o.linux )"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "(_d) ààààà àààààààààà àààààààà ààààà àààààààà ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "àààààààààààà NNTP àààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
 msgstr "NNTP àààà SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr ""
-"USENET àààààà àààààààààààààà àààààà ààààààà àààààà àààààà àààà àààà ààààààààà"
+msgstr "USENET àààààà àààààààààààààà àààààà ààààààà àààààà àààààà àààà àààà ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr ""
-"àààà àààààà NNTP àààààààà àààààà ààà àààààààààààà ààààààààààà àààààà àààààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "àààààààààà ààààààààààà ààààà ààààààà ààààà ààààààààààààààààà"
+msgstr "àààà àààààà NNTP àààààààà àààààà ààà àààààààààààà ààààààààààà àààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "àààààààà àààààà ààààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
+#: ../camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s àààààààà ààààààà àààààà ààààààààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:298
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s àààààà %dàààà àààààà ààààààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET àààààà %s àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1053
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4106,23 +4271,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "àààààà ààààààààà ààààà àààààààà àààààààà: ààààààààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#: ../camel/providers/nntp/camel-nntp-store.c:1166
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "àààààà ààààààààà àààà ààààààààà ààààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#: ../camel/providers/nntp/camel-nntp-store.c:1189
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"àààà àààààà ààààààààà àààà ààààà ààààà àààààààà: ààààààà ààààà ààààààààà"
+msgstr "àààà àààààà ààààààààà àààà ààààà ààààà àààààààà: ààààààà ààààà ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1329
+#: ../camel/providers/nntp/camel-nntp-store.c:1388
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4131,10 +4295,9 @@ msgid ""
 msgstr ""
 "àààà àààààà àààààààààà ààààààààà àààààààà àààààààà:\n"
 "\n"
-"àààààà ààà àààààààààà ààààà. àààààà ààààààààààà ààààà ààààààà àààààà "
-"àààààààààà."
+"àààààà ààà àààààààààà ààààà. àààààà ààààààààààà ààààà ààààààà àààààà àààààààààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1380
+#: ../camel/providers/nntp/camel-nntp-store.c:1436
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4145,70 +4308,68 @@ msgstr ""
 "\n"
 "àààààà ààà àààààà àààà ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1573
+#: ../camel/providers/nntp/camel-nntp-store.c:1626
 msgid "NNTP Command failed: "
 msgstr "NNTP àààààà àààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1711
 #, c-format
 msgid "Not connected."
 msgstr "ààààààà ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:235
-#: ../camel/providers/nntp/camel-nntp-summary.c:353
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ààààààààà ààààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:251
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover àààààààà àààààààààà àààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "àààààààààààààààààà àààààààààà àààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ààààà ààààààààààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:283
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:443
+#: ../camel/providers/pop3/camel-pop3-folder.c:516
 #, c-format
 msgid "No message with UID %s"
 msgstr " UID àààà àààààà ààààà (%s)"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:350
+#: ../camel/providers/pop3/camel-pop3-folder.c:532
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "àààà àààààà %d à ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:430
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
 msgid "Unknown reason"
 msgstr "ààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:470
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
 msgid "Retrieving POP summary"
 msgstr "àààà ààààààààààà ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:485
-#| msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:710
 msgid "Cannot get POP summary: "
 msgstr "àààà ààààààààààà ààà ààààààààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:829
 msgid "Expunging old messages"
 msgstr "àààà ààààààààà Expunging ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:567
+#: ../camel/providers/pop3/camel-pop3-folder.c:849
 msgid "Expunging deleted messages"
 msgstr "ààààààà ààààààààà àààààààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "àààààà àààààààààà"
 
@@ -4216,54 +4377,52 @@ msgstr "àààààà àààààààààà"
 msgid "_Leave messages on server"
 msgstr "(_L) ààààààààààà ààààààààà ààààà."
 
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "(_D) %s àààà(ààààà) àààà àààà ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr "àààààà ààààààààààààààààààà àààààààààà àààààààààà (_e)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "(_s) ààààààà àààà3 (POP3) ààààààààààààààà ààààà ààààààààà "
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
 msgstr "àààààààààààà POP3 àààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
-#| msgid "POP3 server %s"
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
 msgstr "POP3 ààà SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "àààààààààà àààà àààààààààààààà àààààààààà ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"àààà àààààà àààà ààààààààà àààààà ààà àààààààààààà ààààààààààà ààààààààà. ààà "
-"àààà àààààà "
+"àààà àààààà àààà ààààààààà àààààà ààà àààààààààààà ààààààààààà ààààààààà. ààà àààà àààààà "
 "ààààà ààààà ààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"àààà àààààà àààà àààààà ààààààààààààààà ààààààààààà ààààààààààààààà APOP "
-"àààààààà "
+"àààà àààààà àààà àààààà ààààààààààààààà ààààààààààà ààààààààààààààà APOP àààààààà "
 "àààààà ààààààà. ààà ààààà àààààààààààààààààààà àààà àààààààà"
 
 #. Translators: This is the separator between an error and an explanation
@@ -4271,77 +4430,63 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:139
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP àààààààààààààààààà ààààà àààààààà àààààààà àààààà ààààààààà (%s) "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "àààà àààààà %s à ààààààààààà àààààààààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:155
 msgid "STLS not supported by server"
 msgstr "STLS  àààààààààààà ààààà ààààà"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "àààà àààààà %s à ààààààààààà àààààààààà àààààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "àààà àààààà %s à àààààààààà àààààààààà àààààà ààààààààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "TLS "
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"àààà ààààààààà àààààà ààààààààààà %s ààààààààààà àààààà àààààààà ààààà ààààà"
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "SASL '%s' ààààààààà àààà (POP) àààààààààààààà àààààà àààààààà %s %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:298
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "àààà àààààà %s ààà ààààà ààààààààààà:SASL àààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:320
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "àààà àààààààà àààààà ààààààà àààààààààààààà %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:371
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 àààààààà %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:374
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "àààà3 àààààààà %s àààà %s ààà "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"àààà ààààààà %s àààà àààààà ààààààààààà:\t àààààààààààààà APOP ID ààààààààà. "
-"ààà "
+"àààà ààààààà %s àààà àààààà ààààààààààà:\t àààààààààààààà APOP ID ààààààààà. ààà "
 "ààààààààà àààààààààààààààààààààà. àààààà ààààààà ààààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:427
+#: ../camel/providers/pop3/camel-pop3-store.c:598
 #, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
@@ -4349,8 +4494,9 @@ msgstr ""
 "àààà àààààààààààà àààààà ààààààààààà %s.\n"
 "àààààààààààà àààààààààààà àààà : "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4359,37 +4505,17 @@ msgstr ""
 "àààà ààààààààà àààààà ààààààààààà %s.\n"
 "ààààààààààà ààààà àààààààààààà àààà  %s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"àààà ààààààààà àààààà ààààààààààà %s.\n"
-"àààààààààààà àààààààààààà àààà %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "POP3 server %s"
-msgstr "POP3 àààààààà %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "àààà3 àààààààà %s àààà %s ààà "
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:673
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "àààà ààààààààà àààààà ààààààààààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s'. àààà ààààà ààààà ààààà "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:718
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "àààà3 àààààààà àààààààààààà ààààà àààààààààààà ààààà"
@@ -4402,8 +4528,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"\"sendmail\" ààààà àààààà ààà àààààààààà àààààààààà ààààààààààààààààààààà."
+msgstr "\"sendmail\" ààààà àààààà ààà àààààààààà àààààààààà ààààààààààààààààààààà."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4413,36 +4538,36 @@ msgstr "àààààààààààà"
 msgid "Mail delivery via the sendmail program"
 msgstr "àààààààààààà ààààà àààààà àààààààààà àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "àààààààà àààààààà àààààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail: %s ààààà ààààà àààààààà ààààààààààà: àààààààààà àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail: %s à àààààà ààààààààààà: àààààààààà àààààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not send message: "
 msgstr "àààààà àààààà àààààààààààà: %s"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "%s ààààààààà àààààààààà ààààààààààà: àààààààààà àààààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s à ààààà ààààààààààà : àààààààààà àààààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "%d ààààààààà àààààààààààà ààààààààààà: àààààààààà àààààà ààààààààààà"
@@ -4452,7 +4577,6 @@ msgid "Default SMTP port"
 msgstr "àààààààààààà SMTP àààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-#| msgid "SMTP server %s"
 msgid "SMTP over SSL"
 msgstr "SMTP ààà SSL"
 
@@ -4467,736 +4591,918 @@ msgstr "SMTP"
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
-"àààà àààààààààà ààààààààà àààààà SMTP ààààààààààà ààààààààààà ààààààààààààà "
-"àààààààààà "
+"àààà àààààààààà ààààààààà àààààà SMTP ààààààààààà ààààààààààà ààààààààààààà àààààààààà "
 "àààààààààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "ààààààààààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "SMTP àààààà %s àààà ààààààààààà àààààà ààààààààààààà : %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS àààààà ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
 #, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "SMTP àààà %s àààà àààààààààà àààààààà àààààà ààààààààààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP àààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../camel/providers/smtp/camel-smtp-transport.c:304
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s SMTP àààààà àààààààààà àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP àààààà %s ààààààààààà àààààà àààààààà àààààààààà %s."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "SMTP àààààà %s , %s ààà ààààààààààààààààààààà ààààà ààààà "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:437
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ààààààààà àààààà ààà ààààààààààà \n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
+msgstr "SASL àààààààààà ààààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:499
+#: ../camel/providers/smtp/camel-smtp-transport.c:512
+msgid "AUTH command failed: "
+msgstr "AUTH àààààà ààààààààààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "àààààà àààààà ààààààààààà : àààà ààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:561
+#: ../camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "àààààà àààààà ààààààààààà : ààààààààààà àààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:565
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Sending message"
 msgstr "àààààà àààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:590
+#: ../camel/providers/smtp/camel-smtp-transport.c:690
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "àààààà àààààà ààààààààààà : àààààààà àààààà ààààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:603
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"àààààà àààààà ààààààààààà: ààààààààààà àààààààà ààààààà ààààààà ààààààààà"
+msgstr "àààààà àààààà ààààààààààà: ààààààààààà àààààààà ààààààà ààààààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "àààààààà àààà, àààààààà ààààààààààààà àààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààà àààààà àààààààààà ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:710
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "àààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "àààààà àààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "ààààà àààà, àààààà ààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "àààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "àààà ààààààààà àààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:722
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "àààà ààààà, ààààààààà àààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "àààààààààà àààààààààààààààà àààààààà àààààààààààà, ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "User not local; will forward to <forward-path>"
 msgstr "ààà ààààààààà ààààà ààààààà, <forward-path> àààààààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"ààààààààà àààààààààà ààààà ààààààààà :àààààààààà àààààààààààà ààààààààààààà"
+msgstr "ààààààààà àààààààààà ààààà ààààààààà :àààààààààà àààààààààààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ààààààààà ààààà ààààààààà: àààààààààà àààààà ààààààààààààà "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "ààààààààà ààààà ààà ààààààààààààà: ààààà ààààààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:835
 msgid "User not local; please try <forward-path>"
 msgstr "ààààààààà ààààààà ààààà ; àààààààààààààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:736
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ààààààààà ààààà àààààààààààà : ààààààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:738
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ààààààààà àààààààààà ààààà ààà ààààààààààààà: ààààààà àààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"ààààààààà ààààà àààààààààààà: àààààààààà àààààààààà ààààààààà àààààà ààààà"
+msgstr "ààààààààà ààààà àààààààààààà: àààààààààà àààààààààà ààààààààà àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "àààààààààà ààààààà àààààààààà; <CRLF>.<CRLF> ààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:744
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
 msgid "Transaction failed"
 msgstr "àààààààààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:748
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "A password transition is needed"
 msgstr "àààààààààà ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
 msgid "Authentication mechanism is too weak"
 msgstr "àààààà àààà ààààààà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ààààààààà àààààà àààààààààà ààààààààààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
 msgid "Temporary authentication failure"
 msgstr "àààààààà àààààà àààààà ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1004
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "SMTP àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1031
-#: ../camel/providers/smtp/camel-smtp-transport.c:1048
-#: ../camel/providers/smtp/camel-smtp-transport.c:1056
-msgid "HELO command failed: "
-msgstr "HELO àààààà ààààààààààààà: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
-msgid "SMTP Authentication"
-msgstr "SMTP àààààà àààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1144
-#: ../camel/providers/smtp/camel-smtp-transport.c:1155
-#: ../camel/providers/smtp/camel-smtp-transport.c:1168
-msgid "AUTH command failed: "
-msgstr "AUTH àààààà ààààààààààààà: "
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+msgid "HELO command failed: "
+msgstr "HELO àààààà ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1299
+#: ../camel/providers/smtp/camel-smtp-transport.c:1240
+#: ../camel/providers/smtp/camel-smtp-transport.c:1255
+#: ../camel/providers/smtp/camel-smtp-transport.c:1265
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM àààààà ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1326
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
 msgid "RCPT TO command failed: "
 msgstr "RSET àààààà ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
-#: ../camel/providers/smtp/camel-smtp-transport.c:1351
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
-#: ../camel/providers/smtp/camel-smtp-transport.c:1403
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
-#: ../camel/providers/smtp/camel-smtp-transport.c:1491
-#: ../camel/providers/smtp/camel-smtp-transport.c:1504
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1362
+#: ../camel/providers/smtp/camel-smtp-transport.c:1373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1443
+#: ../camel/providers/smtp/camel-smtp-transport.c:1463
+#: ../camel/providers/smtp/camel-smtp-transport.c:1477
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
 msgid "DATA command failed: "
 msgstr "DATA àààààà ààààààààààààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
 msgid "RSET command failed: "
 msgstr "RSET àààààà ààààààààààààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1584
-#: ../camel/providers/smtp/camel-smtp-transport.c:1598
-#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1574
+#: ../camel/providers/smtp/camel-smtp-transport.c:1581
 msgid "QUIT command failed: "
 msgstr "QUIT àààààà ààààààààààààà:"
 
-#: ../libedataserver/e-categories.c:47
-#| msgid "Anniversary"
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "ààààààà ààààààà ààààà(UID)"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "àààààà àààà ààààààà ààààà ààà àààà ààààààààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Birthday and anniversary reminder units"
+msgstr "àààààà àààà ààààààà ààààà ààà àààà ààààààààààà ààààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "àààààà àààà ààààààà ààààà ààà àààà ààààààààààà ààààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "àààààààààà àààààà àààààààà àààà àààààààààààààà ààààààààààààààààà ààààààààà ààààààààà"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"àààààààààà àààààà ààààààààà ààààààààààààààà ààààààà, \"minutes\", \"hours\" àààààà "
+"\"days\""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "àààààààààà ààààààà àààààààà ààààààààààààà ààààààààààà àààààà àààààààà"
+
+#: ../libebackend/e-authentication-mediator.c:205
+#: ../libebackend/e-authentication-mediator.c:216
+#: ../libebackend/e-authentication-mediator.c:849
+#: ../libebackend/e-authentication-mediator.c:1179
+msgid "Bus name vanished (client terminated?)"
+msgstr "Bus ààààà àààààààààààà (ààààààààà ààààààààààààààà?)"
+
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+msgstr "àààààààààààààààààà àààà ààààààà ààààà"
+
+#: ../libebackend/e-authentication-mediator.c:334
+#: ../libebackend/e-authentication-mediator.c:345
+#: ../libebackend/e-authentication-mediator.c:843
+#: ../libebackend/e-authentication-mediator.c:1173
+msgid "Client cancelled the operation"
+msgstr "àààààààààà ààààààààààà ààààà ààààààà"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr "ààààààààà àààààààààà àààààààààà àààààààààààààààààà"
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "àààààà àààààààààààà àààààà àààààààààà ààààààààààà"
+
+#: ../libebackend/e-authentication-session.c:595
+msgid "Password was incorrect"
+msgstr "àààààààààà àààà"
+
+#: ../libebackend/e-authentication-session.c:1331
+#: ../libebackend/e-authentication-session.c:1507
+#: ../libebackend/e-authentication-session.c:1690
+msgid "Keyring operation was cancelled"
+msgstr "àààà àààà ààààààààà ààààà ààààààààààààà"
+
+#: ../libebackend/e-backend.c:190
+#, c-format
+msgid "%s does not support authentication"
+msgstr " %s ààààààààààààààààààààà ààààà ààààà"
+
+#: ../libebackend/e-collection-backend.c:734
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s àààààààà ààààààà àààààààààààà àààààààààà"
+
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s àààààààà ààààààà ààààààààà àààààààààà"
+
+#: ../libebackend/e-server-side-source.c:128
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "àààà ààààààààà ààà [%s] àààà ààààà"
+
+#: ../libebackend/e-server-side-source.c:945 ../libedataserver/e-source.c:1092
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "àààà ààààà '%s' àààààààà ààààààà àààààààààààà àààààààààà"
+
+#: ../libebackend/e-server-side-source.c:959
+#, c-format
+msgid "Data source '%s' has no collection backend to create the remote resource"
+msgstr "àààà ààààà '%s' ààà àààààààà àààààà àààààààààààààààà ààààààà ààààààààà àààààà ààààà"
+
+#: ../libebackend/e-server-side-source.c:987 ../libedataserver/e-source.c:1201
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "àààà ààààà '%s' àààààààà ààààààà ààààààààà àààààààààà"
+
+#: ../libebackend/e-server-side-source.c:1001
+#, c-format
+msgid "Data source '%s' has no collection backend to delete the remote resource"
+msgstr "àààà ààààà '%s' ààà àààààààà àààààà ààààààààààààà ààààààà ààààààààà àààààà ààààà"
+
+#: ../libebackend/e-server-side-source.c:1336
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "àààààààààà '.source' àààà àààààààààà àààààà àààààààà"
+
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1512
+msgid "The user declined to authenticate"
+msgstr "ààààà ààààààààààà àààààààààà"
+
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UID '%s' ààààààà ààààààààààààààààà"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:48
-#| msgid "Birthday"
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:49
-#| msgid "Business"
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:50
-#| msgid "Competition"
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:51
-#| msgid "Favorites"
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "àààààààààààà"
 
-#: ../libedataserver/e-categories.c:52
-#| msgid "Gifts"
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ààààààààààààà"
 
-#: ../libedataserver/e-categories.c:53
-#| msgid "Goals/Objectives"
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààààààà/àààààààààà"
 
-#: ../libedataserver/e-categories.c:54
-#| msgid "Holiday"
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààààààà àààà"
 
-#: ../libedataserver/e-categories.c:55
-#| msgid "Holiday Cards"
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "àààààààà àààààààà"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
-#| msgid "Hot Contacts"
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ààààà àààààààààà"
 
-#: ../libedataserver/e-categories.c:58
-#| msgid "Ideas"
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:59
-#| msgid "International"
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:60
-#| msgid "Key Customer"
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àààà ààààààààààààà"
 
-#: ../libedataserver/e-categories.c:61
-#| msgid "Miscellaneous"
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:62
-#| msgid "Personal"
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààààààààà"
 
-#: ../libedataserver/e-categories.c:63
-#| msgid "Phone Calls"
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "àààààààà àààààààààà"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
-#| msgid "Status"
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààà "
 
-#: ../libedataserver/e-categories.c:66
-#| msgid "Strategies"
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:67
-#| msgid "Suppliers"
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ààààààààààà"
 
-#: ../libedataserver/e-categories.c:68
-#| msgid "Time & Expenses"
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààààà&àààààààà "
 
-#: ../libedataserver/e-categories.c:69
-#| msgid "VIP"
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:70
-#| msgid "Waiting"
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ààààààààààààààà"
 
-#: ../libedataserver/e-client.c:113
-#| msgid "URI not loaded"
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ààààà àààààààààààààà"
 
-#: ../libedataserver/e-client.c:115
-#| msgid "URI already loaded"
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ààààà àààààààà àààààààààààà"
 
-#: ../libedataserver/e-client.c:123
-#| msgid "SSL unavailable"
+#. Translators: This means that the EClient does not support offline mode, or
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "àààààààà ààààààààààààà"
 
-#: ../libedataserver/e-client.c:145
-#| msgid "parse error"
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "D-Bus àààà"
 
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "àààààà àààààà àààààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "àààààààààà  àààààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "àààààààààà àààààààààà ààààààààà"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "àààààààààà ààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "àààà àààààà \"%s\" àààààà ààààààààààààààà  àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "àààà àààààà \"s\" ààààààààààààààà  àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "àààà àààààà \"s\" àààààààààà ààààààààààà  àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "àààà àààààà \"s\" àààààà àààààààààààààà àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "àààà àààààà \"s\" àààààààà ààààààààààààà àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "àààà àààààà \"s\" àààà ààààààààààààà àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "àààà àààààà \"s\" ààààààààààà  àààààààààààà àààààààààà"
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ààààà àààààààà [%s] àààà ààààà"
+
+#: ../libedataserver/e-source.c:919
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "'%s' àààà ààààà ààààààààààààààà"
+
+#: ../libedataserver/e-source.c:1001
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "'%s' àààà ààààà àààààààààààààà"
+
+#: ../libedataserver/e-source.c:1382
+msgid "Unnamed"
+msgstr "àààààààààà"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ààààààà àààààààààà ààà àààààààààààà ààààààà àààààà àààààààà"
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1654
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1659
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1675
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1782
-#: ../libedataserver/e-time-utils.c:1912
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1685
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1673
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1678
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1683
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1699
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1688
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1704
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1693
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1709
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1696 ../libedataserver/e-time-utils.c:1785
+#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854 ../libedataserver/e-time-utils.c:1974
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
+#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1870
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1874
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:94
-#: ../libedataserverui/e-book-auth-util.c:651
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP àààààààààà àààààààààààààààà àààà ààààààààà"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Automatic proxy configuration URL"
+msgstr "àààààààà ààààà àààààààà URL"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid "Host name for HTTP requests"
+msgstr "HTTP àààààààààààààààà àààààà ààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Host name for HTTPS requests"
+msgstr "HTTPS àààààààààààààààà àààààà ààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Host name for SOCKS requests"
+msgstr "àààààà àààààààààààààààà ààààààà ààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Host name to use for HTTP requests."
+msgstr "HTTP ààààààààààààààà àààààààààà ààààààà àààààà ààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "Host name to use for HTTPS requests."
+msgstr "HTTPS ààààààààààààààà àààààààààà ààààààà àààààà ààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name to use for SOCKS requests."
+msgstr "SOCKS ààààààààààààààà àààààààààà ààààààà àààààà ààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "List of hosts for which do not use proxy."
+msgstr "ààààà àààààààààààà ààààààààààà ààààààààààà àààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "List of hosts to connect to without proxy"
+msgstr "ààààààààààà àààààà ààààààà ààààààààààà àààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Password to use to authenticate against proxy server."
+msgstr "ààààààà àààààààààààààà ààààààààààà àààààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "Port number for HTTP requests"
+msgstr "HTTP ààààààààààààààà àààààààààà ààààààà ààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "Port number for HTTPS requests"
+msgstr "HTTPS àààààààààààààààà ààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "Port number for SOCKS requests"
+msgstr "SOCKS àààààààààààààààà ààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "Port number to use for HTTP requests."
+msgstr "HTTP ààààààààààààààà àààààààààà ààààààà ààààà ààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "Port number to use for HTTPS requests."
+msgstr "HTTPS ààààààààààààààà àààààààààà ààààààà ààààà ààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "Port number to use for SOCKS requests."
+msgstr "SOCKS ààààààààààààààà àààààààààà ààààààà ààààà ààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Proxy authentication password"
+msgstr "ààààààà àààààààààààààà àààààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Proxy authentication user name"
+msgstr "ààààààà àààààààààààààà ààààà ààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Proxy type to use"
+msgstr "àààààààààà ààààààà ààààààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "User name to use to authenticate against proxy server."
+msgstr "ààààààà àààààààààààààà ààààààààààà ààààà ààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+"àààà ààà ààààààààà àààààààààà àààààààà. \"0\" ààààààà àààààààààààààà, \"1\" ààààààà "
+"ààààà àààààààà, \"2\" ààààààà ààààààà ààààààààà àààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Where to read automatic proxy configuration from."
+msgstr "àààààààà ààààà àààààààà ààààààààààà àààààà àààààààà."
 
-#: ../libedataserverui/e-book-auth-util.c:191
-#: ../libedataserverui/e-book-auth-util.c:412
-msgid "Failed to authenticate.\n"
-msgstr "ààààààààààààà ààààààààààà.\n"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Whether authentication is required to access proxy server."
+msgstr "ààààààà àààààààààà àààà àààààààààà àààààà"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Whether proxy server requires authentication"
+msgstr "ààààà àààààààààààààà àààààààààààà àààààààà àààààà àààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Whether to use http-proxy"
+msgstr "http-ààààààààà àààààààààà àààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Whether to use proxy for HTTP requests."
+msgstr "HTTP ààààààààààààààà ààààààààà àààààààààà àààààààà"
+
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "_u àààààààà àààààààààààà àààààà:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "ààààààààà ààààà àààààà:_A"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "ààà"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ààààà \"%s\"à ààààààààà"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ààààààà àààààà"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "ààààààà ààààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "ààààààà ààààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "ààà ( _Icon)"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ààààà àààààà"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr ""
-"ààààààà ààààààà ààààààààààààà àààààà.àààà àààà ààààà àààààààààààààà ('%s')"
-
-#: ../libedataserverui/e-client-utils.c:799
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
-"àààààà:  %s"
-
-#: ../libedataserverui/e-client-utils.c:801
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for calendar %s (user %s)"
-msgstr "àààààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
-
-#: ../libedataserverui/e-client-utils.c:805
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
-"àààààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:807
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for task list %s (user %s)"
-msgstr "ààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
-
-#: ../libedataserverui/e-client-utils.c:811
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
-"àààààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:813
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for memo list %s (user %s)"
-msgstr "àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
-
-#: ../libedataserverui/e-client-utils.c:818
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
-"àààààà: %s"
-
-#: ../libedataserverui/e-client-utils.c:820
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
+msgstr "ààààààà ààààààà ààààààààààààà àààààà.àààà àààà ààààà àààààààààààààà ('%s')"
 
-#: ../libedataserverui/e-client-utils.c:917
-msgid "Enter Passphrase"
-msgstr "àààààààààààà àààààààààà"
-
-#: ../libedataserverui/e-client-utils.c:919
-#| msgid "Password"
-msgid "Enter Password"
-msgstr "àààààààààààà àààààààààà"
-
-#: ../libedataserverui/e-name-selector-dialog.c:184
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "àààààààààà ààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "àààààà àààààààà (_o) :"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
-msgstr "ààà:(_g)"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Cat_egory:"
+msgstr "ààà:(_e)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:332
 msgid "_Search:"
 msgstr "ààààà: (_S)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1011
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1182
 msgid "Any Category"
 msgstr "àààà ààà ààààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:359
 msgid "Co_ntacts"
 msgstr "àààààààààà (_n) "
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:421
 msgid "Search"
 msgstr "ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "àààààà  àààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:427
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "àààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:545
 msgid "Select Contacts from Address Book"
 msgstr "àààààààààààààààààààààààààà àààààààààà àààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:766
+#: ../libedataserverui/e-name-selector-dialog.c:917
 msgid "_Add"
 msgstr "àààà(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:770
+#: ../libedataserverui/e-name-selector-dialog.c:921
 msgid "_Remove"
 msgstr "ààààààààà (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:930
+#: ../libedataserverui/e-name-selector-dialog.c:1097
 #, c-format
-#| msgid "Error reading mail file: %s"
 msgid "Error loading address book: %s"
 msgstr "àààààà àààààààààà ààààààà àààà àààà: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2741
+#: ../libedataserverui/e-name-selector-entry.c:3008
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "ààààààà ààààààà (E_)%s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2756
+#: ../libedataserverui/e-name-selector-entry.c:3024
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s à ààààà ààà (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2766
+#: ../libedataserverui/e-name-selector-entry.c:3035
 #, c-format
 msgid "C_ut %s"
 msgstr "%s à ààààààà"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2783
+#: ../libedataserverui/e-name-selector-entry.c:3053
 #, c-format
 msgid "_Edit %s"
 msgstr "%s à ààààààààààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:509
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "àààààààààà %s (_D)"
@@ -5205,39 +5511,302 @@ msgstr "àààààààààà %s (_D)"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "àààààààà àààà àààààààà ààààààà. ààààà àààààà ààààààà ààààà  ààààà "
 
-#: ../libedataserverui/e-passwords.c:699
-#: ../libedataserverui/e-passwords-win32.c:612
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "ààààààà àààà àààà ààààààà àààààà àààààà ààààààààà àààààààààà."
 
-#: ../libedataserverui/e-passwords.c:819
-#: ../libedataserverui/e-passwords-win32.c:735
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "ààààààààààà ààààà àààààà ààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:820
-#: ../libedataserverui/e-passwords-win32.c:736
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "(_R) àààà ààààààà àààà ààààààààààà àààà àààà àààààà àààààà ààààà."
 
-#: ../libedataserverui/e-passwords.c:825
-#: ../libedataserverui/e-passwords-win32.c:741
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "àààà àààààà àààààà àààààààà ààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:826
-#: ../libedataserverui/e-passwords-win32.c:742
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "àààà àààààààà àààààààààà àààààààààààà àààààà ààààààààà (_R)"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "ààààààààà (_D)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "ààààààààààà àààààà àààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:169
-msgid "_Destination"
-msgstr "ààààààààà (_D)"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "àààààààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "Code: %u -  àààààààààààààà àààààààààà ààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "àààààààààà ààààààààà àààààààààà ààààààààààà à ààààààààààà àààààààààààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "àààààààààà ààààààààà àààààààà ààààààààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "àààààààààà àààààààà ààààààààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "àààààà àààààààà ààààààààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "àààààààààà ààààààààà àààààààààààà ASUrl ààààààà OABUrl ààà ààààààààààà àààààààààààààà"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "àààààà"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
+msgid "Keep running after the last client is closed"
+msgstr "ààààà ààààààààà ààààà ààààààà ààààààààà àààààà"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+msgid "Wait running until at least one client is connected"
+msgstr "ààààààààà ààà àààààààààààààà ààààààààààààà ààà ààààààààà àààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "ààààààààà ààààà ààààààààààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:649
+msgid "Display Name"
+msgstr "ààààààà àààààà:"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:658
+msgid "Flags"
+msgstr "ààààààà"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:710
+msgid "Identity"
+msgstr "àààààààà"
+
+#~| msgid "Authentication Required"
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "ààààààààààààà ààààààààààààààà..."
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: UID àààà ààààà ààààààà ààààà`%s' gconfàà ààààààààààààààààààà."
+
+#~ msgid "On This Computer"
+#~ msgstr "àààà ààààààààààààà"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "ààààà uri '%s'"
+
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to find system book"
+#~ msgstr "ààààà àààààààààà ààà ààààààààààà"
+
+#~| msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "UID '%s' ààààà ààààà ààààà ààà ààà ààààààààààààààà ààààààààààààà."
+
+#~ msgid "Empty URI"
+#~ msgstr "àààààà àààààà"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s àààà àààààààààààà àààààààààà (ààààà %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "%s ààààààààà ààààààà ààààààààààà %sàààà àààààààààààà àààààààààà"
+
+#~| msgid "Invalid source"
+#~ msgid "Invalid source type"
+#~ msgstr "ààààà ààà ààà"
+
+#~ msgid "Invalid URI"
+#~ msgstr "ààààààà àààààà"
+
+#~ msgid "Could not instantiate backend"
+#~ msgstr "àààà  àààààààà àààààà ààààààààààà"
+
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "àààààà ààààààààààà ( %s: %s)"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL ààààààààààààà"
+
+#~| msgid "URL '%s' needs a username component"
+#~ msgid "URL '%s' needs a user component"
+#~ msgstr "URL '%s' ààà ààààà  àààà àààààààààààààà"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s' ààààààà ààààà àààà"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s' àààà àààà àààà"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "SSL ààààààààà ààààà %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "àààà ààààààààà?"
+
+#~ msgid "Connection to Server"
+#~ msgstr "ààààààààà ààààààà"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "ààààààààààààà àààà ààààààààà àààààààààààààà (_U)"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "(_m) àààààà:"
+
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "ààààà ààààààààà àààààà àààààààààààààààà ààààààààààà"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "SSL àààààààààà ààààààààà ààààààààà"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL àààààààà àààààààààààààà àààà"
+
+#~ msgid "You did not enter a password."
+#~ msgstr "ààààààà àààààààààààà ààààààà àààààà"
+
+#~ msgid "Use I_dle if the server supports it"
+#~ msgstr "_d àààààààà ààààà ààààààààà àààààà ààà à  àààààààààààà."
+
+#~ msgid "Command:"
+#~ msgstr "àààààà:"
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "_r àààààààààà ààà àààààà àààààààààààà ààààààààà "
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "àààààààà ààààà ààààààà àààààà: "
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "àààààààààà ààààààààààà ààààà ààààààà ààààà ààààààààààààààààà"
+
+#~ msgid "TLS is not available in this build"
+#~ msgstr "TLS "
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr "àààà ààààààààà àààààà ààààààààààà %s ààààààààààà àààààà àààààààà ààààà ààààà"
+
+#~ msgid "SASL '%s' Login failed for POP server %s%s"
+#~ msgstr "SASL '%s' ààààààààà àààà (POP) àààààààààààààà àààààà àààààààà %s %s"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending password%s"
+#~ msgstr ""
+#~ "àààà ààààààààà àààààà ààààààààààà %s.\n"
+#~ "àààààààààààà àààààààààààà àààà %s"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP ààààààààà àààààà ààà ààààààààààà \n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP àààààà àààà"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "LDAP àààààààààà àààààààààààààààà àààà ààààààààà"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
+#~ "àààààà:  %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "àààààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
+#~ "àààààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "ààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
+#~ "àààààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)\n"
+#~ "àààààà: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "àààààà àààààààà %s ààààà àààààààààààà àààààààààà (ààààà %s)"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "àààààààààààà àààààààààà"
+
+#~| msgid "Password"
+#~ msgid "Enter Password"
+#~ msgstr "àààààààààààà àààààààààà"
 
 #~ msgid "Updating contacts cache (%d)... "
 #~ msgstr "àààààààààà àààààààààà àààààààààààààààà (%d)... "
@@ -5266,12 +5835,6 @@ msgstr "ààààààààà (_D)"
 #~ msgid "Loading %s items"
 #~ msgstr "ààààààààà àààààà (%s)"
 
-#~ msgid "Calendar"
-#~ msgstr "àààààààààà"
-
-#~ msgid "Invalid server URI"
-#~ msgstr "ààààààà àààààà(URI) àààààà"
-
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "àààààààààà ààààà ààààààà àààààààà àààààààà"
 
@@ -5299,9 +5862,6 @@ msgstr "ààààààààà (_D)"
 #~ msgid "Cannot retrieve calendar changes: %s"
 #~ msgstr "àààààààààà àààààààààà ààààà ààààààààààà: %s"
 
-#~ msgid "Verifying message"
-#~ msgstr "àààààààà àààààààààààààà"
-
 #~ msgid "No stream available"
 #~ msgstr "ààà ààààà ààààà "
 
@@ -5347,9 +5907,6 @@ msgstr "ààààààààà (_D)"
 #~ msgid "Checking for new mail"
 #~ msgstr "ààààà àààààààààà àààààà àà ààààààààààà"
 
-#~ msgid "Check new messages for J_unk contents"
-#~ msgstr "ààààà ààààààààààà àààààà àààààààààà àààààà àà ààààààààààà"
-
 #~ msgid "Automatically synchroni_ze account locally"
 #~ msgstr "àààààààààààà àààààà àààààà àààààààààààààà"
 
@@ -5413,9 +5970,6 @@ msgstr "ààààààààà (_D)"
 #~ msgid "Could not send message: %s"
 #~ msgstr "àààààà àààààà ààààààààààà: %s"
 
-#~ msgid "Operation cancelled"
-#~ msgstr "ààààààààà ààààà ààààààààààààà"
-
 #~ msgid "_Apply filters to new messages in INBOX on this server"
 #~ msgstr "àààààààààààà ààààààààààààà ààààà ààààààààààààà ààààààààà ààààààààààààààà"
 
@@ -5452,9 +6006,6 @@ msgstr "ààààààààà (_D)"
 #~ msgid "Invalid response from server"
 #~ msgstr "àààààààààààààà ààààààà ààààà"
 
-#~ msgid "No response from the server"
-#~ msgstr "àààààààààààààààààà àààà ààààààà ààààà"
-
 #~ msgid "Bad parameter"
 #~ msgstr "ààààà àààààààààà"
 



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