[evolution-data-server/gnome-3-6] Updated Malayalam file



commit ba85c8a360535062dd5e75f87f0bcf74c6623423
Author: Ani Peter <apeter redhat com>
Date:   Sat Sep 22 01:45:57 2012 +0530

    Updated Malayalam file

 po/ml.po | 7402 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 4331 insertions(+), 3071 deletions(-)
---
diff --git a/po/ml.po b/po/ml.po
index ea56728..308beb6 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,1334 +1,1941 @@
 # translation of evolution-data-server.HEAD.ml.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
 # FSF-India <locale gnu org in>, 2003.
 # Suresh VP <mvpsuresh yahoo com>, 2003.
-# Ani Peter <apeter redhat com>, 2006, 2009.
-#
+# Ani Peter <apeter redhat com>, 2006, 2009, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD.ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-02-25 12:08+0000\n"
-"PO-Revision-Date: 2009-03-12 22:17+0530\n"
-"Last-Translator:Ani Peter <apeter redhat com> \n"
-"Language-Team:  Swathanthra Malayalam Computing|ààààààààà àààààà ààààààààààààà <smc-discuss googlegroups com>\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: 2012-09-16 16:58+0000\n"
+"PO-Revision-Date: 2012-09-22 01:38+0000\n"
+"Last-Translator: Ani Peter <apeter redhat com>\n"
+"Language-Team: Malayalam <discuss lists smc org in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Generator: Lokalize 1.0\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:525
+#: ../camel/providers/imap/camel-imap-store.c:469
+#: ../libedataserver/e-client.c:165
+msgid "Unknown error"
+msgstr "àààààààà ààà ààààààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:141
+#, c-format
+#| msgid "Failed to create child process '%s': %s"
+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 "Could not create directory %s: %s"
+msgid "Failed to make directory %s: %s"
+msgstr "àààààààà %s àààààààààààààâ àààààààààààà: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:459
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "ààààâàà àààààààà '%s' ààààâàààààààààààààààâ àààààà: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../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 "àààààààààààâ ààààà àààààààà"
+
+#: ../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:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../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/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "ààààààààààâ ààààââàààà àààààààààà (%d)... "
+#: ../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:645
+msgid "Querying for updated contactsâ"
+msgstr "ààààààààààà ààààààààààâ àààààààààààààà..."
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:782
+msgid "Querying for updated groupsâ"
+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:1234
+msgid "Creating new contactâ"
+msgstr "ààààà àààààà ààààààààààààààà..."
+
+#: ../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:1639
+msgid "Modifying contactâ"
+msgstr "àààààààààààâ àààààà ààààààààààà..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1809
+#| msgid "Loading..."
+msgid "Loadingâ"
+msgstr "àààààààààààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "àààààààààààà cache àààààààààààà (%d)..."
+#: ../addressbook/backends/google/e-book-google-utils.c:1562
+msgid "Personal"
+msgstr "àààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#. 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 Name"
+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:165
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "àààààà ààààààààààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "ààààààààààâàààààààà ààààà àààààààààààààà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
-msgstr "ààààààà àààààà àààààààààààààà"
+msgstr "àààààààâ àààààà àààààààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../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:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "àààààààà àààààâ àààààààààà"
+
+#: ../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:1752
+#: ../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:2064
+#: ../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 ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP àààâààààààà àààààààààààâ àààààà ààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../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 ""
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "LDAP-ààâàà àààààààààâ àààààààâ àààààààààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "àààààààààààâ àààààà"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288 ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496 ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639 ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730 ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028 ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211 ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370 ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575 ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818 ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055 ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263 ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" àààààà \"%s\" àààààààààààààààà"
+msgid "Downloading contacts (%d)... "
+msgstr "ààààààààààâ ààààââàààà àààààààààà (%d)... "
 
-#: ../addressbook/libebook/e-book.c:301 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384 ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831 ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276 ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5552
 #, c-format
-msgid "book busy"
-msgstr "ààààààà àààààààààààâ"
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to get the DN for user '%s'"
+msgstr "'%s' ààààààààààààààà àààààâ àààààààààààààààààâ àààààà"
 
-#: ../addressbook/libebook/e-book.c:332 ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540 ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679 ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770 ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070 ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255 ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411 ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624 ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878 ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099 ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302 ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537 ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715 ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913 ../addressbook/libebook/e-book.c:3463
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:645
 #, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "\"%s\" ààààâ ààààààààà CORBA ààààààààààâ"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to open addressbook at '%s': %s"
+msgstr "'%s'-ààâ àààààààààààà ààààààààààààààâ àààààà: %s"
 
-#: ../addressbook/libebook/e-book.c:2526
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: àààààààâ ààà ààààààààààà àààà"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2555 ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
 #, c-format
-msgid "%s: could not cancel"
-msgstr "%s: àààààààààààààâ àààààààààààààà"
+msgid "DELETE failed with HTTP status %d"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:2671 ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\"-àà àààà \"%s\" àààààààààààààààà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+msgid "Contact on server changed -> not modifying"
+msgstr "àààâàààààààà àààààà àààààààààààààààààà -> àààààà àààààààààààààà"
 
-#: ../addressbook/libebook/e-book.c:2739
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
 #, c-format
-msgid "%s: canceled"
-msgstr "%s: àààààààààààààààà"
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "HTTP àààààààààà àààààààààààâ àààààà ààààààààààààà ààààààààààààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: àààààààà àààààà."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+msgid "Loading Addressbook summary..."
+msgstr "ààààààààààààààààààà àààààààà àààààààààààààà..."
 
-#: ../addressbook/libebook/e-book.c:3326 ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s'-àà ààà ààààààààààà àààààààà"
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener àààààààààààààâ ààààààààà"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+msgid "No response body in webdav PROPFIND result"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3605
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf-ààâ àààààààààààààààààààà UID-ààààâ àààààààààà"
+#| msgid "Downloading contacts (%d)... "
+msgid "Loading Contacts (%d%%)"
+msgstr "ààààààààààâ àààààààààààààà (%d%%)"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: gconf-ààâ àààààààààààààààààààà uid `%s' àààààà àààààààà."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1287
+msgid "Cannot transform SoupURI to string"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:95
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "àààààà ààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "àààààà àààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "ààààààààààààà ààà àààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:101
+#| msgid "No such message"
+msgid "No such source"
+msgstr "àààààà àààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
+#| msgid "Namespace"
+msgid "No space"
+msgstr "ààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:488
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "àààààà àààâàààà ààààààààààâ àààààààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:2244
+#: ../calendar/libecal/e-cal-client.c:4602
+#| msgid "Connection to Server"
+msgid "Cannot get connection to view"
+msgstr "ààààààààâ àààààààâ àààààààà"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "ààààààààà ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#. FILE_AS is not really a structured field - we use a getter/setter
+#. * 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:116
-msgid "Book URI"
-msgstr "URI àààààà ààààààà"
+#: ../addressbook/libebook/e-contact.c:128
+#| msgid "Book URI"
+msgid "Book UID"
+msgstr "àààààà ààààà"
 
 #. 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:122
+#. * 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:123
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "àààààààààààààà àààà "
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "àààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ààààààààààà "
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "à ààààààâ 1 "
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "à àààààà 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "à àààààà 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "à ààààààâ 4 "
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "àààààààâ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "àààààààà ààààààààààààà àààààâ"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ààààààààààààààâàà ààààààààààààà àààààâ"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ààààà ààààààààààààà àààààâ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ààààà ààààâ àààààâ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ààààà ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "ààààà ààààâ 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "ààààâàààààà ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ààààâ ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "àààààààààààà ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "àààààààà ààààâ àààààâ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "àààààààà ààààâ àààààâ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "ààààààâ ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ààààà ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "àààààâ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ààààààà ààààâ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "àààààà "
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "ààààààààààààâàà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ààààààâ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "ààà ààààààâàà URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "àààà ààààààâàà URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ààààààààààâ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "àààààààààâàà URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "àààà àà/ààààààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS àààààààâ"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààâààààâàààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ààààà/àààâààààààààâàà àààà"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "àààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM àààâàààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM àààâàààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM àààâàààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààààààà àààààààààà ààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààààààà àààààààààà ààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààààààà àààààààààà ààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààààààà àààààààààà àààâàààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààààààà àààààààààà àààâàààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààààààà àààààààààà àààâàààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Jabber ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:213
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "Jabber ààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:214
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "Jabber ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:215
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "Jabber ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber àààâàààà Id 1"
+#: ../addressbook/libebook/e-contact.c:216
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "Jabber àààâàààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber àààâàààà Id 2"
+#: ../addressbook/libebook/e-contact.c:217
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "Jabber àààâàààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber àààâàààà Id 3"
+#: ../addressbook/libebook/e-contact.c:218
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "Jabber àààâàààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà ààààààààâ àààà 1 "
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! àààâàààà ààààààààâ àààà 1 "
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! àààâàààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! àààâàààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN àààâàààà ààààààààâ àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN àààâàààà ààààààààâ àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN àààâàààà ààààààààâ àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "ICQ ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:231
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
+msgstr "ICQ ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:232
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
+msgstr "ICQ ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:233
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
+msgstr "ICQ ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ àààâàààà Id 1"
+#: ../addressbook/libebook/e-contact.c:234
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
+msgstr "ICQ àààâàààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ àààâàààà Id 2"
+#: ../addressbook/libebook/e-contact.c:235
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
+msgstr "ICQ àààâàààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ àààâàààà Id 3"
+#: ../addressbook/libebook/e-contact.c:236
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
+msgstr "ICQ àààâàààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "àààààà àààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:228
+#. 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:231
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ààààâààààà àààààà "
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "ààààààààààààààâàà ààààâàààààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ààààà àààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "àààààààààààà àààààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "àààààà "
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "àààà "
 
-#: ../addressbook/libebook/e-contact.c:243
+#. 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:244
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "àààààààâ àààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààààâ ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "àààààààà àààààààààààà Id àààààààà"
+#: ../addressbook/libebook/e-contact.c:265
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "àààààààà àààààààààààà ID àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "àààààâ Id àààààààà"
+#: ../addressbook/libebook/e-contact.c:266
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "àààààâ ID àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ààààààààâ ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN ààààààààâ ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ICQ Id àààààààà"
+#: ../addressbook/libebook/e-contact.c:269
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML ààààààâ ààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#. 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:257
-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 Show Addresses"
+msgid "List Shows Addresses"
+msgstr "àààààà ààààààààààâ àààààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "àààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../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:263
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 àààâàààààààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu ààà Id 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu ààà Id 2"
-
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu ààà Id 3"
-
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu àààâàààà Id 1"
-
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu àààâàààà Id 2"
-
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu àààâàààà Id 3"
-
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id àààààààà"
+#: ../addressbook/libebook/e-contact.c:289
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu ààà ID 1"
+
+#: ../addressbook/libebook/e-contact.c:290
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu ààà ID 2"
+
+#: ../addressbook/libebook/e-contact.c:291
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu ààà ID 3"
+
+#: ../addressbook/libebook/e-contact.c:292
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu àààâàààà ID 1"
+
+#: ../addressbook/libebook/e-contact.c:293
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu àààâàààà ID 2"
+
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu àààâàààà ID 3"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "Gadu-Gadu ID àààààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "àààà àààààààààâ"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ààààààààâ"
 
-#: ../addressbook/libebook/e-contact.c:278
-#| msgid "MSN Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype ààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:279
-#| msgid "MSN Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype ààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:280
-#| msgid "MSN Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype ààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:281
-#| msgid "MSN Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype àààâàààà àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:282
-#| msgid "MSN Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype àààâàààà àààà 2"
 
-#: ../addressbook/libebook/e-contact.c:283
-#| msgid "MSN Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype àààâàààà àààà 3"
 
-#: ../addressbook/libebook/e-contact.c:284
-#| msgid "AIM Screen Name List"
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Skype ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:286
-#| msgid "Home Address"
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP àààààà"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:312
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "ààààààâ àààààà ààà ààààà 1"
+
+#: ../addressbook/libebook/e-contact.c:313
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "ààààààâ àààààà ààà ààààà 2"
+
+#: ../addressbook/libebook/e-contact.c:314
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "ààààààâ àààààà ààà ààààà 3"
+
+#: ../addressbook/libebook/e-contact.c:315
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "ààààààâ àààààà àààâàààà ààààà 1"
+
+#: ../addressbook/libebook/e-contact.c:316
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "ààààààâ àààààà àààâàààà ààààà 2"
+
+#: ../addressbook/libebook/e-contact.c:317
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "ààààààâ àààààà àààâàààà ààààà 3"
+
+#: ../addressbook/libebook/e-contact.c:318
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "ààààààâ àààààà ààààààààààà"
+
+#: ../addressbook/libebook/e-contact.c:320
+#| msgid "Skype Name List"
+msgid "Twitter Name List"
+msgstr "àààààààààâ ààààà àààààà"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "ààààààààà àààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "àààààààààâ "
+#: ../addressbook/libedata-book/e-book-backend.c:17
+msgid "Cannot process, book backend is opening"
+msgstr "ààààààààààààààààâ ààààààààà, àààààààààààààà ààààààààâàà ààààààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
-msgid "Birthday: %s"
-msgstr "àààà àààà:%s "
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "àààààààààà àààààà àààààà '%s'"
+
+#: ../addressbook/libedata-book/e-book-backend.c:107
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "ààààâàààâ `%s' àààààààààààààâ ààààààààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
+#: ../camel/camel-db.c:503
 #, c-format
-msgid "Anniversary: %s"
-msgstr "ààààâàààà: %s "
+msgid "Insufficient memory"
+msgstr "àààààà ààààààà àààààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà: ààààààà URI."
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#, c-format
+#| msgid "Object not found"
+msgid "Contact '%s' not found"
+msgstr "'%s' àààààà àààààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot save calendar data"
-msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../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"
+msgid "Invalid query: "
+msgstr "àààààààà àààààà:"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "ààààâààààààâ ààààààààààààààààà àààààà àààààààààààààâ àààààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
+msgid "Success"
+msgstr "ààààààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "cache ààààâ ààààâààààààààààààâ àààààààààààà"
+#: ../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 "ààààààààâàà ààààààààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "cache-àààà àààààà ààààâààààààààààààâ àààààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "ààààààààààààà ààà ààààâ àààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
-msgid "Reply Requested: by "
-msgstr "àààààà àààààààààààààà: ààà"
+#: ../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 "ààààààà àààààààààààààààààààà "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
-msgid "Reply Requested: When convenient"
-msgstr "àààààà àààààààààààààà: àààààààààààààààâ"
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "àààààààà àààààààààààâ ààààààààààààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "%s ààààààààààâ àààà àààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ààààààààà àààààà ààààààààâ ààààààààààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "àààààààâ"
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
+msgid "Unsupported field"
+msgstr "àààààààààààààààà ààààâàà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "àààààààà àààâàààâ URI "
+#: ../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 "àààààààààààààààà ààààààààà ààààààààààààààâ àààààààà"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "àààààààà àààààààààààâ ààààààààààààà"
+#: ../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:313
+#| msgid "Folder '%s/%s' does not exist."
+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:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "àààâààààâ àààààààààâ àààààààà"
+
+#: ../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: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: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: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:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#| msgid "%s: could not cancel"
+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:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
+msgid "Invalid server version"
+msgstr "àààààààà àààâàààâ ààààààà"
+
+#: ../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:326
+#: ../calendar/libecal/e-cal.c:4038 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "ààààààà àààààààà "
+
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "ààààààààâàà àààààà àààààààààààààà"
+
+#: ../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 "I/O error"
+msgid "Other error"
+msgstr "àààààà ààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact: "
+msgstr "àààààà ààààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
+#| msgid "Cannot get folder container %s"
+msgid "Cannot add contact: "
+msgstr "àààààà ààààâààààààààâ ààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:796
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open book: "
+msgstr "ààààààà àààààààààààâ ààààààààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../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:839
+msgid "Cannot refresh address book: "
+msgstr "àààààààààààà ààààààààààààâ ààààààààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../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: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:927
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: "
+msgstr "ààààààààààà ààààààààààààààâ ààààààààà:"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:961
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list uids: "
+msgstr "ààààà àààààà ààààààààâ ààààààààààààààâ ààààààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1066
+#| msgid "Could not remove cache entry: %s: %s"
+msgid "Cannot remove contacts: "
+msgstr "ààààààààààâ àààààà ààààààààààâ ààààààààà:"
+
+#: ../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 "ààààààààà ààà àààààààà"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+#| msgid "No such folder '%s'."
+msgid "No such source for UID '%s'"
+msgstr "àààâàà '%s'-ààààà ààààààààà àààààààà"
+
+#: ../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:598
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "SSL àààààààààààà àààâàààààààààà àààààà àààààààààààààâ ààààààààààààà: %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 ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"àààààààààààààà GnuPG-ààâàà ààààààà ààààààààààà ààààààà àààààààààààààààààà:\n"
+"\n"
+"%s"
+
+#: ../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
+#, fuzzy
+#| msgid "Invalid server URI"
+msgid "Invalid Redirect URL"
+msgstr "àààààààà àààâàààâ URI "
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2722
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2663
+#, fuzzy
+#| msgid "cannot create thread"
+msgid "Cannot create local store"
+msgstr "àààààà ààààâààààààààààààâ àààààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot create local cache folder '%s'"
+msgstr "ààààâàààâ `%s' àààààààààààààâ ààààààààà: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2683
+#, fuzzy
+#| msgid "Could not create cache file"
+msgid "Could not create synch slave thread"
+msgstr "cache ààààâ ààààâààààààààààààâ àààààààààààà"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3677
+msgid "CalDAV does not support bulk additions"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779
+msgid "CalDAV does not support bulk modifications"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947
+msgid "CalDAV does not support bulk removals"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4606
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4614
+msgid "Schedule outbox url not found"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4713
+msgid "Unexpected result in schedule-response"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+msgid "Birthday"
+msgstr "àààààààààâ "
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#, c-format
+msgid "Birthday: %s"
+msgstr "àààà àààà:%s "
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#, c-format
+msgid "Anniversary: %s"
+msgstr "ààààâàààà: %s "
+
+#: ../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
+msgid "Cannot save calendar data"
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:482
+#, fuzzy, c-format
+#| msgid "Malformed signature"
+msgid "Malformed URI: %s"
+msgstr "àààààààà ààààà"
+
+#: ../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:289
+#: ../calendar/backends/http/e-cal-backend-http.c:580
+#, c-format
 msgid "Bad file format."
 msgstr "ààààààà ààààâ àààà."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:590
+#, c-format
 msgid "Not a calendar."
 msgstr "ààà ààà àààààààâ àààà. "
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/http/e-cal-backend-http.c:887
+#: ../calendar/backends/http/e-cal-backend-http.c:891
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+msgid "Could not create cache file"
+msgstr "cache ààààâ ààààâààààààààààààâ àààààààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "àààààààà ààààààààààààà àààààààààâ ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "àààààààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "àààààààà: ààààààààààâ àààààà"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#| msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "àààààààà: ààààààààààâ àààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#| msgid "Weather: Thunderstorms"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+msgid "Weather: Cloudy"
+msgstr "àààààààà: ààààààààààâ àààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "àààààààà: ààààààààâ ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#| msgid "Weather: Snow"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "àààààààà: àà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "àààààààà: ààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "àààààààà: àààààààà"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#| msgid "Weather: Rain"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "àààààààà: ààààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+msgid "Weather: Sunny"
+msgstr "àààààààà: àààààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "àààààààà: àààààààààààà "
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal.c:4003
+msgid "Repository is offline"
+msgstr "ààààààààààààà ààà ààààâ ààà"
+
+#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:135
+msgid "No such calendar"
+msgstr "àààààà ààà àààààààâ àààààààààà"
+
+#: ../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: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:4011
+msgid "URI not loaded"
+msgstr "URI àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4013
+msgid "URI already loaded"
+msgstr "URI àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4017
+msgid "Unknown User"
+msgstr "àààààààààà ààààààààààààà àààâ"
+
+#: ../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:4021
+msgid "Protocol not supported"
+msgstr "ààààâààààààààààà ààààààà àààààààà "
+
+#: ../calendar/libecal/e-cal.c:4023
+msgid "Operation has been canceled"
+msgstr "ààààààâààààà ààààààààààààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4025
+msgid "Could not cancel operation"
+msgstr "ààààààâààààà àààààààààààààâ àààààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4027 ../libedataserver/e-client.c:128
+msgid "Authentication failed"
+msgstr "àààààààà àààààààààààâ ààààààààààààà"
+
+#: ../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:4031
+#, fuzzy
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "ààà CORBA àààààààààâ ààààààààààààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4035
+msgid "No error"
+msgstr "ààààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
+#, fuzzy
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "àààààààààà ààààààààààààà àààâ"
+
+#: ../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:610
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààààà àààâàààà ààààààààààâ àààààààààààà"
+
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ààààààààààà àààààààààâààààààâàà"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
+#, fuzzy
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
 msgstr "ààààâààà"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
+#, fuzzy
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
+#, fuzzy
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "àààààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:721
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "àààààààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
-#, 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:1691
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààà ààààààààààààà ààààààààààà àààààààà ààààààààààààààààààà %s-àààà ààààâààààâàà àààâààà"
-
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "àààààààà àààâààààààààâàà"
-
-#: ../calendar/libecal/e-cal.c:5072
-msgid "Backend is busy"
-msgstr "ààààààààâàà ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "Repository is offline"
-msgstr "ààààààààààààà ààà ààààâ ààà"
-
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "No such calendar"
-msgstr "àààààà ààà àààààààâ àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "Object not found"
-msgstr "àààààààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid object"
-msgstr "àààààààààààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:5082
-msgid "URI not loaded"
-msgstr "URI àààààààà"
-
-#: ../calendar/libecal/e-cal.c:5084
-msgid "URI already loaded"
-msgstr "URI àààààààà"
-
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "ààààààà àààààààààààààààààààà "
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Unknown User"
-msgstr "àààààààààà ààààààààààààà àààâ"
-
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Object ID already exists"
-msgstr "àààààààà ID ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5092
-msgid "Protocol not supported"
-msgstr "ààààâààààààààààà ààààààà àààààààà "
-
-#: ../calendar/libecal/e-cal.c:5094
-msgid "Operation has been canceled"
-msgstr "ààààààâààààà ààààààààààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Could not cancel operation"
-msgstr "ààààààâààààà àààààààààààààâ àààààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
-msgid "Authentication required"
-msgstr "ààààààààà àààààà ààààààààâ ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "ààà CORBA àààààààààâ ààààààààààààààààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:36
+msgid "Cannot process, calendar backend is opening"
+msgstr ""
 
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "àààààààà ààà ààààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:135
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "àààààààààà ààààà: %s"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
-msgid "No error"
-msgstr "ààààààà àààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:152
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../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:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../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:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../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:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../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:121
+#: ../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 ""
 "àààààààà àààâààààààààâàà ààà ISO 8601 ààààà/àààààààààâàà àààààà ààààààààààààààà \"%s\" "
 "ààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../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:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../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:1094
+#: ../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 "àààààààà àààâààààààààâàà time_t ààààààààààààààà \"%s\" ààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../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:375
-#: ../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
+#, fuzzy, c-format
+#| msgid "\"%s\" expects two arguments"
+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 "àààààààààà àààâààààààààâàà ààà time_t ààààààààààààààà \"%s\" ààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, fuzzy, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "àààààààà àààâààààààààâàà àààààà ààààààààààààààà \"%s\" ààààààààààààààààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, fuzzy, c-format
+#| msgid "\"%s\" expects two arguments"
+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 "
-#| "\"description\", or \"location\""
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
 "àààààààà àààâààààààààâàà \"any\", \"summary\", \"description\",  \"location\", "
-"\"attendee\", \"organizer\", \"classification\" ààààààààààâ "
-"ààààààààààààààààààà \"%s\" ààààààààààààààààà"
+"\"attendee\", \"organizer\", \"classification\" ààààààààààâ ààààààààààààààààààà \"%s"
+"\" ààààààààààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../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:939
+#: ../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 ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#| msgid "Invalid argument"
-msgid "Invalid range"
-msgstr "àààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#| msgid "Unsupported security layer."
-msgid "Unsupported field"
-msgstr "àààààààààààààààà ààààâàà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-#| msgid "Unsupported security layer."
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "àààààààààààààààà ààààâàààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-#| msgid "No support for authentication type %s"
-msgid "Unsupported authentication method"
-msgstr "àààààààààààààààà ààààààààà ààààààààààààààâ àààààààà"
+#: ../calendar/libedata-cal/e-data-cal.c:429
+#, fuzzy
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "ààààâàààâ `%s' àààààààààà."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-#| msgid "SSL unavailable"
-msgid "TLS not available"
-msgstr "TLS àààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#| msgid "SSL unavailable"
-msgid "Offline mode unavailable"
-msgstr "àààâààààâ àààà àààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:934
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-#| msgid "Path length exceeded"
-msgid "Search size limit exceeded"
-msgstr "àààààààààààààà àààààààààààà ààààà ààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:961
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-#| msgid "Path length exceeded"
-msgid "Search time limit exceeded"
-msgstr "àààààààààààààà ààà ààààà ààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:990
+msgid "Cannot retrieve backend property: "
+msgstr ""
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-#| msgid "Invalid purpose"
-msgid "Invalid query"
-msgstr "àààààààà àààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1045
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "àààààà ààààààààààààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1075
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#| msgid "Invalid server URI"
-msgid "Invalid server version"
-msgstr "àààààààà àààâàààâ ààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1104
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../camel/camel-cipher-context.c:102
-msgid "Signing is not supported by this cipher"
-msgstr "à àààààâ ààààààààâ àààààààààààààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1142
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot create calendar object: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "àààààààààààààààà ààààààààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1177
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../camel/camel-cipher-context.c:145
-msgid "Verifying is not supported by this cipher"
-msgstr "à àààààâ ààààààààààààààâ àààààààààààààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1217
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "ààààààà àààààà ààààààààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1254
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1285
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects: "
+msgstr "ààààààààààà àààààà ààààààààààààààâ ààààààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1317
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment uris: "
+msgstr "àààààààà ààààààààààààà àààààààààâ ààààààààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1345
+#, fuzzy
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààààâàààâ ààààààààààààààâ àààààààààààà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1374
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not get calendar view path: "
+msgstr "àààâàààààààààààà àààààà àààààààààààààâ àààààààààààà: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1404
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone: "
+msgstr "àààààààà ààààààààààààà àààààààààâ ààààààààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1430
+#, fuzzy
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: "
+msgstr "ààààâàààààâàà àààà ààààààààààâ àààààààààààà: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
+#, fuzzy, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "àààààààà ààààà"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:206
+#, c-format
+msgid "Signing is not supported by this cipher"
+msgstr "à àààààâ ààààààààâ àààààààààààààààààààà"
+
+#: ../camel/camel-cipher-context.c:219
+#, c-format
+msgid "Verifying is not supported by this cipher"
+msgstr "à àààààâ ààààààààààààààâ àààààààààààààààààààà"
+
+#: ../camel/camel-cipher-context.c:235
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "à àààààâ àààààààà àààààààààààààààààààà"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "ààààààà àààààààààààààààààààà"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:249
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "à àààààâ ààààààààààààâ ààààààààààà àààààààààààààààààààà"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "ààààààààààààâàà àààààààà àààààààààà"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:262
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "à àààààâ ààààààààààà àààààààâààààà àààààâ ààààààâàààà ààààààààààâ ààààààààà"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:276
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "à àààààâ ààààààààààà àààààààâààààà àààààâ àààààààààâàààà ààààààààààâ ààààààààà"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:817
+msgid "Signing message"
+msgstr "àààààààààààààààà ààààààààààààààà"
+
+#: ../camel/camel-cipher-context.c:1058
+msgid "Encrypting message"
+msgstr "ààààààà àààààààààààààààààààà"
+
+#: ../camel/camel-cipher-context.c:1185
+msgid "Decrypting message"
+msgstr "ààààààààààààâàà àààààààà àààààààààà"
+
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "cache-àààà àààà ààààâààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-data-cache.c:403
+#: ../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 "cache àààâàààà àààààà ààààààààààâ ààààààààà: %s: %s"
 
-#: ../camel/camel-db.c:469
-msgid "Insufficient memory"
-msgstr "àààààà ààààààà àààààààà"
-
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1339,13 +1946,9 @@ msgstr ""
 "àààààààâ àààâààààààààà ààààààà àààààà ààààààààààààâ ààààààà\n"
 "àààààààààààâ ààààààà ààààààâààààààààààààààà."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:271
+#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
-#| msgid ""
-#| "Could not open `%s':\n"
-#| "%s\n"
-#| "Changes made to this folder will not be resynchronized."
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
@@ -1355,96 +1958,109 @@ msgstr ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "Resynchronizing with server"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "ààà ààààâ àààààààààààààààà ààààâàààààààà ààààààààà ààààâààààà"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../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:469
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ààà àààààààà '%s' ààààààààààààààà"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
+#, fuzzy
+#| msgid "Copy folder content locally for offline operation"
+msgid "Copy folder content locally for _offline operation"
+msgstr "ààà ààààâ àààààààààààààààà ààààâàààààààà ààààààààà ààààâààààà"
+
+#: ../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:1398 ../camel/camel-imapx-store.c:1487
+#: ../camel/camel-imapx-store.c:1536
+#: ../camel/providers/imap/camel-imap-store.c:1270
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imap/camel-imap-store.c:3289
+#: ../camel/providers/pop3/camel-pop3-folder.c:531
+#: ../camel/providers/pop3/camel-pop3-folder.c:674
+#: ../camel/providers/pop3/camel-pop3-folder.c:874
+#: ../camel/providers/pop3/camel-pop3-folder.c:1074
+#: ../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-exception.c:262
-msgid "No description available"
-msgstr "àààààà àààààààà "
+#: ../camel/camel-file-utils.c:732
+#, c-format
+msgid "Canceled"
+msgstr "àààààààààààààààà "
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ààààâàà àààààààà '%s' ààààâàààààààààààààààâ àààààà: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s-ààâ ààààààà àààààààà ààààààà ààààààààààààààààà: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "ààààâààààààâ ààààâàà àààààààààà"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ààààâàààààâ ààààâàà àààààààààààààâ ààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ààààâàààààâ àààààààààààààààààâ ààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1383
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààààâ ààààâàààâ àààààààààààâ ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1395
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààààâ ààààâàààâ ààààààâààààààààààààààààâ ààààààààà"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ààààààà àààààààààààà %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "ààààààà àààààààààààâ àààààààààààààààà"
-
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d ààààààààààààâ ààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "ààààâàààâ ààààâàà àààààààààà"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "ààààâàààààààààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d-ààâàà %d ààààààà àààààààààààà"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d-ààâàà %d-ààâ ààààààà ààààààààààààààààààààààà"
@@ -1453,22 +2069,82 @@ msgstr "%d-ààâàà %d-ààâ ààààààà àààààà
 msgid "Failed to retrieve message"
 msgstr "ààààààà àààààààààààààààààâ ààààà"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààààààà àààâààààààààâàààààâ (system-flag)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààààààà àààâààààààààâàààààâ (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../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-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder.c:270
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+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:310
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+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:358
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ààààà àààààààààààâ ààààâàààààâ ààààààà"
+msgstr[1] "ààààà àààààààààààâ ààààâàààààâ ààààààà"
+
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
+msgid "Moving messages"
+msgstr "àààààààààààâ àààààààààà"
+
+#: ../camel/camel-folder.c:933
+msgid "Copying messages"
+msgstr "àààààààààààâ ààààâàààààààà"
+
+#: ../camel/camel-folder.c:1253
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3372
+#, fuzzy, c-format
+#| msgid "Expunging old messages"
+msgid "Expunging folder '%s'"
+msgstr "ààà àààààààààààâ ààààààà àààààààà"
+
+#: ../camel/camel-folder.c:3604
+#, fuzzy, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s' in %s"
+msgstr "POP ààààààà %d àààààààààààààà"
+
+#: ../camel/camel-folder.c:3755
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
+
+#: ../camel/camel-folder.c:3987
+#, fuzzy, c-format
+#| msgid "No such folder '%s'."
+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"
@@ -1477,8 +2153,7 @@ msgstr ""
 "ààààààààààààà ààààààà àààààà ààààààààààâ àààààààààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1487,78 +2162,48 @@ msgstr ""
 "ààààààààààààà ààààààà àààààààààààààààààâ ààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
 #, c-format
-#| msgid "(match-all) requires a single bool result"
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ààà ààààâ ààà ààààààààààà"
 
-#: ../camel/camel-folder-search.c:906
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:932
 #, c-format
-#| msgid "(match-threads) not allowed inside match-all"
 msgid "(%s) not allowed inside %s"
 msgstr "(%s)  à-àààààâ àààààà%sààààààààààà"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
 #, c-format
-#| msgid "(match-threads) requires a match type string"
 msgid "(%s) requires a match type string"
 msgstr "(%s) ààààààààààà àààààààààà àààààààà ààààààààààà"
 
-#: ../camel/camel-folder-search.c:946
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:975
 #, c-format
-#| msgid "(match-threads) expects an array result"
 msgid "(%s) expects an array result"
 msgstr "(%s) ààà ààà ààà ààà ààààààààààààààààà"
 
-#: ../camel/camel-folder-search.c:955
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:985
 #, c-format
-#| msgid "(match-threads) requires the folder set"
 msgid "(%s) requires the folder set"
 msgstr "(%s) ààà ààààâàààâ ààààààààààà"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1331
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "àààààààààààààààà àààààààà: àààààààààààààâ àààààà àààààààà: %s-àààààà"
-
-#: ../camel/camel-folder.c:1398
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "àààààààààààààààà àààààààà: ààààààà àààààààààà àààààà: %s-àààààà"
-
-#: ../camel/camel-folder.c:1440
-#, c-format
-#| msgid "Unsupported operation: search by expression: for %s"
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "àààààààààààààààà àààààààà: ààààààà àààààààààà ààààà: %s-àààààà"
-
-#: ../camel/camel-folder.c:1480
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ààààààààààààààààààààà àààààààà: UID àààààààààà àààààà: %s-àààààà"
-
-#: ../camel/camel-folder.c:1596
-msgid "Moving messages"
-msgstr "àààààààààààâ àààààààààà"
-
-#: ../camel/camel-folder.c:1596
-msgid "Copying messages"
-msgstr "àààààààààààâ ààààâàààààààà"
-
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "ààààààààààààààà ààààààààà"
-
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
+msgid "Failed to execute gpg: %s"
+msgstr "gpg àààààààààààààààààààâ àààààà: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "ààààà àààààààààààâ ààààâàààààâ ààààààà"
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
+msgid "Unknown"
+msgstr "ààààààààààààà"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1569,15 +2214,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:769
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid-àààà àààà àààààà àààààààààààààâ ààààààààààààà."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../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:828
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1586,7 +2233,7 @@ msgstr ""
 "ààààààààà SmartCard àààààààààààààààà\n"
 "PIN ààààààààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1595,288 +2242,622 @@ msgstr ""
 "ààààààààààààà ààààà ààààààààà\n"
 "àààààà àààààààà ààààààààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:840
 #, c-format
-#| msgid "Unexpected request from GnuPG for `%s'"
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "`%s'-ààà GnuPG-ààâ ààààààà àààààààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "ààààààààààààààààààààà."
+#: ../camel/camel-gpg-context.c:852
+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:883 ../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
+#, fuzzy, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "àààààààààààààààà "
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:904
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà àààààà àààààààààààâ ààààààààààààà: 3 ààààààà àààààà àààààààààààâ àààâàààààààààààààà."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG-ààâ ààààààà àààààààààààààà àààààà: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "àààààààààààààààààààààààâ ààààààààààààà: No valid recipients specified."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850 ../camel/camel-gpg-context.c:1895
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg àààààààààààààààààààâ àààààà: %s"
-
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:598
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
+#, fuzzy
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
 msgstr "Could not generate signing data: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866 ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
+#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
 msgid "Failed to execute gpg."
 msgstr "gpg àààààààààààààààààààâ àààààà"
 
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "ààà ààààààààààààâàà àààààààààààààâ ààààà àààà ààààààà."
-
-#: ../camel/camel-gpg-context.c:1458 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470 ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:901 ../camel/camel-smime-context.c:912
-#: ../camel/camel-smime-context.c:919
+#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
+#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
+#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
+#: ../camel/camel-smime-context.c:982
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àààààààààààààà ààààà àààààààààààààààâ ààààààààà: ààààààà àààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:1524
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "àààààààààààààà ààààà àààààààààààààààâ ààààààààà: ààààâààààààà ààààâ àààààààààààààààààà: %s"
+#: ../camel/camel-gpg-context.c:1801
+#, fuzzy
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "àààààààààààààà ààààà àààààààààààààààâ ààààààààà: ààààààà àààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1924
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
 msgstr "àààâàààààààààààà àààààà àààààààààààààâ àààààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1977
 msgid "This is a digitally encrypted message part"
 msgstr "àààà ààààààààààà àààâàààààààààà ààààà àààààààààààààà àààààààà"
 
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
+#: ../camel/camel-gpg-context.c:2067
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:2055
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME àààà àààààààààààà àààààààààààààâ àààààà: àààààààààààààààâ ààààà"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-smime-context.c:1176
+#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "àààâàààààààààà ààààà ààààààààà"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "ààààààààààààâàà àààààààà àààààà ààààààààààâ àààààààààà"
+#: ../camel/camel-imapx-folder.c:104
+#, fuzzy, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s-àààà àààààà àààà ààààààààààààààà"
 
-#: ../camel/camel-gpg-context.c:1851 ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "ààààààààààààà"
+#: ../camel/camel-imapx-folder.c:112
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "cache ààààâ ààààâààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-lock-client.c:104
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "àààààààààààà àààààà ààààààààààâ ààààààààà: %s"
+#: ../camel/camel-imapx-folder.c:794
+#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+#, fuzzy
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message _filters to this folder"
+msgstr "ààààààààààààààààààà àààààààààààâ ààààâààààààààâ ààààààààà"
 
-#: ../camel/camel-lock-client.c:126
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Cannot fork locking helper: %s"
+#: ../camel/camel-imapx-server.c:1094
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server disconnected"
+msgstr "ààààààààààààààà àààâàààààâàà àààààààâ ààààâàààààààà: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ààààààààààâ àààààààààààà: lock-helper-ààâ àààààààààààààààâ ààààà"
+#: ../camel/camel-imapx-server.c:1549
+#, fuzzy
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "ààààààâ ààààà ààààâ ààààààààààààâ ààààà: %s"
 
-#: ../camel/camel-lock-client.c:217
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' ààààààààààâ àààààààààààà"
+#: ../camel/camel-imapx-server.c:2500
+#, fuzzy, c-format
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "ààààààààà àààààà ààààààààâ ààààààààààààà.\n"
 
-#: ../camel/camel-lock.c:103
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s-àààà àààààà ààààâ àààààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:2580
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "àààààààààààâ àààààà"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-imapx-server.c:3462
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/imap/camel-imap-store.c:468
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s-àààà àààààà ààààâ ààààààààààààààààà àààà ààààààààààààààààà. àààààààà ààààààà àààààààààà."
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "àààààààà ààààààâ IMAP àààâàààâ %s-àààààà àààààà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcnt(2) àààààààààà àààààààààààààâ àààààà: %s"
+#: ../camel/camel-imapx-server.c:3463
+#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
+msgid "STARTTLS not supported"
+msgstr "STARTTLS àààààààààààààààààààà"
 
-#: ../camel/camel-lock.c:262
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) àààààààààà àààààààààààààâ àààààà: %s"
+#: ../camel/camel-imapx-server.c:3502
+#: ../camel/providers/imap/camel-imap-store.c:440
+#, fuzzy, 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-àààààà àààààà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/camel-movemail.c:106
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "ààààààâ ààààâ %s àààààààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3580
+#: ../camel/providers/imap/camel-imap-store.c:749
+#, fuzzy, c-format
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP àààâàààâ %s-ààâ %s àààà ààààààààà ààààààààààààààâ ààààààààààààà ààààààà àààààààà"
 
-#: ../camel/camel-movemail.c:119
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "ààààààâ ààààâ %s àààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3591 ../camel/camel-session.c:494
+#: ../camel/providers/imap/camel-imap-store.c:1174
+#: ../camel/providers/pop3/camel-pop3-store.c:259
+#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "%s àààà ààààààààà ààààààààààààààâ ààààààààààààà ààààààà àààààààà"
 
-#: ../camel/camel-movemail.c:127
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "ààààâààààààà ààààààâ ààààâ %s àààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3610
+#: ../camel/providers/imap/camel-imap-store.c:1142
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+#, fuzzy
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate without a username"
+msgstr "àààâààààààààà ààààààààà àààààà àààààààààààâ ààààààààà: %s"
 
-#: ../camel/camel-movemail.c:156
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "temp ààààâ %s-ààâ ààààààâ àààààààààààààààààâ àààààà: %s"
+#: ../camel/camel-imapx-server.c:3619
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:511
+#: ../camel/providers/pop3/camel-pop3-store.c:512
+#: ../camel/providers/pop3/camel-pop3-store.c:532
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authentication password not available"
+msgstr "àààààààà àààààààààààâ ààààààààààààà"
 
-#: ../camel/camel-movemail.c:186
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "àààààà ààààâààààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3821
+#, fuzzy
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "ààààààà àààààààààààààààààààà"
 
-#: ../camel/camel-movemail.c:198
-#, c-format
-msgid "Could not fork: %s"
-msgstr "fork ààààààààààâ àààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3903
+#, fuzzy
+#| msgid "Failed to authenticate.\n"
+msgid "Failed to copy the tmp file"
+msgstr "ààààààààà àààààà ààààààààâ ààààààààààààà.\n"
 
-#: ../camel/camel-movemail.c:236
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail ààààààààà ààààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:3917
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to close the tmp stream"
+msgstr "àààààà àààâàààà ààààààààààâ àààààààààààà"
 
-#: ../camel/camel-movemail.c:237
-msgid "(Unknown error)"
-msgstr "(àààààààààà ààààà)"
+#: ../camel/camel-imapx-server.c:4015
+#, fuzzy
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "àààààààààààâ ààààâàààààààà"
 
-#: ../camel/camel-movemail.c:260
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "ààààààâ ààààâ àààààààààààààààâ ààààà: %s"
+#: ../camel/camel-imapx-server.c:4150
+#, fuzzy
+#| msgid "Sending message"
+msgid "Error appending message"
+msgstr "ààààààà àààààààààààà"
 
-#: ../camel/camel-movemail.c:271
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "ààààààâ ààààà ààààâ ààààààààààààâ ààààà: %s"
+#: ../camel/camel-imapx-server.c:4333
+msgid "Error fetching message headers"
+msgstr ""
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "ààààààâ ààààà ààààâ ààààâàààààààààààâ ààààà: %s"
+#: ../camel/camel-imapx-server.c:4468
+#, fuzzy
+#| msgid ""
+#| "Error retrieving newsgroups:\n"
+#| "\n"
+#| "%s"
+msgid "Error retrieving message"
+msgstr ""
+"ààààâàààààààààààààààâ àààààààààààààààààâ ààààà:\n"
+"\n"
+"%s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "àààààà ààààà"
+#: ../camel/camel-imapx-server.c:4590 ../camel/camel-imapx-server.c:4783
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "àààààààààààààààà "
+#: ../camel/camel-imapx-server.c:4641
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "%s-ààâ àààààà àààààààààààààà àààààààààààâàààààà ààààààààààààààà"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "àààààà ààààâààààààààààààâ àààààààààààà"
+#: ../camel/camel-imapx-server.c:4684
+#, fuzzy
+#| msgid "%s: Scanning new messages"
+msgid "Error fetching new messages"
+msgstr "%s: ààààà àààààààààâ ààààààààààààààà"
 
-#: ../camel/camel-net-utils.c:671
-#, c-format
-msgid "Resolving: %s"
-msgstr "àààààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:4874
+#, fuzzy
+#| msgid "Verifying message"
+msgid "Error while fetching messages"
+msgstr "ààààààà àààààà ààààààààààà"
 
-#: ../camel/camel-net-utils.c:693
-msgid "Host lookup failed"
-msgstr "àààààààà àààààààààâ ààààààààààààà"
+#: ../camel/camel-imapx-server.c:4882 ../camel/camel-imapx-server.c:4918
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
+msgstr[1] "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
+
+#: ../camel/camel-imapx-server.c:5043 ../camel/camel-imapx-server.c:5079
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "àààààààààààâ àààààà"
 
-#: ../camel/camel-net-utils.c:695
-#, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "àààààààà àààààààààâ ààààààààààààà: %s: %s"
+#: ../camel/camel-imapx-server.c:5172
+#, fuzzy
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "ààà àààààààààààâ ààààààà àààààààà"
 
-#: ../camel/camel-net-utils.c:803
-msgid "Resolving address"
-msgstr "àààààà àààààààààààààà"
+#: ../camel/camel-imapx-server.c:5269
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error fetching folders"
+msgstr "ààààâàààâ àààààààààààààà"
 
-#: ../camel/camel-net-utils.c:823
-msgid "Name lookup failed"
-msgstr "àààà àààààààààâ ààààààààààààà"
+#: ../camel/camel-imapx-server.c:5348
+#, fuzzy
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "àààààààààà ààààâààààààâ àààààà ààààààààà (_S)"
 
-#: ../camel/camel-net-utils.c:826
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "àààà àààààààààâ ààààààààààààà: %s"
+#: ../camel/camel-imapx-server.c:5409
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "ààààâàààâ àààààààààààààà"
 
-#: ../camel/camel-offline-folder.c:253
-#, c-format
-msgid "Syncing messages in folder '%s' to disk"
-msgstr "'%s' ààààâàààààààà àààààààààààâ àààààààààààà ààààâàà àààààààààà"
+#: ../camel/camel-imapx-server.c:5458
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "ààààâàààâ àààààààààààààà"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
-#, c-format
-#| msgid "Cannot write offline journal for folder `%s': %s"
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "ààààâàààâ `%s'-ààà àààâààààâ ààààâàààâ àààààààààâ ààààààààà: %s"
+#: ../camel/camel-imapx-server.c:5519
+#, fuzzy
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "ààààâàààâ àààààààààààààà"
 
-#: ../camel/camel-provider.c:60
-msgid "Virtual folder email provider"
-msgstr "ààààâàààààààâ ààààâàààâ à ààààààâ àààààààààâ"
+#: ../camel/camel-imapx-server.c:5580
+#, fuzzy
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "àààààààààààâ àààààà"
 
-#: ../camel/camel-provider.c:62
-msgid "For reading mail as a query of another set of folders"
+#: ../camel/camel-imapx-server.c:5676
+msgid "Error syncing changes"
 msgstr ""
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-imapx-server.c:6447
+#: ../camel/providers/imap/camel-imap-folder.c:3531
 #, c-format
-msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s àààà ààààààààààâ ààààààààà: à àààààààààààààâ ààààààààâ àààà ààààààààààà ààààààààààààààààà."
-
-#: ../camel/camel-provider.c:193
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "%s àààà ààààààààààâ àààààààààààà: %s"
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ààààààà ID %s àààà ààààààà àààààààà: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-imapx-server.c:6448
+#: ../camel/providers/imap/camel-imap-folder.c:3532
+msgid "No such message available."
+msgstr "àààààà ààààààà àààààààà"
+
+#: ../camel/camel-imapx-server.c:6603 ../camel/camel-imapx-server.c:6618
+#, fuzzy
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "ààààààà àààààààààààààâ ààààààààà: %s"
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:827
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP àààâàààâ %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:830
+#, 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:351
+#: ../camel/providers/imap/camel-imap-store.c:2064
+#: ../camel/providers/imap/camel-imap-store.c:2262
+#, 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:376 ../camel/camel-imapx-store.c:866
+#: ../camel/providers/imap/camel-imap-store.c:275
+#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../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:1099
+#, fuzzy, c-format
+#| msgid "Preparing folder '%s' for offline"
+msgid "Retrieving folder list for %s"
+msgstr "ààà àààààààà '%s' ààààààààààààààà"
+
+#: ../camel/camel-imapx-store.c:1203
+#: ../camel/providers/nntp/camel-nntp-store.c:1771
+#, c-format
+msgid "No such folder: %s"
+msgstr "à ààààâàààâ àààààààà: %s"
+
+#: ../camel/camel-imapx-store.c:1420
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imap/camel-imap-store.c:2524
+#, c-format
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" ààààà ààààâàààààâàà àààà ààààààààà, ààààà àààààâ \"%c\" àààà àààààà ààààà àààààààà"
+
+#: ../camel/camel-imapx-store.c:1431
+#: ../camel/providers/imap/camel-imap-store.c:2537
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "àààààààà àààààâàà ààààâàààâ: %s"
+
+#: ../camel/camel-imapx-store.c:1441
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imap/camel-imap-store.c:2589
+#, 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
+#, fuzzy, c-format
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "ààààà àààààààà"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s-àààà àààààà ààààâ àààààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-lock.c:145
+#, fuzzy, c-format
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s-àààà àààààà ààààâ ààààààààààààààààà àààà ààààààààààààààààà. àààààààà ààààààà àààààààààà."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcnt(2) àààààààààà àààààààààààààâ àààààà: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) àààààààààà àààààààààààààâ àààààà: %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "àààààààààààà àààààà ààààààààààâ ààààààààà: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Cannot fork locking helper: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ààààààààààâ àààààààààààà: lock-helper-ààâ àààààààààààààààâ ààààà"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' ààààààààààâ àààààààààààà"
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "ààààààâ ààààâ %s àààààààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:119
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "ààààààâ ààààâ %s àààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "ààààâààààààà ààààààâ ààààâ %s àààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "temp ààààâ %s-ààâ ààààààâ àààààààààààààààààâ àààààà: %s"
+
+#: ../camel/camel-movemail.c:193
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "àààààà ààààâààààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:207
+#, c-format
+msgid "Could not fork: %s"
+msgstr "fork ààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:245
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Movemail ààààààààà ààààààààààààà: %s"
+
+#: ../camel/camel-movemail.c:246
+msgid "(Unknown error)"
+msgstr "(àààààààààà ààààà)"
+
+#: ../camel/camel-movemail.c:273
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "ààààààâ ààààâ àààààààààààààààâ ààààà: %s"
+
+#: ../camel/camel-movemail.c:286
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "ààààààâ ààààà ààààâ ààààààààààààâ ààààà: %s"
+
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "ààààààâ ààààà ààààâ ààààâàààààààààààâ ààààà: %s"
+
+#: ../camel/camel-multipart-signed.c:297
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "àààààà àààààààà "
+
+#: ../camel/camel-multipart-signed.c:305
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "àààààà àààààààà "
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
+msgid "parse error"
+msgstr "àààààà ààààà"
+
+#: ../camel/camel-net-utils.c:703
+#, c-format
+msgid "Resolving: %s"
+msgstr "àààààààààààààà: %s"
+
+#: ../camel/camel-net-utils.c:726
+msgid "Host lookup failed"
+msgstr "àààààààà àààààààààâ ààààààààààààà"
+
+#: ../camel/camel-net-utils.c:732
+#, c-format
+msgid "Host lookup failed: %s: %s"
+msgstr "àààààààà àààààààààâ ààààààààààààà: %s: %s"
+
+#: ../camel/camel-net-utils.c:853
+msgid "Resolving address"
+msgstr "àààààà àààààààààààààà"
+
+#: ../camel/camel-net-utils.c:874
+msgid "Name lookup failed"
+msgstr "àààà àààààààààâ ààààààààààààà"
+
+#: ../camel/camel-net-utils.c:880
+#, c-format
+msgid "Name lookup failed: %s"
+msgstr "àààà àààààààààâ ààààààààààààà: %s"
+
+#: ../camel/camel-network-service.c:114
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%s-àààààà àààààà ààààààààààâ ààààààààà: %s"
+
+#: ../camel/camel-offline-folder.c:210
+#, c-format
+msgid "Syncing messages in folder '%s' to disk"
+msgstr "'%s' ààààâàààààààà àààààààààààâ àààààààààààà ààààâàà àààààààààà"
+
+#: ../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"
+
+#: ../camel/camel-provider.c:58
+msgid "Virtual folder email provider"
+msgstr "ààààâàààààààâ ààààâàààâ à ààààààâ àààààààààâ"
+
+#: ../camel/camel-provider.c:60
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: ../camel/camel-provider.c:195
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "%s àààà ààààààààààâ ààààààààà: à àààààààààààààâ ààààààààâ àààà ààààààààààà ààààààààààààààààà."
+
+#: ../camel/camel-provider.c:204
+#, c-format
+msgid "Could not load %s: %s"
+msgstr "%s àààà ààààààààààâ àààààààààààà: %s"
+
+#: ../camel/camel-provider.c:213
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s àààà ààààààààààâ àààààààààààà: àààààààààààààâ àààà àààààààààâ àààààààà."
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:412 ../camel/camel-session.c:406
 #, c-format
-#| msgid "No provider available for protocol `%s'"
 msgid "No provider available for protocol '%s'"
 msgstr "àààààààààà `%s'-àààà àààààààààâ àààààààà"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "ààààààà"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "à ààààà àààààààààà àààààààâàààà àààâààààààààà ààà ààààààà ààààààâ ààà àààààà ààààààààààààààà."
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "ààààààààà àààààààààààâ ààààààààààààà."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1885,7 +2866,7 @@ msgstr ""
 "ààààààà àààààààâ ààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1894,7 +2875,7 @@ msgstr ""
 "Invalid opaque trace information:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1903,11 +2884,11 @@ msgstr ""
 "Invalid trace information:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../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."
@@ -1915,11 +2896,11 @@ msgstr ""
 "àààâàààààâàà ààààààà ààààààààààààâ, à ààààà ààààààà àààâààààààààà ààà àààààààà CRAM-MD5 "
 "ààààâààààâàà àààààààààà àààààà àààààààààààààà."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../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."
@@ -1927,133 +2908,124 @@ msgstr ""
 "àààâàààààâàà ààààààà ààààààààààààâ, à ààààà ààààààà àààâààààààààà ààà àààààààà DIGEST-MD5 "
 "ààààâààààâàà àààààààààà àààààà àààààààààààààà."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:855
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "àààâàààâ ààààààà àààà ààààààà (>2048 àààààààààà)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:866
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "àààààààà àààâàààâ ààààààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:874
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:907
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "àààâààààààà ààààààààààâ ààààààààà ààààààààààààà ààààà àààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:928
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "àààâààààààà ààààààààààâ ààààààààà ààààààààààààà ààààà ààààâààààààà."
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:941
+#, c-format
 msgid "Server response does not match"
 msgstr "àààâàààààâàà àààààà ààààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Kerberos 5-àààà ààààààààà àààààààààà à ààààà àààâààààààààà àààààà àààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ààààààà ààààààààâ àààààààààà target_name ààààààààààâ àààâàààààààààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../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 ""
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr ""
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààààààà àààààààààààààààààâ àààâàààààâ ààààààà ààààààà àààààà."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:417
+#, c-format
 msgid "Unsupported security layer."
 msgstr "àààààààààààààààà àààààààààààààà àààààâ"
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "à ààààà ààààààà àààâààààààààà Kerberos 4 àààààààààà ààààààààà ààààààààààààààâ ààààààààààààà."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos ààààààààà àààààààà:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ààààààâ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../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:135
+#: ../camel/camel-sasl-login.c:110
+#, c-format
 msgid "Unknown authentication state."
 msgstr "àààààààààà ààààààààà ààààààààààààà ààààà."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2061,482 +3033,477 @@ msgstr ""
 "NTLM / àààààààà ààààâààààâàààààà ààà Windows àààâààààààààà ààààààààà àààààààààà ààààààà "
 "ààààààààààààààà à ààààà ààààààààààààà "
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP-àààààà àààààà POP "
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP àààààààààààààààà àààààà ààà POP ààààààà à ààààà àààààààààààààààààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "POP Source URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:96
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "SMTP auth-àà àààààààà POP ààà non-pop àààààààààà àààààààà àààààààààààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "SMTP auth-àà àààààààà POP ààà non-pop àààààà àààààààààààààà"
-
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
-msgid "Regular expression compilation failed: %s: %s"
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr ""
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-search-private.c:112
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s'-àà ààà ààààààààààààà ààààààâàà àààà ààààààààààà"
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
 
-#: ../camel/camel-service.c:274
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s'-àà ààà àààààààà àààà ààààààààààà"
+#: ../camel/camel-session.c:415
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "àààààààààà `%s'-àààà àààààààààâ àààààààà"
 
-#: ../camel/camel-service.c:278
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s'-àà ààà àààà àààà ààààààààààà"
+#: ../camel/camel-session.c:509
+#, fuzzy, c-format
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "àààààààà àààààààààààâ ààààààààààààà"
 
-#: ../camel/camel-session.c:308
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s àààààààà àààààààààààààâ ààààààààà:\n"
-"%s"
+#: ../camel/camel-session.c:645
+#, fuzzy
+#| msgid "Operation not supported"
+msgid "Forwarding messages is not supported"
+msgstr "àààààààà ààààààààààààààààààààààààà"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:1362
 #, c-format
-#| msgid "%sPlease enter the POP password for %s on host %s"
 msgid "Please enter the %s password for %s on host %s."
 msgstr "àààààà %s ààààâààààâàà àààâààà. %s-ààà - %s àààààààààààààààà."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr ""
-
-#: ../camel/camel-smime-context.c:440 ../camel/camel-smime-context.c:984
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s'-àààà àààâàààààààààààààà àààààààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:446
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS ààààààà ààààâààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààà àààààà ààààâààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààà àààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààà àààààààààà àààà ààààâààààààààâ ààààààààà"
 
-#: ../camel/camel-smime-context.c:504 ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs àààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs àààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:533
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:1056
-msgid "Cannot create encoder context"
-msgstr ""
-
-#: ../camel/camel-smime-context.c:615
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS àààâààààààààààà àààààà ààààâààààààààâ àààààààààààà"
-
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:1073
-msgid "Failed to encode data"
-msgstr "àààààà àààâàààà ààààààààààâ àààààààààààà"
-
-#: ../camel/camel-smime-context.c:693
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "àààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:695
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "àààààà ààààà"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ààààà àààààààààààààààà àààâàààààààààààààà ààààààààààà"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ààààà àààààààààààààààà àààâàààààààààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ààààààààà àààâàààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ààààààààà àààâàààààà àààààààààààààààààààà"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "àààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ààààààâààààààààààâ ààààà"
 
-#: ../camel/camel-smime-context.c:748
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "àààààààààààààâ ààààà àààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:755
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:768 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:783
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:793 ../camel/camel-smime-context.c:798
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "àààâàààààààààààààà ààààààâàààà àààààààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:815
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:831
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ààààà àààààààààà àààâ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:932 ../camel/camel-smime-context.c:1156
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
+msgid "Cannot create encoder context"
+msgstr ""
+
+#: ../camel/camel-smime-context.c:850
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS àààâààààààààààà àààààà ààààâààààààààâ àààààààààààà"
+
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
+msgid "Failed to encode data"
+msgstr "àààààà àààâàààà ààààààààààâ àààààààààààà"
+
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "àààààààâ ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:999
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1010
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "CMS ààààààà ààààâààààààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1016
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1022
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààààà àààààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1042
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1067
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "àààâààààààààààà àààààà ààààâààààààààâ àààààààààààà"
 
-#: ../camel/camel-smime-context.c:1163
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: ../camel/camel-smime-context.c:1190
-msgid "import keys: unimplemented"
-msgstr "ààààààâàààà àà: àààààààààààààààà"
-
-#: ../camel/camel-smime-context.c:1198
-msgid "export keys: unimplemented"
-msgstr "àààààààààâàààà àà: àààààààààààààààà"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààâàààâ ààààààààààà: ààààààà àààààààà"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:1838
 #, c-format
-#| msgid "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ààààâàààâ `%s'  àààààààààààààâ ààààààààà: ààààâàààâ àààààààààààà"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ààààâàààâ àààààààààààààâ ààààààààà: ààààààà àààààààà"
+#: ../camel/camel-store.c:1881
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ààààâààààààâ ààààâàà àààààààààà"
+
+#: ../camel/camel-store.c:2066
+#, fuzzy, 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: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:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "ààààààààààààààà"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ààààâàààâ àààààààààààààâ ààààààààà: %s: ààààâàààâ ààààààààààà"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2554
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "ààààâàààâ `%s' àààààààà: %s"
+
+#: ../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:544 ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../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: ààààààà àààààààà"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
-msgid "Trash"
-msgstr "àààààààààààâ"
-
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "ààààààààààààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
+#: ../camel/camel-stream-filter.c:334
+msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr ""
+#: ../camel/camel-stream-process.c:275
+#, c-format
+msgid "Connection cancelled"
+msgstr "àààààààâ ààààààààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
+#: ../camel/camel-stream-process.c:280
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" àààà ààààâàààààààààààààààà àààààà ààààààààààâ ààààààààà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr ""
+#: ../camel/camel-subscribable.c:386
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Subscribing to folder '%s'"
+msgstr "ààààâààààààâ ààààâàà àààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "àààâààààààààààààààààâ ààààààààâ àààààààààààà"
+#: ../camel/camel-subscribable.c:518
+#, fuzzy, c-format
+#| msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgid "Unsubscribing from folder '%s'"
+msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààà àààààààààààààààâ ààààààààà: ààààààà àààààâàà"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
+#: ../camel/camel-tcp-stream-raw.c:310
+#, c-format
+msgid "NSPR error code %d"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "àààâàààààààààààààà ààààààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "àààâààààààààààààààààâàà ààààààà ààààààààààààààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL àààààààà àààààààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL-ààâàà ààààààà ààààààààààààààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL-ààâ ààààà"
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "ààààààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:675
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
+#, c-format
+msgid "The proxy host does not support SOCKS5"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "ààààààààâ ààààà àààààààà àààâàààààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:789
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "%s àààà ààààààààà ààààààààààààààâ ààààààààààààà ààààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
+#: ../camel/camel-tcp-stream-raw.c:801
+msgid "General SOCKS server failure"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
+#: ../camel/camel-tcp-stream-raw.c:802
+msgid "SOCKS server's rules do not allow connection"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "àààâàààààààààààààà ààààààâ àààà ààààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "àààâàààààààààààààà àààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:803
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "àààààààà àààâàààààààààààààà ààààààààà (CA)"
+#: ../camel/camel-tcp-stream-raw.c:804
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "ààààààâàà àààà ààààà ààààààà"
+#: ../camel/camel-tcp-stream-raw.c:805
+#, fuzzy
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "àààààààâ àààààààààààààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "àààààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:806
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "àààâàààààààààààààà ààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:807
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "STLS à àààâàààâ àààààààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "àààâàààààààààààààà àààààààààààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:808
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "STLS à àààâàààâ àààààààààààààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Subject/Issuer ààààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:809
+#, fuzzy
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "àààààààààà ààààà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ààààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:842
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/Issuer àààààààâ ààààààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:860
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "àààâàààààâ ààààààà ààààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
+#: ../camel/camel-tcp-stream-raw.c:880
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
 msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "ààààààààààààâ àààààà ààààààààààààààâ ààààà"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "àààâàààààâ ààààààà ààààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
-#, c-format
+#: ../camel/camel-tcp-stream-ssl.c:505
+#, fuzzy, c-format
+#| msgid ""
+#| "Issuer:            %s\n"
+#| "Subject:           %s\n"
+#| "Fingerprint:       %s\n"
+#| "Signature:         %s"
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
 "Issuer:            %s\n"
 "Subject:           %s\n"
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:512
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-ssl.c:517
 #, c-format
 msgid ""
-"Bad certificate from %s:\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"%s-ààâ ààààààà ààààààà àààâàààààààààààààà:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"àààààààâàààà ààààààààààààà?"
 
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+#: ../camel/camel-tcp-stream-ssl.c:523
+msgid "_Reject"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:524
+msgid "Accept _Temporarily"
 msgstr ""
-"%s-àààà SSL àààâàààààààààààààà ààààààà :\n"
-"\n"
-"%s\n"
-"\n"
-"àààààààâàààà ààààààààààààà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:525
+msgid "_Accept Permanently"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2545,7 +3512,7 @@ msgstr ""
 "àààâàààààààààààààà ààààààà: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:638
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2554,7 +3521,7 @@ msgstr ""
 "ààààààà àààâàààààààààààààà ààààààààâ: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:656
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2563,390 +3530,102 @@ msgstr ""
 "àààâààààààààààààààààâàà ààààààà ààààààààààààààààà: %s\n"
 "Issuer: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:673
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:331
 #, c-format
-#| msgid "Could not parse URL `%s'"
 msgid "Could not parse URL '%s'"
 msgstr "URL `%s' àààààà ààààààààààâ àààààààààààà"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:494
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Updating folder '%s'"
+msgstr "ààààâàààâ `%s' àààààààà: %s"
+
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
-#| msgid "Error storing `%s': %s"
-msgid "Error storing '%s': %s"
-msgstr "`%s' àààààààààààààààààâ ààààà: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààà ààààâàààààààâ ààààâààààààààà àààààààààààâ ààààâàààààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s-ààâ %s àààà ààààààà àààààààà"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààà ààààâàààààààâ ààààâààààààààà àààààààààààâ ààààâàààààààà àààààààààà ààààààààà"
+#: ../camel/camel-vee-folder.c:941
+#, fuzzy, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "`%s' àààààààààààààààààâ ààààà: %s"
+
+#: ../camel/camel-vee-folder.c:1169
+msgid "Automatically _update on change in source folders"
+msgstr ""
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#. 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:38
 msgid "Unmatched"
 msgstr "ààààâàààààààà"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà: %s: àààààà ààà ààààâàààâ àààààààààà"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ààààâàààààâàà àààà ààààààààààâ ààààààààà: %s: àààààà ààà ààààâàààâ àààààààààà"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr ""
+
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ààààààààààààààààààà àààààààààààâ ààààâààààààààâ ààààààààà"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààààààààààà ààààààààààààà ààààâààààààààà àààààààààààâ ààààâààààààààâ ààààààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ààààààà àààààààà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "ààààààà àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "àààààààààààà ààààààààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ààààààà %s ààààààààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "ààà ààààâ àààààààààâ ààààààà àààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
-msgid "Could not get message"
-msgstr "ààààààà ààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
-#: ../camel/providers/imap/camel-imap-folder.c:265
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s-àààà àààààà àààà ààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
-msgid "Trash Folder Full. Please Empty."
-msgstr "ààààààààààà ààààààà, àààààà ààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
-#, c-format
-#| msgid "Cannot append message to folder `%s': %s"
-msgid "Cannot append message to folder '%s': %s"
-msgstr "âààààâàààâ`%s'-àààààà ààààààà ààààààààààâ ààààààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2188
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ààààààà àààààààààààààâ ààààààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààâàààâ ààààààààààâ %s àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "ààà ààààâ àààààààààâ ààààààààààààâ àààààà àààààààààààâ ààààààààà: cache àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "ààà ààààâ àààààààààâ ààààààààààààâ àààààà àààààààààààâ ààààààààà:               %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
-msgid "Checking for new mail"
-msgstr "ààààà àààààààààà ààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-msgid "C_heck for new messages in all folders"
-msgstr "ààààà ààààâààààààààà ààààà àààààààààààààà àààààà (_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Options"
-msgstr "àààààààâ"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-#| msgid "Apply filters to new messages in Inbox on this server"
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"à àààâààààààà ààà ààààààààààà ààààâààààààà ààààà "
-"àààààààààààâàààà ààààââààààààààâ _àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-#| msgid "Check new messages for Junk contents"
-msgid "Check new messages for J_unk contents"
-msgstr "_àààààààààààààà àààààààààâàààààà ààààà àààààààààààààâ àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#| msgid "Only check for Junk messages in the INBOX folder"
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "_àààààà ààààààààààà ààààâàààààâ àààààààààààààà àààààààààâ àààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-msgid "Automatically synchroni_ze account locally"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
-msgid "SOAP Settings"
-msgstr "SOAP ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-#| msgid "Post Office Agent SOAP Port:"
-msgid "Post Office Agent SOAP _Port:"
-msgstr "àààààààà ààààà àààààà SOAP _ààààâàààà:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell àààààààà àààà àààâàààààààààààà àààààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid "Password"
-msgstr "ààààâààààâàà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"ààà ààààààààâàààààààààà ààààâààààâàà àààààààààà àààààààà àààààààààààà àààâààààààààà àààààà ààààààààààâ à "
-"ààààà ààààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
-msgid "Host or user not available in url"
-msgstr "url-ààâ àààààààà àààààààààààâ àààààààààà àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
-msgid "You did not enter a password."
-msgstr "àààààààâ ààààâààààâàà àààâààààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
-msgid "Some features may not work correctly with your current server version"
-msgstr "ààààààààà ààààààààà àààâàààààâàà ààààâàààààâ ààà àààààààààâ ààààààâààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
-#, c-format
-msgid "No such folder %s"
-msgstr "%s ààààâàààâ àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àààâààààâ ààààààâ àààààààà àààààààààààà ààààâààààààâ àààààààààààààâ ààààààààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "àààààâàà ààààâàààààâ ààààààâààààààâ ààààààààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#, c-format
-#| msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "àààààààà àààààààààààà ààààâàààâ `%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
-#, c-format
-msgid "GroupWise server %s"
-msgstr "àààààààà àààààààààààà àààâàààâ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s-ààâ %s-àà àààààààà àààààààààààà àààâàààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s ààà àààààààà àààààààààà ààààààâ àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
-msgid "Sending Message"
-msgstr "ààààààà àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
-msgid "Could not send message: %s"
-msgstr "ààààààà ààààààààààààâ àààààààààààà: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "ààààà ààààààâ ààààà àààà ààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "àààâààààààààà àààààà àààààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "àààààààâàààà àààààààà àààààâàà àààààààààà àààâààààààààà àààààà ààààààà (_U)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "ààààâàààààà:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ààààâààààààâ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "àààààààààà ààààâààààààâ àààààà ààààààààà (_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr ""
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "ààààà àààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Hula àààâààààààààâ àààààààààààààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "ààà ààààààààâ àààààààààà ààààâààààâàà àààààààààà à ààààà Hula àààâààààààààà àààààà àààààààààà."
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
 msgid "No output stream"
 msgstr "ààààààààààà ààààààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../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:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
-msgid "Operation cancelled"
-msgstr "ààààààâààààà àààààààààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ààààààààààààààà àààâàààààâàà àààààààâ ààààâàààààààà: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:425
+#, fuzzy, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"IMAP àààâàààâ %s %s-ààâ ààààààà ààààààààà:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:429
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2955,713 +3634,295 @@ msgstr ""
 "IMAP àààâàààâ %s %s-ààâ ààààààà ààààààààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:512
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP àààâàààààâ ààààààà àààààààààààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:524
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP àààààâàà ààààààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:607
+#, c-format
 msgid "Server response ended too soon."
 msgstr "àààâàààààâàà àààààà àààà àààà àààààààààà."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:822
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP àààâàààààâàà ààààààààààâ %s ààààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:860
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP àààâàààààâ ààààààà àààààààààààààà ààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
-#| msgid "Only check for Junk messages in the INBOX folder"
-msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:356
+#, fuzzy
+#| msgid "Always check for new mail in this folder"
+msgid "Always check for _new mail in this folder"
 msgstr "ààà ààààààààààà ààààâàààààâ àààààààààààààà àààààààààâ àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:447
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "àààààààà %s àààààààààààààâ àààààààààààà: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:468
 #, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s-ààâ àààààà àààààààààààààà àààààààààààâàààààà ààààààààààààààà"
+msgid "Could not load summary for %s"
+msgstr "%s-àààà àààààà àààà ààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1137
 #, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr ""
+msgid "Scanning for changed messages in %s"
+msgstr "%s-ààâ àààààà àààààààààààààà àààààààààààâàààààà ààààààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3494
+#, fuzzy
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
 msgstr "ààààààà ààààààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3620
+#: ../camel/providers/imap/camel-imap-folder.c:4512
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message with message ID %s: %s"
-msgstr "ààààààà ID %s àààà ààààààà àààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#| msgid "No such message"
-msgid "No such message available."
-msgstr "àààààà ààààààà àààààààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
 msgid "This message is not currently available"
 msgstr "à ààààààà àààààààâ àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4085
+#: ../camel/providers/imap/camel-imap-folder.c:4167
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ààààà àààààààààààâàààààà àààààà ààààà %s-ààâ ààààààà àààààààààààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4299
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààâàààààâàà àààààâàààààà àààààà: %d àààààààààààà àààààààààâ àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4309
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààâàààààâàà àààààâàààààà àààààà: %d àààààààààààà UID àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4549
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "cache àààààààà àààààààààààâ àààààààààààà: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+msgstr "cache àààààààà àààààààààààâ àààààààààààà:"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ààààààà cache àààààààààààààâ àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
+#, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "%s ààààààà cache àààààààààààààâ àààààà:"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s cache àààààààààààààâ àààààà: %s"
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "%s cache àààààààààààààâ àààààà:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
+msgid "Checking for New Mail"
+msgstr "ààààà ààààààâ ààààà àààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#| msgid "Check for new messages in all folders"
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../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:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ààààà ààààâààààààààà ààààà àààààààààààâàààààà _àààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "ààààà àààààààà:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "à àààâààààààà ààà ààààààààààà ààààâààààààà ààààà àààààààààààâàààà ààààâààààààààâ àààààààààààà (_A)"
+#: ../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:72
-#| msgid "Check new messages for Junk contents"
-msgid "Check new messages for Jun_k contents"
-msgstr "_àààààààààààààà àààààààààâàààààà ààààà àààààààààààààâ àààààà"
+#: ../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:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
-msgid "Automatically synchroni_ze remote mail locally"
+#: ../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:83
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imap/camel-imap-provider.c:53
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "_ààààà àààààààà:"
+
+#: ../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:85
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP àààâààààààààâ ààààààâ àààààààààààààààà àààààààààààààààààà."
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "ààààà ààààààààààà ààààâàààààâ ààààâààààààààâ àààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "ààà ààààààààâ àààààààààà àààààààààà IMAP àààâààààààààà à ààààà àààààà àààààààààà."
+#: ../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-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP àààâàààâ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s-ààâ %s-àààà IMAP àààâàààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s-àààààà àààààà ààààààààààâ ààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
-msgid "SSL unavailable"
-msgstr "SSL àààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "àààààààâ ààààààààààààààààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
-#, 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:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
-msgid "STARTTLS not supported"
-msgstr "STARTTLS àààààààààààààààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:711
-msgid "SSL negotiations failed"
-msgstr "SSL àààààààààâ ààààààààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
-msgid "SSL is not available in this build"
-msgstr "à ààààâààààâ SSL àààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:865
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" àààà ààààâàààààààààààààààà àààààà ààààààààààâ ààààààààà: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "ààààà àààààààààâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-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-store.c:1057
-#| msgid "Sleet"
-msgid "Sent"
-msgstr "àààààà"
+#: ../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-store.c:1059
-msgid "Templates"
-msgstr "ààààààààâ"
+#: ../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-store.c:1304
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP àààâàààâ %s-ààâ %s àààà ààààààààà ààààààààààààààâ ààààààààààààà ààààààà àààààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:71
+msgid "IMAP default port"
+msgstr "àààààààààà ààààààààààà ààààâàààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "%s àààà ààààààààà ààààààààààààààâ ààààààààààààà ààààààà àààààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP àààâàààâ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP àààâàààààâ ààààààààà àààààààààààààààààâ àààààààààààà.\n"
-"%s\n"
-"\n"
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" ààààà ààààâàààààâàà àààà ààààààààà, ààààà àààààâ \"%c\" àààà àààààà ààààà àààààààà"
+#: ../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-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:2191
+#: ../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."
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ààààâàààâ `%s' ààààâààààààààààààâ ààààààààà: ààààâàààâ ààààààààààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "àààààààà àààààâàà ààààâàààâ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP àààâàààâ %s-àààààà ààààâàààààà àààààààààààààààâ àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP àààâàààâ %s-ààâ ààààààà àààààààààààààà àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP àààâàààâ %s-ààâ ààààààà àààààààààààààà àààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap/camel-imap-store.c:2984
 #, c-format
-#| msgid "Cannot select folder `%s': Invalid mailbox name"
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ààààâàààâ `%s' àààààààààààààààààâ àààààààààààà: àààààâ àààààààààà àààà ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-#| msgid "Cannot select folder `%s': Bad command"
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ààààâàààâ `%s' àààààààààààààààààâ àààààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-#| msgid "Failed sending command to IMAP server %s: %s"
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "IMAP àààâàààâ %s-àààààà ààààâàààààà àààààààààààààààâ àààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-#| msgid "SSL unavailable"
-msgid "service unavailable"
-msgstr "ààààà àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 àààâàààâ %s-ààâàà àààààààâ ààààààààààààààà ààààâàààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
+msgid "Retrieving list of folders at '%s'"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr ""
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
-#, c-format
-#| msgid "Cannot access folder `%s': %s"
-msgid "Cannot access folder '%s': %s"
-msgstr "ààààâàààâ `%s'-àààààà àààààààà àààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-#| msgid "Cannot sync flags to folder `%s': Unknown"
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ààààâàààâ `%s'-àààààà àààààààààâ ààààâàà ààààààààààâ ààààààààà: àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-#| msgid "Cannot sync flags to folder `%s': Bad command"
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ààààâàààâ `%s'-àààààà àààààààààâ ààààâàà ààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-#| msgid "Cannot expunge folder `%s': Unknown"
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ààààâàààâ `%s' ààààààààààààâ ààààààààà: àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-#| msgid "Cannot expunge folder `%s': Bad command"
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ààààâàààâ `%s' ààààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-#| msgid "Cannot get message %s from folder `%s': No such message"
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà %s ààààààà àààààààà: àààààà ààà ààààààà àààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-#| msgid "Cannot get message %s from folder `%s': Bad command"
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà %s ààààààà àààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-#| msgid "Cannot append message to folder `%s': Folder is read-only"
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààâàààâ ààààààààààààâ àààààà àààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-#| msgid "Cannot append message to folder `%s': Unknown error"
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: àààààààààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-#| msgid "Cannot append message to folder `%s': Bad command"
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-#| msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-#| msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààâààààààààâ ààààààààà: àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-#| msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-#| msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààâààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "ààààà àààààààààààâ ààààààààààà ààààà ààààà àààààààààààà (_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "ààà ààààààààààà ààààâàààààâ àààààààààààààà àààààààààâàààààà àààààà (_g)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 àààâààààààààâ àààààààààâ àààààààààààààààà àààààààààààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"IMAPv4rev1 àààâààààààààà ààà ààààààààâ àààààààààà ààààâààààâàà àààààààààà àààààà ààààààààààâ "
-"àààààààààààà ààà ààààà ààààà."
+#: ../camel/providers/imap/camel-imap-store.c:3334
+#, fuzzy, c-format
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "ààààààààààààààà àààâàààààâàà àààààààâ ààààâàààààààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "àààààààâ àààààààààààààààààààààààààà"
+#: ../camel/providers/imap/camel-imap-store.c:3338
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "ààààààààààààààà àààâàààààâàà àààààààâ ààààâàààààààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, 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: Server does not support "
-"STARTTLS"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
 msgstr ""
-"àààààààà ààààààâ IMAP àààâàààâ %s-àààààà àààààà ààààààààààâ àààààààààààà: àààâàààâ "
-"STARTTLS àààààààààààààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS àààààààààâ ààààààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "%s àààààààà àààààààààà IMAP àààâàààâ %s-àààààà ààààààààà ààààààààààààààâ ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s àààààààààà IMAP àààâàààâ %s-àààààà ààààààààà ààààààààààààààâ ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "àààâààààâ ààààààâ IMAP ààààâààààààâ àààààààààààààâ ààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-#| msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "IMAP àààâàààààâ %s-ààâ ààààâàààâ `%s' ààààààààààà : àààààààààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-#| msgid "Cannot get LIST information for `%s' on IMAP server %s: %s"
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "IMAP àààâàààâ %s-àààà `%s'-àààà LIST àààààààààâ àààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-#| msgid "Cannot create folder `%s': Invalid mailbox name"
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ààààâàààâ àààààààààààààâ ààààààààà `%s': àààààâ àààààààààà àààà àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-#| msgid "Cannot create folder `%s': Bad command"
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ààààâàààâ àààààààààààààâ ààààààààà `%s': ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-#| msgid "Cannot delete folder `%s': Special folder"
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': àààààààà ààààâàààâ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ààà ààààâ ààà IMAP ààààâààààààâ àààààà ààààààààààâ ààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-#| msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': àààààâ àààààààààà àààà àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-#| msgid "Cannot delete folder `%s': Bad command"
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: àààààààà ààààâàààâ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "àààâààààâ ààààààâ IMAP ààààâàààààààà àààà ààààààààààâ ààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-#| msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-#| msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "IMAP àààâàààâ %s-ààâ `%s' àààààààààààààà %s ààààà àààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "àààâààààâ ààààààâ IMAP ààààâààààààààâ ààààààà ààààààààâ ààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-#| msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-#| msgid "Cannot subscribe to folder `%s': Bad command"
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "àààâààààâ ààààààâ IMAP ààààâààààààààâ ààààààà ààààààà àààààààààààààààâ ààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-#| msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààà àààààààààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, c-format
-#| msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààà àààààààààààààààâ ààààààààà: ààààààà àààààâàà"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "àààààà àààààààààààààààààà àààààààààààâàààààà ààààààààààààààà"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
 msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-#| msgid "Fetching envelopes for new messages"
-msgid "Fetching envelopes of new messages"
-msgstr "ààààà àààààààààààâàààààà àààààààâ àààààààààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP àààâàààâ %s-ààâ àààààààà ààààààààààâ àààààààààààààà àààààààâ: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "àààààà àààààààà"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP àààâàààààâàà %s ààààààààààààààà àààààààâ ààààâàààààààààààààààààà: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "ààààà àààààààà:"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "ààààààààààààâàà ààààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "ààààààààààà ààààààà ààààâàààà"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ààààààààààààààà IMAP 4(.1) ààààààâàà\n"
-"ààà ààààààààààààààààà ààààààààààààààààààààà àààà ààà, àààà àààààà imap ààààààààààààààààà.\n"
-"\n"
-" !!! ààà ààààààààààâ ààààààààààà ààààààààààààààâ ààààààà  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s (ààààâàààà %s) -àààààà àààààà ààààààààààâ ààààààààà: %s"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s-ààâ ààà POP àààâààààààààà àààààà ààààààààààâ àààààààààààà"
-
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr ""
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
-msgid "mailbox:%s (%s)"
+#| msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "àààààâ àààààà:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
-#| msgid "Use the `.folders' folder summary file (exmh)"
+#: ../camel/providers/local/camel-local-folder.c:499
+msgid "_Index message body data"
+msgstr ""
+
+#: ../camel/providers/local/camel-local-folder.c:727
+#, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "`.folders' ààààâàààâ àààààà ààààâ ààààààààààà (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-ààààâàààààààààà ààààààâ àààààààààààâ"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààààà ààààààâ àààààààààààààâ àààààààâ ààààààâ ààààààààààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "àààààààâ àààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3669,32 +3930,31 @@ msgstr ""
 "mbox-ààààâàààààààààà àààààààààààâ ààààààà Evolution àààààààà ààààààààà ààààâàààààààààààà àààààààâ "
 "ààààààâ ààààààààààâ àààààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "Apply filters to new messages in INBOX"
-msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+#, fuzzy
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
 msgstr "ààààà ààààààààààà ààààâàààààâ ààààâààààààààâ àààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-ààààâàààààààààà ààààààâ àààààààààààâ"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../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
-#| msgid "Store status headers in Elm/Pine/Mutt format"
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt ààààâààààààààâ ààààààààà àààààààààààààâ _ààààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:115
-#| msgid "Standard Unix mbox spool or directory"
+#: ../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:127
+#: ../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."
@@ -3703,403 +3963,414 @@ msgstr ""
 "àààààààààààààààààà.\n"
 "Elm, Pine, Mutt àààààààà ààààâàààààààààà àààà ààààààààààààà ààà àààààààààààààà."
 
-#: ../camel/providers/local/camel-local-provider.c:126
-#| msgid "Standard Unix mbox spool or directory"
+#: ../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:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../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:180
+#, c-format
+msgid "Local mail file %s"
+msgstr "àààààààâ ààààààâ ààààâ %s"
+
+#: ../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:172
+#: ../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:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../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:201
+#: ../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:247
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
 #, c-format
-msgid "Local mail file %s"
-msgstr "àààààààâ ààààààâ ààààâ %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "ààààâààààààà ààààà ààààâ `%s' àààààà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
 #, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ààààâàààâ %s-àà %s àààà àààààààààà ààààààààààâ ààààààààà: %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "àààààà ààààâ ààààâàààâ àààààà ààààààààààâ àààààààààààà `%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s'-ààâàà àààà ààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
-#, c-format
-#| msgid "Could not delete folder index file `%s': %s"
-msgid "Could not delete folder index file '%s': %s"
-msgstr "ààààâààààààà ààààà ààààâ `%s' àààààà ààààààààààâ àààààààààààà: %s"
-
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-summary.c:543
 #, c-format
-#| msgid "Could not delete folder meta file `%s': %s"
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "àààààà ààààâ ààààâàààâ àààààà ààààààààààâ àààààààààààà `%s': %s"
-
-#: ../camel/providers/local/camel-local-summary.c:515
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààààààààààà ààààààà ààààâààààààààâ àààààààààààà: àààààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Maildir-ààâ ààààààà ààààààà ààààààààààààààààààààà"
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:335
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../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:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ààààâààààààààà ààààààà ààààààààààâ àààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: ../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
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "ààààààà àààààààà: %s %s ààààâàààààâ àààààà\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "àààààààà ààààààà"
+#: ../camel/providers/local/camel-maildir-folder.c:353
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "maildir ààààâààààààààà ààààààà ààààààààààâ àààààààààààà: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:112
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+msgstr "ààààâàààâ àààààààààààààâ ààààààààà: %s: ààààâàààâ ààààààààààà"
+
+#: ../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:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../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"
 msgid "Cannot create folder '%s': %s"
 msgstr "ààààâàààâ `%s' àààààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../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"
 msgid "Cannot get folder '%s': %s"
 msgstr "ààààâàààâ `%s' àààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../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."
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ààààâàààâ `%s' àààààààà: ààààâàààâ àààààààààà."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:269
 #, c-format
-#| msgid "Cannot get folder `%s': not a maildir directory."
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ààààâàààâ `%s' àààààààà: ààà maildir àààààààà àààà."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../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"
 msgid "Could not delete folder '%s': %s"
 msgstr "ààààâàààâ `%s' àààààà ààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "ààà maildir àààààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../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"
 msgid "Could not scan folder '%s': %s"
 msgstr "ààààâàààâ `%s' àààààààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:797
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "ààààâàààâ àààààààààààààâ ààààààààà: %s: ààààâàààâ ààààààààààà"
+
+#: ../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:551
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ààààâàààààâàà àààààà ààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ààààà àààààààààààâàààààà ààààààààààààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../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:159
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "ààààâàààâ %s-ààâ ààààààààààààààààààâ ààààààààà: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "àààààâ àààààà àààààààààààâ ààààààààà: %s: %s\n"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "àààààâ àààààà àààààààààààâ ààààààààà: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "ààààààààâ àààààà àààààààààààààààààààà àààààààààààààààà"
-
-#: ../camel/providers/local/camel-mbox-folder.c:284
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:253
+#, fuzzy, c-format
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox àààààààààà ààààààà ààààààààààâ ààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààààààààààààààâ àààààààà ààààààààâ ààààâàààâ àààààààààà."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "àààààà ààààààààààààààààààààààâ àààààà."
+#: ../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:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../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:198
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
-#| msgid "Cannot get folder `%s': not a regular file."
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ààààâàààâ `%s' ààààààààààààààâ ààààààààà: àààààà ààààâ àààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
-#| msgid ""
-#| "Could not delete folder `%s':\n"
-#| "%s"
-msgid ""
-"Could not delete folder '%s':\n"
-"%s"
-msgstr ""
-"ààààâàààâ `%s' àààààà ààààààààààâ ààààààààà:\n"
-"%s"
+msgid "Cannot create directory '%s': %s."
+msgstr "àààààààà àààààààààààààâ ààààààààà: %s: %s"
+
+#: ../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:619
+msgid "Folder already exists"
+msgstr "ààààâàààâ ààààààààààà"
+
+#: ../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"
+"%s"
+msgstr ""
+"ààààâàààâ `%s' àààààà ààààààààààâ ààààààààà:\n"
+"%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
-#| msgid "`%s' is not a regular file."
 msgid "'%s' is not a regular file."
 msgstr "`%s' ààà àààààà ààààâ àààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
-#| msgid "Folder `%s' is not empty. Not deleted."
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ààààâàààâ `%s' ààààààààà. àààààà ààààààààààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../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"
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ààààâààààààà àààààà ààààâ `%s' àààààà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-#| msgid "Cannot create directory `%s': %s."
-msgid "Cannot create directory '%s': %s."
-msgstr "àààààààà àààààààààààààâ ààààààààà: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ààààâàààâ àààààààààààààâ ààààààààà: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "ààààâàààâ ààààààààààà"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "ààààà ààààâàààààâàà àààà àààààààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
-#| msgid "Could not rename `%s': `%s': %s"
 msgid "Could not rename '%s': '%s': %s"
 msgstr "`%s'-àààà àààà ààààààààààâ àààààààààààà: `%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../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:535
+#: ../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:585
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:490
+#, fuzzy, c-format
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "%ld-àà ààààâàààâ %s-ààâ ààààààààà ààààààà ààààààâ àààààààâ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../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:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../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:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../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:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "àààààààààààâàà ààààâàààâ ààààààààààààâ àààààààààààà %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
-#| msgid "Could not close temp folder: %s"
 msgid "Could not close temporary folder: %s"
 msgstr "ààààâààààààà ààààâàààâ ààààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../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:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààâàààâ ààààààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1123
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1136
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ààà ààààâàààà àààààà, ààààààààà ààààâàààà àààààààâ ààààààààààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "àààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1194
+#: ../camel/providers/local/camel-mbox-summary.c:1224
 #, c-format
-#| msgid "Writing to tmp mailbox failed: %s: %s"
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààâààààààà àààààâ àààààààààààààà àààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
-#| msgid "Writing to tmp mailbox failed: %s: %s"
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààâààààààà àààààâ àààààààààààààà àààààààààâ àààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH àààààà àààààààà ààààààà ààààààààààààààààààààà"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:118
+#, fuzzy, c-format
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ààààâààààààààà ààààààà ààààààààààâ àààààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
-#| msgid "Could not create folder `%s': %s"
 msgid "Could not create folder '%s': %s"
 msgstr "ààààâàààâ`%s' àààààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
-#| msgid "Cannot get folder `%s': not a directory."
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ààààâàààâ `%s' àààààààà: ààà àààààààà àààà."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH àààààààààààààààà ààà àààààààààààâ ààààààààà: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
-#| msgid "Spool `%s' cannot be opened: %s"
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool `%s' àààààààààààâ ààààààààà: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
-#| msgid "Spool `%s' is not a regular file or directory"
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool `%s' ààà àààààà ààààâ àààààààààààâ àààààààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:425
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Spool ààààààâ àààà %s"
+
+#: ../camel/providers/local/camel-spool-store.c:429
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool ààààâàààâ àààà %s"
+
+#: ../camel/providers/local/camel-spool-store.c:432
+#| msgid "Invalid purpose"
+msgid "Invalid spool"
+msgstr "àààààààà ààààààâ"
+
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
-#| msgid "Folder `%s/%s' does not exist."
 msgid "Folder '%s/%s' does not exist."
 msgstr "ààààâàààâ `%s/%s' àààààààààà."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
-#| msgid ""
-#| "Could not open folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
@@ -4107,17 +4378,13 @@ msgstr ""
 "ààààâàààâ `%s' àààààààààààâ ààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
-#| msgid "Folder `%s' does not exist."
 msgid "Folder '%s' does not exist."
 msgstr "ààààâàààâ `%s' àààààààààà."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
-#| msgid ""
-#| "Could not create folder `%s':\n"
-#| "%s"
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
@@ -4125,105 +4392,129 @@ msgstr ""
 "ààààâàààâ `%s' ààààâààààààààààààâ ààààààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
-#| msgid "`%s' is not a mailbox file."
 msgid "'%s' is not a mailbox file."
 msgstr "`%s' ààà àààààâ àààààà àààà."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../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:222
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Spool ààààààâ àààà %s"
+msgid "Spool folders cannot be deleted"
+msgstr "spool ààààâààààààâ àààààà ààààààààààâ ààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Spool ààààâàààâ àààà %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "spool ààààâàààààààà àààà ààààààààààâ ààààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "spool ààààâààààààâ àààààà ààààààààààâ ààààààààà"
-
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../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 sync temporary folder %s: %s"
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ààààâààààààà ààààâàààâ %s ààààâàà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "spool ààààâàààâ %s ààààâàà ààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
+#: ../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 sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in `%s'"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "spool ààààâàààâ %s ààààâàà ààààààààààâ àààààààààààà: %s\n"
 "ààààâàààààâ ààààààààààààà, ààààâàààà`%s'-ààâ àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../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:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:1033
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ààààààà %s ààààààààààà: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../camel/providers/pop3/camel-pop3-folder.c:639
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "ààààààà %s ààààààààààà:"
+
+#: ../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:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "ààààààààààààâ àààààààààààà:"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "ààà ààààâ ààààààààààààààààâ àààààààâàààà NNTP ààààâàààààâ àààààààààààâ àààààààààààâ ààààààààààààâ ààààààààà!"
+msgstr ""
+"ààà ààààâ ààààààààààààààààâ àààààààâàààà NNTP ààààâàààààâ àààààààààààâ àààààààààààâ ààààààààààààâ ààààààààà!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../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:46
-#| msgid ""
-#| "Show folders in short notation (e.g. c.o.linux rather than comp.os.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 "ààààà àààààààààààâ ààààâààààààâ _àààààààààààà (ààà. comp.os.linux-àà àààà c.o.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
-#| msgid "In the subscription dialog, show relative folder names"
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "àààààààààààààààààààà _àààààà ààààààààâ, àààààààà ààààâààààààà ààààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
+msgid "Default NNTP port"
+msgstr "ààààààààààà àààâàààâàààà ààààâàààà"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET ààààâààààààâ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "USENET ààààâàààààààààààààààààààâ ààààààà ààààààààààààà ààààààààà ààààààààààààà àààààààààààà ààà "
 "àààààààà ààààà."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4231,22 +4522,23 @@ msgstr ""
 "ààààààààâ àààààààààà ààààâààààâàà àààààààààà à ààààà NNTP àààâààààààà ààààààààà ààààààààà "
 "àààààààààààààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
-#, c-format
-msgid "Could not read greeting from %s: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:286
+#, fuzzy, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
 msgstr "%s-ààâ ààààààà àààààààààà ààààààààààààâ àààààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:298
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP àààâàààâ %s ààààà àààà %d àààâàààààààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "via %s ààà USENET ààààâààààààâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4257,7 +4549,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "àààààààâàààà ààààâàààààààà ààààààààààâ ààà ààààâàààâ àààààààààààààâ ààààààààà: àààà ààààààà ààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1168
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "ààà ààààâààààààà àààààààààààà ààààâàààààâàà àààà àààààààâàààà ààààààààààâ ààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1191
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"àààààààâàààà ààààâàààààààà ààààààààààâ àààààà ààà ààààâàààâ àààààà ààààààààààâ ààààààààà: àààà ààààààà "
+"àààààààààààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4268,7 +4578,8 @@ msgstr ""
 "àààààà ààà ààààâàààààààààààà àààààààààà. àààààààâ àààààààààààà ààààà àààààààààà ààà àààààâàà ààààâàààâ "
 "àààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1438
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4278,129 +4589,110 @@ msgstr ""
 "\n"
 "àààààà ààà ààààâàààààààààààà àààààààààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààààààâàààà ààààâàààààààà ààààààààààâ ààà ààààâàààâ àààààààààààààâ ààààààààà: àààà ààààààà ààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:974
-msgid "You cannot rename a folder in a News store."
-msgstr "ààà ààààâààààààà àààààààààààà ààààâàààààâàà àààà àààààààâàààà ààààààààààâ ààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:982
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"àààààààâàààà ààààâàààààààà ààààààààààâ àààààà ààà ààààâàààâ àààààà ààààààààààâ ààààààààà: àààà ààààààà "
-"àààààààààààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr ""
-"ààààààààà àààààà àààààààààààâ ààààààààààààààààààààààà, ààààà ààààààààààààà àààâ ààààààà "
-"ààààààààààààààààààààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "àààâààààààààà ààààààààà àààààà àààààààààààâ ààààààààà: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1628
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP àààààâàà ààààààààààààààààààààààà:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP àààààâàà ààààààààààààààààààààààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "àààààà ààààààààààààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "à ààààâàààâ àààààààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../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:278
+#: ../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:378
+#: ../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
-msgid "Use cancel"
-msgstr "àààààààààà ààààààààààà"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààààààà ààààààààààààààààààààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
-msgid "Retrieving POP summary"
-msgstr "POP àààààà àààààààààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP àààààà àààààààà: %s"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
-msgid "Expunging old messages"
-msgstr "ààà àààààààààààâ ààààààà àààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
-msgid "Expunging deleted messages"
-msgstr "àààààà ààààà àààààààààààâ ààààààà àààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:523
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s-ààâ ààààààà àààààààà"
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:539
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ààààààà %d àààààààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
 msgid "Unknown reason"
 msgstr "àààààààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-#| msgid "Leave messages on server"
+#: ../camel/providers/pop3/camel-pop3-folder.c:679
+msgid "Retrieving POP summary"
+msgstr "POP àààààà àààààààààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:740
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
+msgstr "POP àààààà àààààààà:"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:859
+msgid "Expunging old messages"
+msgstr "ààà àààààààààààâ ààààààà àààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:879
+msgid "Expunging deleted messages"
+msgstr "àààààà ààààà àààààààààààâ ààààààà àààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#| msgid "Message storage"
+msgid "Message Storage"
+msgstr "àààààààààààààà ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "àààâàààààâ ààààààààààâ _àààààààààààà"
 
+#. 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)"
 msgid "_Delete after %s day(s)"
 msgstr "%s àààààààààâàààà àààà _àààààààà ààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:47
-#| msgid "Disable support for all POP3 extensions"
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "ààààà POP3 àààààààààâààààààâàààààààà _ààààààà ààààààààààààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "Default POP3 port"
+msgstr "ààààààààààà àààààà3 ààààâàààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
+msgid "POP3 over SSL"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP àààâàààààààààààà àààààà àààààààààààààà ààààààâ ààààââàààà àààààààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../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."
@@ -4408,7 +4700,7 @@ msgstr ""
 "ààààààààâ ààààààààà ààààâààààâàà àààààààààà POP àààâààààààààà àààààà ààààààààà ààààààààà ààà. POP "
 "àààâààààààâ àààààà à ààààà ààààààààààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../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 "
@@ -4418,95 +4710,115 @@ msgstr ""
 "ààà.ààà ààààààààààààààààà ààààà àààààààààààààà àààâàààààààààà àààààààààààààâààààà ààà ààààààà "
 "ààààààâààààààààààààààààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:83
+msgid ": "
+msgstr ": "
+
+#: ../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:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "àààààààà ààààààààâ POP àààâàààâ %s-àààààà àààààà àààààààààààààâ àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:155
 msgid "STLS not supported by server"
 msgstr "STLS à àààâàààâ àààààààààààààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
-msgid "TLS is not available in this build"
-msgstr "à ààààâààààâ TLS àààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà: àààààààààààààààààààààà ààààààààà "
-"ààààààààààààààààààà ààààààààààààààà ààààààà àààààààà."
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:176
+#, fuzzy, 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%s"
+msgstr "àààààààà ààààààààâ POP àààâàààâ %s-àààààà àààààà àààààààààààààâ àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
-#, c-format
-#| msgid "SASL `%s' Login failed for POP server %s: %s"
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "POP àààâàààâ %s-àààààààà SASL `%s' ààààààâ ààààààààààààà : %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:189
+#, fuzzy, 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 "àààààààà ààààààààâ POP àààâàààâ %s-àààààà àààààà àààààààààààààâ àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:298
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP àààâàààâ %s-àààààà ààààààâ ààààààààààâ ààààààààà: SASL àààààààààààààààâ ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:320
+#, fuzzy, c-format
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
 msgstr "POP àààâàààâ %s-ààâ ààààààààà àààààààààààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:371
+#, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "àààààà3 àààâàààâ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:374
+#, fuzzy, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%s-ààâ %s-àààà IMAP àààâàààà"
+
+#: ../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 ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../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: %s"
+"Error sending password: "
 msgstr ""
 "POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà.\n"
-"ààààâààààâàà àààààààààààààààâ ààààà: %s"
+"ààààààààààà àààààààààààààààâ ààààà:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. 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"
+#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà.\n"
-"ààààààààààààà àààààâàà àààà àààààààààààààààâ ààààà: %s"
+"username%s àààààààààààààààâ ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:673
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:701
 #, c-format
-#| msgid "No such folder `%s'."
 msgid "No such folder '%s'."
 msgstr "`%s' àààà ààààâàààâ àààààààààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:718
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "àààààà3 àààààààààààâààààà ààààâàààâ ààààààâàààà àààààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4514,903 +4826,1851 @@ msgstr ""
 "àààààààâ ààààààààààààààà \"sendmail\" àààààààààààààààà ààààààâ àààààà ààà ààààààààààààààààààà "
 "àààààààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "sendmail ààààààààà ààà ààààààâ ààààààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ààààààâ ààààà àààààààààààà àààààààà àààààà ààààààààààâ àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../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:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail fork ààààààààààâ ààààààààà: %s: ààààààâ ààààààààààààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "ààààààà ààààààààààààâ àààààààààààà:"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "%s àààààààààâ sendmail-ààâ ààààààà ààààààà àààààààààààààààà: ààààààâ ààààààààààààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../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:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "%d ààààààààààààâ sendmail-ààâ ààààààà ààààààà àààààààààààààààà: ààààààâ ààààààààààààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "ààààààààààà ààààààààààà ààààâàààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "sendmail ààààààààà ààà ààààààâ ààààààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "àààààààààààààà SMTP"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "ààààààà ààààààààààààààâ ààààâàààà"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP àààààààààà ààààààààààà ààà mailhub-àààààà àààààà àààààà ààààààâ àààààààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "àààààààààààààà ààààààààààâ ààààà:"
+
+#: ../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:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS àààààâàà ààààààààààààà: "
+
+#: ../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:301
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP àààâàààâ %s"
+
+#: ../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:378
+#, c-format
+#| msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "%s ààààààààà àààààà ààààààààâ SMTP àààâàààâ %s àààààààààààààààààààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
+#, c-format
+msgid "No SASL mechanism was specified"
+msgstr "ààààààààààâ àààààààà àààâààààààààààà"
+
+#: ../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: %s"
+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:661
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ààààààà ààààààààààààâ àààààààààààà: ààààà ààààààààâàà ààààâàààààà àààààààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
+msgid "Sending message"
+msgstr "ààààààà àààààààààààà"
+
+#: ../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:703
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ààààààà ààààààààààààâ àààààààààààà: ààààà àààààà ààààààà ààààààààààâ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "ààààààà àààààâàà, ààààâàààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààààààààààâ àààààààààààâ àààâààààààààâàààààààâ ààààâàààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "àààààâàà ààààààààààààààààâ ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "àààààâàà ààààààààààâ àààààààâààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "àààààààààààààâàà ààààààà, àààààààààààâ àààààààààààààâàà àààààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "àààààààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "ààààà àààààààààààààààààà àààààâ àààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "ààààà àààààààà, àààààààààààààààààà àààààâ àààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "àààààààààààà ààààààâ ààààààâààààà ààààààà: ààààâàààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../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:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "àààààààààààà ààààààâ ààààààâààààà ààààâàààààààààààààààà: ààààààààààààààà ààààà àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààààààààà ààààààâààààà ààààâàààààààààààààààà: àààààâ àààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "àààààààààààà ààààààâ ààààààâààààà ààààâàààààààààààààààà: ààààààâààààààààààâ ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../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:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "Requested action not taken: insufficient system storage"
 msgstr "àààààààààààà ààààààâ ààààààâààààà ààààâàààààààààààààààà: ààààààààààààààà ààààà àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "àààààààààààà ààààààâ ààààààâààààà ààààâàààààààààààààààà: ààààààààààààààà ààààààààààâ ààààààààààààààààà"
+msgstr ""
+"àààààààààààà ààààààâ ààààààâààààà ààààâàààààààààààààààà: ààààààààààààààà ààààààààààâ ààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "àààààààààààà ààààààâààààà àààààààààà: àààààâ àààààààààà àààà ààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../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:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
 msgid "Transaction failed"
 msgstr "àààààààààâ ààààààààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "A password transition is needed"
 msgstr "ààà ààààâààààâàà àààààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààààà ààààààààààààà àààààààà àààà ààààâàààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààààààààà ààààààààà ààààààààààààà àààààààààààààâ àààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
 msgid "Temporary authentication failure"
 msgstr "ààààâààààààààààààààà ààààààààà àààààààààààâ ààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "àààààààààààààà ààààààààààâ ààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+msgid "SMTP Greeting"
+msgstr "SMTP àààààààààà"
+
+#: ../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: %s"
+msgid "HELO command failed: "
+msgstr "HELO àààààâàà ààààààààààààà:"
+
+#: ../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"
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM àààààâàà ààààààààààààà:"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO àààààâàà ààààààààààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> ààààààààààààà:"
+
+#: ../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"
+msgid "DATA command failed: "
+msgstr "DATA àààààâàà ààààààààààààà:"
+
+#: ../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: %s"
+msgid "RSET command failed: "
+msgstr "RSET àààààâàà ààààààààààààà: "
+
+#: ../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: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT àààààâàà ààààààààààààà:"
+
+#: ../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 "ààààààà ààààà àààààààààà"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#| msgid "No response from the server"
+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 "Could not cancel operation"
+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 "ààààààààà ààààààààààààà à ààààààààààà ààààâààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../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 "Operation cancelled"
+msgid "Keyring operation was cancelled"
+msgstr "àààààà àààààààà ààààààààààààààààààààààà"
+
+#: ../libebackend/e-backend.c:190
 #, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "àààààààààààà ààààààààâ SMTP àààâàààâ %s-àààààààà àààààààâ ààààààààààààààààààààààà: %s"
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "%s does not support authentication"
+msgstr "%s ààààààààà àààààààààààâ àààààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../libebackend/e-collection-backend.c:734
 #, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS àààààâàà ààààààààààààà: %s"
+msgid "%s does not support creating remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "STARTTLS àààààâàà ààààààààààààà"
+#: ../libebackend/e-collection-backend.c:793
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../libebackend/e-server-side-source.c:126
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+msgid "Data source is missing a [%s] group"
 msgstr ""
-"àààààààààààààààààààààà àààààààààà %s ààààààààà àààààà ààààààààâ SMTP àààâàààâ %s "
-"àààààààààààààààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+msgid "Data source '%s' does not support creating remote resources"
 msgstr ""
-"SMTP àààâààààààààà ààààààààà àààààà ààààààààâ àààààààààààà.\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../libebackend/e-server-side-source.c:930
 #, c-format
-msgid "SMTP server %s"
-msgstr "SMTP àààâàààâ %s"
+msgid "Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
 #, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s ààà SMTP ààààààâ àààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "ààààààà ààààààààààààâ àààààààààààà: àààâàààà àààààà ààààààààààààà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "ààààààà ààààààààààààâ àààààààààààà: ààààà ààààààààâàà ààààâàààààà àààààààà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "ààààààà àààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "ààààààà ààààààààààààâ àààààààààààà: ààààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ààààààà ààààààààààààâ àààààààààààà: ààààà àààààà ààààààà ààààààààààâ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
-msgid "SMTP Greeting"
-msgstr "SMTP àààààààààà"
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "àààààààà àààààààààààâ àààààà àààààààààààà, àààààà àààààà '%s' àààààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../libebackend/e-server-side-source.c:972
 #, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO àààààâàà ààààààààààààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "HELO àààààâàà ààààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
-msgid "SMTP Authentication"
-msgstr "SMTP-ààààâ ààààààààà àààààà ààààààààâ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "SASL-àààààààà ààààààààà àààààààààààààààà àààààààà ààààààààààààààààâ ààààà."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH àààààâàà ààààààààààààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "AUTH àààààâàà ààààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "ààààààà àààâàààààâ ààààààà ààààààà ààààààààà àààààà ààààààààâ.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM àààààâàà ààààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> ààààààààààààà"
+msgid "Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../libebackend/e-server-side-source.c:1285
 #, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
+msgid "File must have a '.source' extension"
+msgstr "ààààààà ààà '.source' àààààààààààâàààâ àààààààààààà"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "DATA àààààâàà ààààààààààààà"
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1523
+#| msgid "Failed to authenticate.\n"
+msgid "The user declined to authenticate"
+msgstr "ààààààààà àààààààààààâ ààààààààààà ààààààààààà ààààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../libebackend/e-source-registry-server.c:770
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET àààààâàà ààààààààààààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "RSET àààààâàà ààààààààààààà"
+msgid "UID '%s' is already in use"
+msgstr "UID '%s' àààààààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT àààààâàà ààààààààààààà: %s"
+#: ../libedataserver/e-categories.c:46
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "ààààâàààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "QUIT àààààâàà ààààààààààààà"
+#: ../libedataserver/e-categories.c:47
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "àààààààààâ "
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:48
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àààààà"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "àààààààààààâ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààààààààâ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "àààààà ààààâàààààâ"
+msgstr "àààà ààààâàààààâ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:56
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ààààààààààààà ààààààààààâ"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ààààààààâ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "àààâàààâààààààâ "
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àà àààààààààâ"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ààààâ àààààààâ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:64
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "ààààà"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààààààààààâ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àààààààààààâ"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "àààààà ààààààààà"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+#| msgid "Waiting"
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "àààààààààààààààà"
 
+#: ../libedataserver/e-client.c:124
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "àààààà ààààààààààààààààààà"
+
+#: ../libedataserver/e-client.c:126
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "àààààà àààààààâ àààààààà"
+
+#. 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 mode unavailable"
+msgid "Offline unavailable"
+msgstr "àààâààààâ àààààààà"
+
+#: ../libedataserver/e-client.c:158
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "àà-ààà ààààà"
+
+#: ../libedataserver/e-source-authenticator.c:166
+#| msgid "Authentication required"
+msgid "Address book authentication request"
+msgstr "àààààààààààààààààààà ààààààààà àààààààààààâ àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:171
+#| msgid "Authentication required"
+msgid "Calendar authentication request"
+msgstr "àààààààààààà ààààààààà àààààààààààâ àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:175
+#| msgid "Authentication required"
+msgid "Mail authentication request"
+msgstr "ààààààààààà ààààààààà àààààààààààâ àààààà"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+#| msgid "Authentication required"
+msgid "Authentication request"
+msgstr "ààààààààà àààààààààààâ àààààà"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for address book \"%s\"."
+msgstr "àààààààààààà \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "àààààààâ \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ààààààâ ààààààààà \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ààààààâ ààààààâààààààâàààà \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "àààààà àààààà \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for task list \"%s\"."
+msgstr "àààà àààààà \"%s\"-ààààà ààààààààààà àààààà àààâààà."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+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:938
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "àààààà àààààà '%s'àààààà ààààààààààâ ààààààààà"
+
+#: ../libedataserver/e-source.c:1020
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "àààààà àààààà '%s' ààààààààààà"
+
+#: ../libedataserver/e-source.c:1408
+#| msgid "Unnamed List"
+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:1644 ../libedataserver/e-time-utils.c:1911
+#. * 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:1649 ../libedataserver/e-time-utils.c:1902
+#. * 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:1654 ../libedataserver/e-time-utils.c:1907
+#. * 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:1659 ../libedataserver/e-time-utils.c:1898
+#. * 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:1664
+#. * 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:1669
+#. * 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:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../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:1680
+#: ../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:1684
+#: ../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:1689
+#. * 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:1694
+#. * 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:1699
+#. * 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:1704
+#. * 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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../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:1843 ../libedataserver/e-time-utils.c:1953
+#. * 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:1847 ../libedataserver/e-time-utils.c:1945
+#. * 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:1850
-#| msgid "%H:%M"
+#. 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:1854
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "àààààààààà LDAP àààâààààààààà ààààààààààààààà"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#| msgid "Bad authentication response from server."
+msgid "Whether authentication is required to access proxy server."
+msgstr "àààààààà àààâàààààààààà àààààààààààààààààààààà ààààààààà àààààààààààà àààààà."
 
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "ààààààààà àààààà ààààààààâ ààààààààààààà.\n"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#| msgid "Unknown authentication state."
+msgid "Proxy authentication user name"
+msgstr "àààààààààààà ààààààààà àààààààààààààààààààà àààààààààààààà ààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "'%s' àààààà àààààààâ ààààâààààààààààâ ààààà. àààààà ààààààà àààà ààààààààààà"
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#| msgid ""
+#| "Unable to authenticate to IMAP server.\n"
+#| "%s\n"
+#| "\n"
+msgid "User name to use to authenticate against proxy server."
+msgstr "àààààààà àààâàààààààààà ààààààààà àààààààààààààààààààà àààààààààààààà ààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#| msgid "Temporary authentication failure"
+msgid "Proxy authentication password"
+msgstr "àààààààààààà ààààààààà àààààààààààààààààààà ààààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#| msgid "Cannot authenticate to server: %s"
+msgid "Password to use to authenticate against proxy server."
+msgstr "àààààààà àààâààààààààà ààààààààà àààààà àààààààààààààà ààààààààààà."
+
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "Currently _used categories:"
+msgstr "àààààààâ _ààààààààààààààà ààààààààààâ:"
+
+#: ../libedataserverui/e-categories-editor.c:239
+msgid "_Available Categories:"
+msgstr "ààààààà ààààààààààâ: (_A) "
+
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "àààààà "
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "\"%s\" àààààààààààà àààààà"
+
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ààààààààààààà ààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "ààààààààààààà àààààààààâ"
+#: ../libedataserverui/e-category-editor.c:141
+msgid "_No Image"
+msgstr "àààààà _àààààààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "ààààààààààààà ààààààààà (_I)"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "ààààààààààààà àààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "à àààààààààààâààààààà ààààààààààâ: (_c)"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "ààààààà ààààààààààâ: (_A) "
-
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "àààààààààààà (_E)"
+#: ../libedataserverui/e-category-editor.c:186
+msgid "Category _Icon"
+msgstr "ààààààààààààà ààààààààà (_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "ààààààààààâ "
+#: ../libedataserverui/e-category-editor.c:226
+msgid "Category Properties"
+msgstr "ààààààààààààà àààààààààâ"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
-#| msgid "Category List"
-msgid "Create category \"%s\""
-msgstr "\"%s\" àààààààààààà àààààà"
-
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ààààààààààà ààààà"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ààààâàààâ ààààààààààààà àààà"
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "'%s' àààààà àààààààâ ààààâààààààààààâ ààààà. àààààà ààààààà àààà ààààààààààà"
 
 #: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "ààààâààààààààààâ àààààààààààààà"
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "ààààààààààâ àààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "ààààâààààà (_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:300
+msgid "Address B_ook:"
+msgstr "_ààààâààààààààààâ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "àààààà ààààààà (_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+#| msgid "Cate_gory:"
+msgid "Cat_egory:"
+msgstr "_àààààà:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-#| msgid "Category"
+#: ../libedataserverui/e-name-selector-dialog.c:332
+msgid "_Search:"
+msgstr "àààààà: (_S) "
+
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1182
 msgid "Any Category"
 msgstr "àààààààààà àààààà "
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-name-selector-dialog.c:359
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "àààà_ààààààâ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-#| msgid "<b>_Contacts</b>"
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_ààààààààààâ</b> "
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>ààààààààààâ ààààààààà</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-#| msgid "Address _Book:"
-msgid "Address B_ook:"
-msgstr "_ààààâààààààààààâ:"
+#: ../libedataserverui/e-name-selector-dialog.c:421
+msgid "Search"
+msgstr "àààààà "
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "ààààâààààààààààâ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-#| msgid "C_ategory:"
-msgid "Cate_gory:"
-msgstr "_ààààààààààâ:"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.c:427
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "ààààààààààâ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "àààààà "
+#: ../libedataserverui/e-name-selector-dialog.c:545
+msgid "Select Contacts from Address Book"
+msgstr "ààààâààààààààààâ àààààààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "àààààà: (_S) "
+#: ../libedataserverui/e-name-selector-dialog.c:917
+msgid "_Add"
+msgstr "ààààâààààà (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:921
+msgid "_Remove"
+msgstr "àààààà ààààààà (_R)"
+
+#: ../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:2456
+#: ../libedataserverui/e-name-selector-entry.c:3043
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s àààââààààâ àààààààààààààà (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:3059
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s _ààààâààààà"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:3070
 #, c-format
-#| msgid "_Edit %s"
 msgid "C_ut %s"
 msgstr "%s _ààààààààà"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:3088
 #, c-format
 msgid "_Edit %s"
 msgstr "%s-ààâ àààààà àààààààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àààààààà ààààà (_D)"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "àààààà àà ààààààààààààààâ ààààààààà: àààààààààà àààààààààààâ àààààààà ààààà àààààààà"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock àà àààâ àààà."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "à àààààà àààààààà àààâààààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../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:1222
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "ààààâààààâàà àààâààààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../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:100
+#: ../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:156
-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 "Unexpected response from IMAP server: %s"
+msgid "Code: %u - Unexpected response from server"
+msgstr "àààà: %u - àààâàààààâ ààààààà àààààààààààààà àààààà"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+#| msgid "Failed to retrieve message"
+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 "àààààààààààààâ àààààààà ààààààààààààààààààààààâ àààààà"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
 #, c-format
-msgid "Enter password for %s"
-msgstr "%s-àààà ààààâààààâàà àààâààà"
+msgid "Failed to find Response element"
+msgstr "ààààààààâàà àààààààà ààààààààààààààààààààààâ àààààà"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "ààààâààààâàà àààâààà "
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "àààààààà àààààààà ààààààààààààààààààààààâ àààààà"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "ààààààààâ "
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "ààààààààààààààààààà ààààààààâ"
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "àààààààâ "
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-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 "ààààà àààààààà àààààà ààààààà àààà ààààààâààààààààààààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-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 "ààààààààà ààà ààààààààààààààà àààààà àààààààààààà ààà ààààààààààààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "àààààààà"
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "àààààààààâ àààààà àààààààâ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "ààààààààà ààààààààà àààààààà"
+#. Translators: The name that is displayed in the user interface
+#: ../tests/libedataserverui/evolution-source-viewer.c:650
+#| msgid "Family Name"
+msgid "Display Name"
+msgstr "ààààààâàà àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "ààààààà àààààààààààààààààààà àààààààà"
+#: ../tests/libedataserverui/evolution-source-viewer.c:659
+msgid "Flags"
+msgstr "àààààààààâ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "ààààààâ"
+#: ../tests/libedataserverui/evolution-source-viewer.c:711
+msgid "Identity"
+msgstr "àààààààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "àààààààààà"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "àààààààààààà cache àààààààààààà (%d)..."
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "ààààààà "
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" àààààà \"%s\" àààààààààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "àààà ààààà"
+#~ msgid "book busy"
+#~ msgstr "ààààààà àààààààààààâ"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "à ààààààâ ààààààà ààààâàààâ ààààààààààà"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "\"%s\" ààààâ ààààààààà CORBA ààààààààààâ"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "ààààààààààààààà ààààâàààààâàà ààààààààààà àààààààà"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: àààààààâ ààà ààààààààààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O ààààà"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\"-àà àààà \"%s\" àààààààààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "ààààâàààâ ààààâààààààààààààààà ààààààààààààà ààààà àààààààà"
+#~ msgid "%s: canceled"
+#~ msgstr "%s: àààààààààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "ààààâàààâ àààààààà"
+#~ msgid "%s: Invalid source."
+#~ msgstr "%s: àààààààà àààààà."
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "ààààààààààààààà ààààâàààâ àààààààà"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: URI `%s'-àà ààà ààààààààààà àààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "à ààààààààààâ àààààààâ ààààààààààààààààâ ààààààààà"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: EBookListener àààààààààààààâ ààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "àààààààà ààààààààààààààààààààààààà"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: gconf-ààâ àààààààààààààààààààà UID-ààààâ àààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "ààààààààààààààà ààààààààààà à ààààààààààâ ààààààààààààààààààààààààà"
+#~ msgid "%s: there was no source for uid `%s' stored in gconf."
+#~ msgstr "%s: gconf-ààâ àààààààààààààààààààà uid `%s' àààààà àààààààà."
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "ààààààààààààààà ààààâàààààâ ààààààààààâ ààààààààààà àààààà àààààààààà ààààààààà"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "ààààâààààààâ ààààààààààààààààà àààààà àààààààààààààâ àààààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "ààààâàààààâàà ààààâàààààààà ààààâàà àààààààààààààâ ààààààààà"
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "cache-àààà àààààà ààààâààààààààààààâ àààààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "à ààààààâ ààà ààààâàààâ àààààààààààààâ ààààààààà"
+#~ msgid "Reply Requested: by "
+#~ msgstr "àààààà àààààààààààààà: ààà"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "ààà-ààààâ ààààààâ à àààààààà ààààààààààâ ààààààààà"
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "àààààà àààààààààààààà: àààààààààààààààâ"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "%s-ààâàà ààààâààààààâ"
+#~ msgid "Loading %s items"
+#~ msgstr "%s ààààààààààâ àààà àààààààààà"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "àààààààààààà ààààâààààààâ"
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s-àààà ààààâààààâàà àààâààà (ààààààààààààà àààâ - %s)"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "àààààààà ààààààà ààààâààààààà"
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr ""
+#~ "%s àààà ààààààààààààà ààààààààààà àààààààà ààààààààààààààààààà %s-àààà ààààâààààâàà àààâààà"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "ààààà ààààààà ààààâààààààà"
+#~ msgid "Cannot open message"
+#~ msgstr "ààààààà àààààààààààâ àààààààààààààààà"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "àààààààâ àààààààààààà àààààààà"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "àààààààààààààààà àààààààà: àààààààààààààâ àààààà àààààààà: %s-àààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "àààààà ààààààààààààààà ààààààààààâ"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "àààààààààààààààà àààààààà: ààààààà àààààààààà àààààà: %s-àààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ààààâàààâ"
+#~| msgid "Unsupported operation: search by expression: for %s"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "àààààààààààààààà àààààààà: ààààààà àààààààààà ààààà: %s-àààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "àààààààààààâ"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "ààààààààààààààààààààà àààààààà: UID àààààààààà àààààà: %s-àààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "ààà àààààààààâ"
+#~ msgid "Learning junk"
+#~ msgstr "ààààààààààààààà ààààààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "ààààà ààààààààààâ"
+#~ msgid "Learning non-junk"
+#~ msgstr "Learning non-junk"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "àààààààâ "
+#~ msgid "Canceled."
+#~ msgstr "ààààààààààààààààààààà."
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "ààààààà àààààààâ"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "ààà ààààààààààààâàà àààààààààààààâ ààààà àààà ààààààà."
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "àààâàààààâ ààààààà ààààààà àààààà"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "àààààààààààààà ààààà àààààààààààààààâ ààààààààà: ààààâààààààà ààààâ àààààààààààààààààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "àààâàààààâ ààààààà àààààà àààà"
+#~ msgid "Unable to parse message content"
+#~ msgstr "ààààààààààààâàà àààààààà àààààà ààààààààààâ àààààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "ààààààà ààààààààààâ"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution-àààààà ààààâàààààààààààà ààààààâàà ààààààààâàà"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr ""
+#~ "à ààààà ààààààà àààâààààààààà Kerberos 4 àààààààààà ààààààààà ààààààààààààààâ "
+#~ "ààààààààààààà."
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution àààààààà webcal ààààààààâààà"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kerberos ààààààààà àààààààà:\n"
+#~ "%s"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution àààààà àààâàààâ àààâàààâàààààà àààààààà àààâàààà"
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "SMTP auth-àà àààààààà POP ààà non-pop àààààà àààààààààààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution àààààà àààâàààâ àààààààà àààâàààà"
+#~ msgid "URL '%s' needs a username component"
+#~ msgstr "URL '%s'-àà ààà ààààààààààààà ààààààâàà àààà ààààààààààà"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr ""
-"ààààà ààààààààâàààààâ ààààààààâ ààààààààààààààààààà; àààààààâàà àààààà "
-"ààààààâààààààààààâ ààààààààà\n"
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s'-àà ààà àààààààà àààà ààààààààààà"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s'-àà ààà àààà àààà ààààààààààà"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s àààààààà àààààààààààààâ ààààààààà:\n"
+#~ "%s"
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "ààààààâàààà àà: àààààààààààààààà"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "àààààààààâàààà àà: àààààààààààààààà"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ààààâàààâ ààààààààààà: ààààààà àààààààà"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "ààààâàààâ àààààààààààààâ ààààààààà: ààààààà àààààààà"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "àààâààààààààààààààààâ ààààààààâ àààààààààààà"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "àààâàààààààààààààà ààààààààà"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "àààâààààààààààààààààâàà ààààààà ààààààààààààààààà"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL àààààààà àààààààààà"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL-ààâàà ààààààà ààààààààààààààààà"
+
+#~ msgid "Error in CRL"
+#~ msgstr "CRL-ààâ ààààà"
+
+#~ msgid "Out of memory"
+#~ msgstr "ààààààà àààààààà"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "ààààààààâ ààààà àààààààà àààâàààààààààààààà"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "àààâàààààààààààààà ààààààâ àààà ààààà"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "àààâàààààààààààààà àààààà àààààà"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "àààààààà àààâàààààààààààààà ààààààààà (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "ààààààâàà àààà ààààà ààààààà"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "àààâàààààààààààààà ààààààààààà"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "àààâàààààààààààààà àààààààààààààààààààà"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Subject/Issuer ààààààààààààà"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ààààààààààààà"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/Issuer àààààààâ ààààààààààààà"
+
+#~ msgid "Error in application verification"
+#~ msgstr "ààààààààààààâ àààààà ààààààààààààààâ ààààà"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "%s-ààâ ààààààà ààààààà àààâàààààààààààààà:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "àààààààâàààà ààààààààààààà?"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "%s-àààà SSL àààâàààààààààààààà ààààààà :\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "àààààààâàààà ààààààààààààà?"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "ààààààà àààààààà: %s\n"
+#~ "  %s"
+
+#~ msgid "User canceled"
+#~ msgstr "àààààààààààà ààààààààààààààààààààà"
+
+#~ msgid "Could not get message"
+#~ msgstr "ààààààà ààààààààààà"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ààààààààààà ààààààà, àààààà ààààààààààà."
+
+#~| msgid "Cannot append message to folder `%s': %s"
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "âààààâàààâ`%s'-àààààà ààààààà ààààààààààâ ààààààààà: %s"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr "ààà ààààâ àààààààààâ ààààààààààààâ àààààà àààààààààààâ ààààààààà: cache àààààààà"
+
+#~ msgid "Cannot append message in offline mode: %s"
+#~ msgstr "ààà ààààâ àààààààààâ ààààààààààààâ àààààà àààààààààààâ ààààààààà:               %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "ààààà àààààààààà ààààààààààààààà"
+
+#~| msgid "Check new messages for Junk contents"
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "_àààààààààààààà àààààààààâàààààà ààààà àààààààààààààâ àààààà"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP ààààààààà"
+
+#~| msgid "Post Office Agent SOAP Port:"
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "àààààààà ààààà àààààà SOAP _ààààâàààà:"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell àààààààà àààà àààâàààààààààààà àààààààààààààààààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ààà ààààààààâàààààààààà ààààâààààâàà àààààààààà àààààààà àààààààààààà àààâààààààààà àààààà ààààààààààâ à "
+#~ "ààààà ààààààààààààà."
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "url-ààâ àààààààà àààààààààààâ àààààààààà àààààààà"
+
+#~ msgid "You did not enter a password."
+#~ msgstr "àààààààâ ààààâààààâàà àààâààààààààààà."
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr "ààààààààà ààààààààà àààâàààààâàà ààààâàààààâ ààà àààààààààâ ààààààâààààààààààààààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààâààààâ ààààààâ àààààààà àààààààààààà ààààâààààààâ àààààààààààààâ ààààààààà."
+
+#~| msgid "Cannot rename Groupwise folder `%s' to `%s'"
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "àààààààà àààààààààààà ààààâàààâ `%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "àààààààà àààààààààààà àààâàààâ %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s-ààâ %s-àà àààààààà àààààààààààà àààâàààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s ààà àààààààà àààààààààà ààààààâ àààààààààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "ààààààà àààààààààààà"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "àààààààâàààà àààààààà àààààâàà àààààààààà àààâààààààààà àààààà ààààààà (_U)"
+
+#~ msgid "Command:"
+#~ msgstr "ààààâàààààà:"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula àààâààààààààâ àààààààààààààààààà"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "ààà ààààààààâ àààààààààà ààààâààààâàà àààààààààà à ààààà Hula àààâààààààààà àààààà àààààààààà."
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr ""
+#~ "à àààâààààààà ààà ààààààààààà ààààâààààààà ààààà àààààààààààâàààà ààààâààààààààâ àààààààààààà "
+#~ "(_A)"
+
+#~| msgid "Check new messages for Junk contents"
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "_àààààààààààààà àààààààààâàààààà ààààà àààààààààààààâ àààààà"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL àààààààà"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL àààààààààâ ààààààààààààà"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "à ààààâààààâ SSL àààààààà"
+
+#~ msgid "Drafts"
+#~ msgstr "ààààâàààààààààààà"
+
+#~| msgid "Sleet"
+#~ msgid "Sent"
+#~ msgstr "àààààà"
+
+#~ msgid "Templates"
+#~ msgstr "ààààààààâ"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "IMAP àààâàààâ %s-àààààà ààààâàààààà àààààààààààààààâ àààààà: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP àààâàààâ %s-ààâ ààààààà àààààààààààààà àààààà: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "IMAP àààâàààâ %s-ààâ ààààààà àààààààààààààà àààààààààà."
+
+#~| msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "ààààâàààâ `%s' àààààààààààààààààâ àààààààààààà: àààààâ àààààààààà àààà ààààààààà"
+
+#~| msgid "Cannot select folder `%s': Bad command"
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s' àààààààààààààààààâ àààààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Failed sending command to IMAP server %s: %s"
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "IMAP àààâàààâ %s-àààààà ààààâàààààà àààààààààààààààâ àààààà: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 àààâàààâ %s-ààâàà àààààààâ ààààààààààààààà ààààâàààààààà: %s"
+
+#~| msgid "Cannot access folder `%s': %s"
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "ààààâàààâ `%s'-àààààà àààààààà àààààààà: %s"
+
+#~| msgid "Cannot sync flags to folder `%s': Unknown"
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "ààààâàààâ `%s'-àààààà àààààààààâ ààààâàà ààààààààààâ ààààààààà: àààààààà"
+
+#~| msgid "Cannot sync flags to folder `%s': Bad command"
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s'-àààààà àààààààààâ ààààâàà ààààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot expunge folder `%s': Unknown"
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "ààààâàààâ `%s' ààààààààààààâ ààààààààà: àààààààà"
+
+#~| msgid "Cannot expunge folder `%s': Bad command"
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s' ààààààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot get message %s from folder `%s': No such message"
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "ààààâàààâ `%s'-ààâ ààààààà %s ààààààà àààààààà: àààààà ààà ààààààà àààààààààà"
+
+#~| msgid "Cannot get message %s from folder `%s': Bad command"
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s'-ààâ ààààààà %s ààààààà àààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot append message to folder `%s': Folder is read-only"
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààâàààâ ààààààààààààâ àààààà àààààààààà"
+
+#~| msgid "Cannot append message to folder `%s': Unknown error"
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: àààààààààà ààààà"
+
+#~| msgid "Cannot append message to folder `%s': Bad command"
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: àààààààà"
+
+#~| msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààâààààààààâ ààààààààà: àààààààà"
+
+#~| msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "`%s'-ààâ ààààààà `%s'-àààààà àààààààààààâ ààààâààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "ààà ààààààààààà ààààâàààààâ àààààààààààààà àààààààààâàààààà àààààà (_g)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "IMAPv4rev1 àààâààààààààâ àààààààààâ àààààààààààààààà àààààààààààààààààà."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "IMAPv4rev1 àààâààààààààà ààà ààààààààâ àààààààààà ààààâààààâàà àààààààààà àààààà ààààààààààâ "
+#~ "àààààààààààà ààà ààààà ààààà."
+
+#~| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "àààààààà ààààààâ IMAP àààâàààâ %s-àààààà àààààà ààààààààààâ àààààààààààà: àààâàààâ STARTTLS "
+#~ "àààààààààààààààààààà"
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS àààààààààâ ààààààààààààà"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "%s àààààààà àààààààààà IMAP àààâàààâ %s-àààààà ààààààààà ààààààààààààààâ ààààààààà"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "%s àààààààààà IMAP àààâàààâ %s-àààààà ààààààààà ààààààààààààààâ ààààààààà"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "àààâààààâ ààààààâ IMAP ààààâààààààâ àààààààààààààâ ààààààààà."
+
+#~| msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "IMAP àààâàààààâ %s-ààâ ààààâàààâ `%s' ààààààààààà : àààààààààà ààààà"
+
+#~| msgid "Cannot get LIST information for `%s' on IMAP server %s: %s"
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "IMAP àààâàààâ %s-àààà `%s'-àààà LIST àààààààààâ àààààààà: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "ààààààà àààààâàà"
+
+#~| msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "ààààâàààâ àààààààààààààâ ààààààààà `%s': àààààâ àààààààààà àààà àààààààà"
+
+#~| msgid "Cannot create folder `%s': Bad command"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "ààààâàààâ àààààààààààààâ ààààààààà `%s': ààààààà àààààâàà"
+
+#~| msgid "Cannot delete folder `%s': Special folder"
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': àààààààà ààààâàààâ"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "ààà ààààâ ààà IMAP ààààâààààààâ àààààà ààààààààààâ ààààààààà."
+
+#~| msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': àààààâ àààààààààà àààà àààààààà"
+
+#~| msgid "Cannot delete folder `%s': Bad command"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "ààààâàààâ àààààà ààààààààààâ ààààààààà `%s': ààààààà àààààâàà"
+
+#~| msgid "Cannot rename folder `%s' to `%s': Special folder"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: àààààààà ààààâàààâ"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "àààâààààâ ààààààâ IMAP ààààâàààààààà àààà ààààààààààâ ààààààààà."
+
+#~| msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
+
+#~| msgid "Cannot rename folder `%s' to `%s': Bad command"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "`%s'-àà `%s' ààà àààà ààààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~| msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "IMAP àààâàààâ %s-ààâ `%s' àààààààààààààà %s ààààà àààààààà: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "àààâààààâ ààààààâ IMAP ààààâààààààààâ ààààààà ààààààààâ ààààààààà."
+
+#~| msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
+
+#~| msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "ààààâàààâ `%s'-ààâ ààààààà ààààààààâ ààààààààà: ààààààà àààààâàà"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "àààâààààâ ààààààâ IMAP ààààâààààààààâ ààààààà ààààààà àààààààààààààààâ ààààààààà."
+
+#~| msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "ààààâàààâ `%s'-ààâ ààààààà ààààààà àààààààààààààààâ ààààààààà: àààààâ àààààààààà àààà ààààààààà"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "àààààà àààààààààààààààààà àààààààààààâàààààà ààààààààààààààà"
+
+#~| msgid "Fetching envelopes for new messages"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "ààààà àààààààààààâàààààà àààààààâ àààààààààààààà"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "IMAP àààâàààâ %s-ààâ àààààààà ààààààààààâ àààààààààààààà àààààààâ: "
+
+#~ msgid "No data"
+#~ msgstr "àààààà àààààààà"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP àààâàààààâàà %s ààààààààààààààà àààààààâ ààààâàààààààààààààààààà: %s"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "ààààààààààààààà IMAP 4(.1) ààààààâàà\n"
+#~ "ààà ààààààààààààààààà ààààààààààààààààààààà àààà ààà, àààà àààààà imap "
+#~ "ààààààààààààààààà.\n"
+#~ "\n"
+#~ " !!! ààà ààààààààààâ ààààààààààà ààààààààààààààâ ààààààà  !!!\n"
+
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "%s (ààààâàààà %s) -àààààà àààààà ààààààààààâ ààààààààà: %s"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "%s-ààâ ààà POP àààâààààààààà àààààà ààààààààààâ àààààààààààà"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir-ààâ ààààààà ààààààà ààààààààààààààààààààà"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "àààààààà ààààààà"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "ààààààààâ àààààà àààààààààààààààààààà àààààààààààààààà"
+
+#~ msgid "Message construction failed."
+#~ msgstr "àààààà ààààààààààààààààààààààâ àààààà."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH àààààà àààààààà ààààààà ààààààààààààààààààààà"
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr ""
+#~ "ààààààààà àààààà àààààààààààâ ààààààààààààààààààààààà, ààààà ààààààààààààà àààâ ààààààà "
+#~ "ààààààààààààààààààààà"
+
+#~ msgid "Use cancel"
+#~ 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 ""
+#~ "POP àààâàààâ %s-àààààà àààààà ààààààààààâ ààààààààà: àààààààààààààààààààààà ààààààààà "
+#~ "ààààààààààààààààààà ààààààààààààààà ààààààà àààààààà."
+
+#~| msgid "SASL `%s' Login failed for POP server %s: %s"
+#~ msgid "SASL '%s' Login failed for POP server %s: %s"
+#~ msgstr "POP àààâàààâ %s-àààààààà SASL `%s' ààààààâ ààààààààààààà : %s"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS àààààâàà ààààààààààààà"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP àààâààààààààà ààààààààà àààààà ààààààààâ àààààààààààà.\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO àààààâàà ààààààààààààà"
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP-ààààâ ààààààààà àààààà ààààààààâ"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL-àààààààà ààààààààà àààààààààààààààà àààààààà ààààààààààààààààâ ààààà."
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH àààààâàà ààààààààààààà"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ààààààà àààâàààààâ ààààààà ààààààà ààààààààà àààààà ààààààààâ.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA àààààâàà ààààààààààààà: %s: ààààààâ ààààààààààààà"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET àààààâàà ààààààààààààà"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT àààààâàà ààààààààààààà"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "àààààààààà LDAP àààâààààààààà ààààààààààààààà"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "à àààààààààààâààààààà ààààààààààâ: (_c)"
+
+#~ msgid "_Edit"
+#~ msgstr "àààààààààààà (_E)"
+
+#~ msgid "categories"
+#~ msgstr "ààààààààààâ "
+
+#~ msgid "Color Info"
+#~ msgstr "ààààààààààà ààààà"
+
+#~ msgid "The color to render"
+#~ msgstr "ààààâàààâ ààààààààààààà àààà"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~| msgid "<b>_Contacts</b>"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>_ààààààààààâ</b> "
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>ààààààààààâ ààààààààà</b>"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s-àààà ààààâààààâàà àààâààà"
+
+#~ msgid "Enter password"
+#~ msgstr "ààààâààààâàà àààâààà "
+
+#~ msgid "Owner"
+#~ msgstr "ààààààààâ "
+
+#~ msgid "Publishing Editor"
+#~ msgstr "ààààààààààààààààààà ààààààààâ"
+
+#~ msgid "Editor"
+#~ msgstr "ààààààààâ "
+
+#~ msgid "Publishing Author"
+#~ msgstr "ààààààààààààààààààà àààààààà"
+
+#~ msgid "Author"
+#~ msgstr "àààààààà"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "ààààààààà ààààààààà àààààààà"
+
+#~ msgid "Reviewer"
+#~ msgstr "ààààààà àààààààààààààààààààà àààààààà"
+
+#~ msgid "Contributor"
+#~ msgstr "ààààààâ"
+
+#~ msgid "None"
+#~ msgstr "àààààààààà"
+
+#~ msgid "Custom"
+#~ msgstr "ààààààà "
+
+#~ msgid "Generic error"
+#~ msgstr "àààà ààààà"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "à ààààààâ ààààààà ààààâàààâ ààààààààààà"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "ààààààààààààààà ààààâàààààâàà ààààààààààà àààààààà"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "ààààâàààâ ààààâààààààààààààààà ààààààààààààà ààààà àààààààà"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "ààààâàààâ àààààààà"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "ààààààààààààààà ààààâàààâ àààààààà"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "à ààààààààààâ àààààààâ ààààààààààààààààâ ààààààààà"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "ààààààààààààààà ààààààààààà à ààààààààààâ ààààààààààààààààààààààààà"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "ààààààààààààààà ààààâàààààâ ààààààààààâ ààààààààààà àààààà àààààààààà ààààààààà"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "ààààâàààààâàà ààààâàààààààà ààààâàà àààààààààààààâ ààààààààà"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "à ààààààâ ààà ààààâàààâ àààààààààààààâ ààààààààà"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "ààà-ààààâ ààààààâ à àààààààà ààààààààààâ ààààààààà"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s-ààâàà ààààâààààààâ"
+
+#~ msgid "Personal Folders"
+#~ msgstr "àààààààààààà ààààâààààààâ"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "àààààààà ààààààà ààààâààààààà"
+
+#~ msgid "All Public Folders"
+#~ msgstr "ààààà ààààààà ààààâààààààà"
+
+#~ msgid "Global Address List"
+#~ msgstr "àààààààâ àààààààààààà àààààààà"
+
+#~ msgid "Deleted Items"
+#~ msgstr "àààààà ààààààààààààààà ààààààààààâ"
+
+#~ msgid "Journal"
+#~ msgstr "ààààâàààâ"
+
+#~ msgid "Notes"
+#~ msgstr "àààààààààààâ"
+
+#~ msgid "Outbox"
+#~ msgstr "ààà àààààààààâ"
+
+#~ msgid "Sent Items"
+#~ msgstr "ààààà ààààààààààâ"
+
+#~ msgid "Invalid connection"
+#~ msgstr "ààààààà àààààààâ"
+
+#~ msgid "Bad parameter"
+#~ msgstr "ààààààà ààààààààààâ"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Evolution-àààààà ààààâàààààààààààà ààààààâàà ààààààààâàà"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Evolution àààààààà webcal ààààààààâààà"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Evolution àààààà àààâàààâ àààâàààâàààààà àààààààà àààâàààà"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Evolution àààààà àààâàààâ àààààààà àààâàààà"
 
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "ààààà ààààààààâàààààâ ààààààààâ ààààààààààààààààààà; àààààààâàà àààààà ààààààâààààààààààâ "
+#~ "ààààààààà\n"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "à àààààààààààààâ"
+#~ msgid "On This Computer"
+#~ msgstr "à àààààààààààààâ"



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