[evolution-data-server] Updated Marathi Translations



commit 1bfd28bbc30d64d62ac8e9955ed35ac30641a830
Author: Sandeep Sheshrao Shedmake <sshedmak redhat com>
Date:   Mon Mar 26 16:12:26 2012 +0530

    Updated Marathi Translations

 po/mr.po | 7201 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 4189 insertions(+), 3012 deletions(-)
---
diff --git a/po/mr.po b/po/mr.po
index 87b878c..c6652f4 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,1303 +4,1819 @@
 #
 # Rahul Bhalerao <b rahul pm gmail com>, 2006.
 # Sandeep Shedmake <sandeep shedmake gmail com>, 2008, 2009.
-# Sandeep Shedmake <sshedmak redhat com>, 2009.
+# Sandeep Shedmake <sshedmak redhat com>, 2009, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-08-11 14:04+0000\n"
-"PO-Revision-Date: 2009-08-12 14:43+0530\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-02-23 12:45+0000\n"
+"PO-Revision-Date: 2012-03-26 16:06+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <fedora-trans-mr redhat com>\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"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Language: mr\n"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:129
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
+#: ../calendar/backends/http/e-cal-backend-http.c:424
+#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:164
+msgid "Unknown error"
+msgstr "ààààààà àààààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, 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:177
+#, 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:472
+#, 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:2329
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/file/e-book-backend-file.c:1129
+msgid "No UID in the contact"
+msgstr "àààààààà UID ààààà àààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1563
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
 msgid "Loading..."
 msgstr "àààà àààà ààà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/file/e-book-backend-file.c:1566
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
 msgid "Searching..."
 msgstr "àààà ààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/file/e-book-backend-file.c:2108
 #, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "àààààà ààààààà ààà ààà (%d)... "
+msgid "Failed to build summary for an address book %s"
+msgstr "ààààà àààààààà %s ààààà àààààà ààààà ààààààà ààààà"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "àààààà ààà àààààà ààà ààà (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:874
+msgid "Querying for updated contactsâ"
+msgstr "ààààààà ààààààààààààà àààààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:923
+#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
+#: ../libedataserver/e-client.c:1918
+msgid "Personal"
+msgstr "ààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:925
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "ààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/google/e-book-backend-google.c:927
+#| msgid "Family Name"
+msgid "Family"
+msgstr "àààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:929
+msgid "Coworkers"
+msgstr "àààààààààààà"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
+msgid "Querying for updated groupsâ"
+msgstr "ààààààà ààààààààà àààààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
+#: ../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:1451
+msgid "Creating new contactâ"
+msgstr "àààà àààààààààà ààààààà ààà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
+#: ../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:1568
+msgid "Deleting contactâ"
+msgstr "àààààà ààààà àààà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#| msgid "Key usage does not support certificate signing"
+msgid "The backend does not support bulk modifications"
+msgstr "àààààà ààààà ààààààààààà àààààà ààààà àààà"
+
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1851
+msgid "Modifying contactâ"
+msgstr "àààààà ààààààà ààà àààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#| msgid "Loading..."
+msgid "Loadingâ"
+msgstr "ààà ààà ààà..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ"
+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:177
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "ààààà àààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
 msgid "Using Distinguished Name (DN)"
 msgstr "àààààà ààà ààààà ààà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
 msgid "Using Email Address"
 msgstr "àààà ààààà ààààà ààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP àààààà àààààà àààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "àààà DN àààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "àààààà LDAP ààààààà ààà ààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1869
 msgid "Removing contact from LDAP server..."
 msgstr "àààààà LDAP ààààààààà àààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2318
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ààààààààà àààààà ààààààààà ààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ààà àààààà ààààà ààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
 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:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" àà \"%s\" àààà ààà ààà"
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "àààààà àààààà"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA ààààà \"%s\" ààà ààààààà"
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: ààààààà àààà àààààà àààà"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: àààà àààà ààà àààà"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" àà \"%s\" àààà ààà ààààà"
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: àààà àààà"
-
-#: ../addressbook/libebook/e-book.c:3310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: àààà ààààààà."
+msgid "Downloading contacts (%d)... "
+msgstr "àààààà ààààààà ààà ààà (%d)... "
 
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI `%s' ààààà ààààààà àààààà àààà"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ààààà '%s' àà ààààààà ààààà, HTTP àààààà: %d (%s) àà"
 
-#: ../addressbook/libebook/e-book.c:3329
+#: ../addressbook/libebook/e-book.c:3198
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener ààààà ààà àààà"
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: GConf ààààà UID '%s' ààààà ààààà ààààà àààà."
 
-#: ../addressbook/libebook/e-book.c:3595
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: gconf ààààà ààà àààààà UID ààààà àààà"
+#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
+#: ../libedataserver/e-client.c:1913
+msgid "On This Computer"
+msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-book.c:3727
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: gconf ààà ààààààà uid `%s' àààà ààààààà ààààààà àààà àààà."
+#: ../addressbook/libebook/e-book.c:3640
+#: ../addressbook/libebook/e-book-client.c:702
+#: ../addressbook/libedata-book/e-data-book.c:322
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address book does not exist"
+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:315
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "àààààà ààààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "àààààà ID àààà àààààààààà ààà"
+
+#: ../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:332
+#| msgid "Namespace"
+msgid "No space"
+msgstr "ààààà ààààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:515
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "ààà àààààààà ààààààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:525
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../addressbook/libedata-book/e-data-book-factory.c:228
+#: ../calendar/libecal/e-cal-client.c:613
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "àààà ààààààà"
+
+#: ../addressbook/libebook/e-book-client.c:627
+#: ../calendar/libecal/e-cal-client.c:728
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "àààààà uri '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:665
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "ààààààà àààààà àààààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:774
+#: ../calendar/libecal/e-cal-client.c:881
+#, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "ààààà ààààààààà UID '%s' ààààà ààààà ààààà àààà."
+
+#: ../addressbook/libebook/e-book-client.c:2566
+#: ../calendar/libecal/e-cal-client.c:4483
+#| 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
+#: ../addressbook/libebook/e-contact.c:124
 msgid "File Under"
 msgstr "ààààààà àààà "
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Book URI"
 msgstr "àààààà URI"
 
 #. 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:132
 msgid "Full Name"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Given Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Family Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Nickname"
 msgstr "ààààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Email 1"
 msgstr "àààà 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Email 2"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 3"
 msgstr "àààà à"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 4"
 msgstr "àààà 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Mailer"
 msgstr "àààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Home Address Label"
 msgstr "àà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Work Address Label"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Other Address Label"
 msgstr "ààà ààààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Assistant Phone"
 msgstr "ààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Business Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Business Phone 2"
 msgstr "àààààà àààààààà à"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Fax"
 msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Callback Phone"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Car Phone"
 msgstr "ààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Company Phone"
 msgstr "ààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Home Phone"
 msgstr "àààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Home Phone 2"
 msgstr "àààà ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:161
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Other Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Other Fax"
 msgstr "ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Primary Phone"
 msgstr "àààààààà àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Radio"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:170
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Organization"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Organizational Unit"
 msgstr "àààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Office"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Manager"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Assistant"
 msgstr "ààààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Homepage URL"
 msgstr "àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:183
 msgid "Weblog URL"
 msgstr "ààààààà URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:186
+#: ../libedataserverui/e-categories-dialog.c:88
 msgid "Categories"
 msgstr "ààààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:189
 msgid "Calendar URI"
 msgstr "àààààààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:191
 msgid "ICS Calendar"
 msgstr "ICS àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:195
 msgid "Spouse's Name"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:196
 msgid "Note"
 msgstr "àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààà àààààà ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààà àààààà ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààà àààààà ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààà àààààà ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààà àààààà ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààà àààààà ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "Gadu-Gadu ààà Id 1"
+#: ../addressbook/libebook/e-contact.c:211
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
+msgstr "àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Gadu-Gadu ààà Id 2"
+#: ../addressbook/libebook/e-contact.c:212
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
+msgstr "àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Gadu-Gadu ààà Id 3"
+#: ../addressbook/libebook/e-contact.c:213
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
+msgstr "àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Gadu-Gadu ààààà Id 1"
+#: ../addressbook/libebook/e-contact.c:214
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
+msgstr "àààà àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Gadu-Gadu ààààà Id 2"
+#: ../addressbook/libebook/e-contact.c:215
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
+msgstr "àààà àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Gadu-Gadu ààààà Id 3"
+#: ../addressbook/libebook/e-contact.c:216
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
+msgstr "àààà àààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:228
 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:229
+#| 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:230
+#| 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:231
+#| 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:232
+#| 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:233
+#| 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:234
+#| 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:237
 msgid "Last Revision"
 msgstr "ààààà ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Name or Org"
 msgstr "ààà ààààà ààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Address List"
 msgstr "ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Home Address"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Work Address"
 msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:244
 msgid "Other Address"
 msgstr "ààà ààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Category List"
 msgstr "àààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Photo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Logo"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:253
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Email List"
 msgstr "àààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:257
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "àààà àààààà Id àààà"
+#: ../addressbook/libebook/e-contact.c:258
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
+msgstr "GroupWise ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Gadu-Gadu Id àààà"
+#: ../addressbook/libebook/e-contact.c:259
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
+msgstr "àààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:261
 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:262
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
+msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Wants HTML Mail"
 msgstr "HTML ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:266
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:267
 msgid "List Show Addresses"
 msgstr "ààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Birth Date"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:270
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
 msgid "Anniversary"
 msgstr "ààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:273
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:275
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "ààà-ààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:276
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "ààà-ààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:277
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "ààà-ààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:278
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "ààà-ààà àààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:279
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "ààà-ààà àààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:280
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "ààà-ààà àààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Id àààà"
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
+msgstr "ààà-ààà ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Geographic Information"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Telephone"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Home Name 1"
 msgstr "Skype Home Name 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Home Name 2"
 msgstr "Skype Home Name 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Home Name 3"
 msgstr "Skype Home Name 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Skype Work Name 1"
 msgstr "Skype Work Name 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Skype Work Name 2"
 msgstr "Skype Work Name 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Skype Work Name 3"
 msgstr "Skype Work Name 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Skype Name List"
 msgstr "Skype ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:296
 msgid "SIP address"
 msgstr "SIP ààààà"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk ààà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk ààà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:300
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk ààà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:301
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk àààà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:302
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk àààà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:303
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk àààà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:304
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Google Talk ààà àààà"
+
+#: ../addressbook/libebook/e-contact.c:1597
+#: ../addressbook/libebook/e-destination.c:878
 msgid "Unnamed List"
 msgstr "àààààà àààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
-msgid "Birthday"
-msgstr "ààààààà"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr "àààààààà ààààà, ààà àààààà àààà ààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-book-backend.c:91
 #, c-format
-msgid "Birthday: %s"
-msgstr "ààààààà: %s"
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "ààààààà ààààààààà ààààààà '%s'"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-book-backend.c:108
 #, c-format
-msgid "Anniversary: %s"
-msgstr "ààààààà: %s"
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "ààààààààà ààààààà '%s' àààà ààààà ààààà ààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "àààààààààà àààà ààààààà ààà àààà: àààààààà URI."
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../camel/camel-db.c:503
+#, c-format
+msgid "Insufficient memory"
+msgstr "ààààà àààààà"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
-msgid "Cannot save calendar data"
-msgstr "àààààààààà àààààà àààààà ààà àààà àààà"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format
+#| msgid "Object not found"
+msgid "Contact '%s' not found"
+msgstr "àààààà '%s' ààààà àààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-msgstr "àààààààààà ààààà àààà ààààà ààà"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
+#| msgid "Invalid query"
+msgid "Invalid query: "
+msgstr "àààà ààààà: "
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
-msgid "Could not create cache file"
-msgstr "ààà àààà àààà ààààà ààà"
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
+msgid "Success"
+msgstr "àà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
-msgid "Could not create thread for populating cache"
-msgstr "ààà àààààààààà ààààà àààà ààààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
-msgid "Reply Requested: by "
-msgstr "ààààà ààààààà: àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
-msgid "Reply Requested: When convenient"
-msgstr "ààààà ààààààà: àààààà àààààà àààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
-#, c-format
-msgid "Loading %s items"
-msgstr "%s ààà ààà ààà ààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "àààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
-msgid "Invalid server URI"
-msgstr "àààà ààààà URI"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "ààà àààà àààà"
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:123
+msgid "Backend is busy"
+msgstr "àààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
-msgid "Redirected to Invalid URI"
-msgstr "àààà URI ààààà àààààààààààà"
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "ààààààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
-msgid "Bad file format."
-msgstr "àààà àààà àààààà."
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:137
+msgid "Permission denied"
+msgstr "ààààààà ààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
-msgid "Not a calendar."
-msgstr "àààààààààà àààà."
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "ààà àààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
-msgid "Could not retrieve weather data"
-msgstr "àààààà àààà àààà àààààà ààà"
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ààà àààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Fog"
-msgstr "àààààà: àààà"
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
+msgid "Unsupported field"
+msgstr "àààààààà ààààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "àààààà: àààà"
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
+msgid "Unsupported authentication method"
+msgstr "àààààààààà àààààà ààààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Cloudy Night"
-msgstr "àààààà: àààà ààààà"
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
+msgid "TLS not available"
+msgstr "TLS àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../addressbook/libedata-book/e-data-book.c:323
+msgid "Book removed"
+msgstr "ààà ààààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "àààààà ààààààà àààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
+msgid "Search size limit exceeded"
+msgstr "ààà àààà ààààààà ààààà ààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
+msgid "Search time limit exceeded"
+msgstr "ààà ààà ààààààà ààààà ààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
+msgid "Invalid query"
+msgstr "àààà àààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
+msgid "Query refused"
+msgstr "àààààà ààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
+#| 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:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
+msgid "Invalid server version"
+msgstr "àààà ààààà ààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:121
+msgid "Invalid argument"
+msgstr "àààà àààà"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:143
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "ààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "àààààà àààààà ààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../calendar/libecal/e-cal-client.c:621
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:159
+#| msgid "I/O error"
+msgid "Other error"
+msgstr "ààà àààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
+#| 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:576
+#: ../addressbook/libedata-book/e-data-book.c:601
+msgid "Empty query: "
+msgstr "àààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
+#| msgid "Cannot add encryption certificate"
+msgid "Cannot add contact: "
+msgstr "àààààà àààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+msgid "Cannot modify contacts: "
+msgstr "àààààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:759
+#: ../calendar/libedata-cal/e-data-cal.c:866
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user: "
+msgstr "ààààààààààààà ààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:830
+#| 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:846
+msgid "Cannot remove book: "
+msgstr "àààààà ààààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:873
+msgid "Cannot refresh address book: "
+msgstr "ààààà àààààààà àààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:899
+msgid "Cannot get backend property: "
+msgstr "àààààà ààààààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
+msgid "Cannot set backend property: "
+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: "
+msgstr "àààààà àààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:995
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list uids: "
+msgstr "àààààà àààà uids ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1100
+#| msgid "Cannot create encoder context"
+msgid "Cannot remove contacts: "
+msgstr "àààààà ààààà ààààà ààààà: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#, c-format
+msgid "Empty URI"
+msgstr "àààààà URI"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "ààààààà àààààààààààà àààà (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "ààààààààà HTTP àààààà ààà %d àààààà (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ààààààà àààààààààààà àààà, àààààààààà àààà àààààà àààààààà ààààà ààà.\n"
+"àààààà ààààà: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
+msgid "Calendar doesn't support Free/Busy"
+msgstr "àààààààààà ààààà/àààààà ààààà àààààà ààààà àààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
+#: ../libedataserverui/e-client-utils.c:875
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààà àààààààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+"àààà: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for address book %s (user %s)"
+msgstr "ààààà àààààààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#, c-format
+msgid "Birthday: %s"
+msgstr "ààààààà: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
+#, c-format
+msgid "Anniversary: %s"
+msgstr "ààààààà: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "àààààààààà àààà ààààààà ààà àààà: àààààààà URI."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "àààààààààà àààààà àààààà ààà àààà àààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:405
+msgid "Redirected to Invalid URI"
+msgstr "àààà URI ààààà àààààààààààà"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:446
+msgid "Bad file format."
+msgstr "àààà àààà àààààà."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:454
+msgid "Not a calendar."
+msgstr "àààààààààà àààà."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:780
+#: ../calendar/backends/http/e-cal-backend-http.c:781
+#: ../calendar/backends/weather/e-cal-backend-weather.c:524
+msgid "Could not create cache file"
+msgstr "ààà àààà àààà ààààà ààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+msgid "Could not retrieve weather data"
+msgstr "àààààà àààà àààà àààààà ààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+msgid "Weather: Fog"
+msgstr "àààààà: àààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+msgid "Weather: Cloudy Night"
+msgstr "àààààà: àààà ààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+msgid "Weather: Cloudy"
+msgstr "àààààà: àààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Overcast"
 msgstr "àààààà: ààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Showers"
 msgstr "àààààà: ààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Snow"
 msgstr "àààààà: ààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "àààààà: ààà"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Clear Night"
 msgstr "àààààà: àààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Sunny"
+msgstr "àààààà: ààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Thunderstorms"
 msgstr "àààààà: ààààà àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
 msgid "Forecast"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:428
+#, 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:905
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "%s àààà ààààààààà àààà ààà àààààààà %sàààà àààààààà ààààà àààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4566
+msgid "Repository is offline"
+msgstr "àààààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+msgid "No such calendar"
+msgstr "ààà àààààààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:432
+msgid "Object not found"
+msgstr "ààààà àààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:433
+msgid "Invalid object"
+msgstr "àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4574
+msgid "URI not loaded"
+msgstr "URI ààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4576
+msgid "URI already loaded"
+msgstr "URI àààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4580
+msgid "Unknown User"
+msgstr "ààààààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:434
+msgid "Object ID already exists"
+msgstr "ààààà ID àààà àààààààààà"
+
+#: ../calendar/libecal/e-cal.c:4584
+msgid "Protocol not supported"
+msgstr "ààààààààà àààààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4586
+msgid "Operation has been canceled"
+msgstr "àààààà àààà ààààààà ààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4588
+msgid "Could not cancel operation"
+msgstr "àààààà àààà àààà àààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+msgid "Authentication failed"
+msgstr "ààà àààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4592
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:131
+msgid "Authentication required"
+msgstr "àààààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4594
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "D-Bus ààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4598
+msgid "No error"
+msgstr "àààà àààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "ààààààà ààààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
+msgid "Invalid range"
+msgstr "àààà ààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:603
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààààààààà àààààààà ààààààààà ààààà"
+
+#: ../calendar/libecal/e-cal-client.c:768
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "ààààààà àààààààààà àààààààà ààààà"
+
+#: ../calendar/libecal/e-cal-client.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:441
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "àààààààààà àààààààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:922
+#| msgid "%s: Invalid source."
+msgid "Invalid source type"
+msgstr "àààà ààààà àààààà"
+
+#: ../calendar/libecal/e-cal-component.c:1337
 msgid "Untitled appointment"
 msgstr "ààààààààà àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
-msgstr "ààà"
+msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
-msgstr "àààà"
+msgstr "ààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:716
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
-msgstr "àààààààààà"
+msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (àààààààà %s)àààà ààààààààà àààà ààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:38
+msgid "Cannot process, calendar backend is opening"
+msgstr "àààààààà ààààà, àààààààààà àààààà àààà ààà"
 
-#.
-#. 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:1707
+#: ../calendar/libedata-cal/e-cal-backend.c:146
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààà ààààààààà àààà ààà àààààààà %sàààà àààààààà ààààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr "àààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5091
-msgid "Backend is busy"
-msgstr "àààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "Repository is offline"
-msgstr "àààààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "No such calendar"
-msgstr "ààà àààààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5097
-#: ../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:5099
-#: ../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:5101
-msgid "URI not loaded"
-msgstr "URI ààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5103
-msgid "URI already loaded"
-msgstr "URI àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Permission denied"
-msgstr "ààààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:5107
-#: ../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:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Object ID already exists"
-msgstr "ààààà ID àààà àààààààààà"
-
-#: ../calendar/libecal/e-cal.c:5111
-msgid "Protocol not supported"
-msgstr "ààààààààà àààààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:5113
-msgid "Operation has been canceled"
-msgstr "àààààà àààà ààààààà ààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Could not cancel operation"
-msgstr "àààààà àààà àààà àààà ààà"
-
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-msgid "Authentication required"
-msgstr "àààààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
-msgstr "CORBA ààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "ààààààà àààààà"
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "ààààààà àààààààààà ààààààà '%s'"
 
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "No error"
-msgstr "àààà àààààà àààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:163
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààààààà ààààààà '%s' àààà ààààà ààààà ààààà"
 
-#: ../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:79
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
 #, 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:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:231
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
 #, 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:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
 #, 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:136
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ààà àààààà ISO 8601 date/time àààààààà àààààààà ààà àààà"
 
-#: ../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:178
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
 #, 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:184
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ààààà ààààààààààà time_t àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, 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:397
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects two or three arguments"
+msgstr "\"%s\" ààà ààààà ààà àààà àààààààà àààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:411
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ààààà ààààààààààà àà time_t àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:420
+#, 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:480
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects none or two arguments"
+msgstr "\"%s\" ààààà ààààà ààààà ààà àààà àààààààà ààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
 #, 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:924
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"\"%s\" ààààà ààààààààààà \"ààààààà\", \"àààààà\", ààààà \"ààààà\", ààààà \"ààààà\" "
+"\"%s\" ààààà ààààààààààà \"ààààààà\", \"àààààà\", ààààà \"ààààà\", ààààà "
+"\"ààààà\" "
 "ààààààà ààààà àààààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, 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:1100
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" àààà àààà àà àààààààà àààà àà ààà àààà àà àà àà à ààààà àà àààà àààààà ààà (#f) "
+"\"%s\" àààà àààà àà àààààààà àààà àà ààà àààà àà àà àà à ààààà àà àààà àààààà "
+"ààà (#f) "
 "àààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Invalid range"
-msgstr "àààà ààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "àààààààà ààààààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "àààààà ààààààà àààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "àààààààààà àààààà ààààààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS àààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "àààààà ààààà àààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "ààà àààà ààààààà ààààà ààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "ààà ààà ààààààà ààààà ààà àààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "àààà àààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "àààààà ààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "àààà ààààà ààààààà"
-
-#: ../camel/camel-cipher-context.c:102
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:962
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: "
+msgstr "àààààààààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:987
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: "
+msgstr "àààààààààà ààààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: "
+msgstr "àààààààààà àààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1043
+#| msgid "Cannot create encoder context"
+msgid "Cannot retrieve backend property: "
+msgstr "àààààà ààààààà ààààààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1098
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: "
+msgstr "àààààààààà àààààààà ààààà ààààààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list: "
+msgstr "àààààààààà àààààààà àààà ààààààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1157
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "àààààààààà ààààà/àààààà àààà ààààààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1188
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object: "
+msgstr "àààààààààà àààààààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1220
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: "
+msgstr "àààààààààà àààààààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1254
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: "
+msgstr "àààààààààà àààààààà ààààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1281
+#| 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:1312
+#| 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:1344
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment uris: "
+msgstr "àààààààà uris ààààààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1372
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààààààà ààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1401
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not get calendar view path: "
+msgstr "ààààààà ààààà ààààà ààààààà àààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1431
+#| 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:1457
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: "
+msgstr "àààààààààà ààà ààààààà àààààààà àààà ààààà: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "àààà ààà"
+
+#: ../camel/camel-cipher-context.c:206
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ààààààààà àà àààà àààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "àààààààà ààààààààà ààà ààà"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:219
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ààààààà àà àààà àààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "àààààààà ààààààà ààà ààà"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../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
-msgid "Unable to create cache path"
-msgstr "ààà àà ààààààà ààààààà ààààà"
+#: ../camel/camel-cipher-context.c:805
+msgid "Signing message"
+msgstr "àààààààà ààààààààà ààà ààà"
 
-#: ../camel/camel-data-cache.c:402
-#, c-format
+#: ../camel/camel-cipher-context.c:1046
+msgid "Encrypting message"
+msgstr "ààààà  ààààààààà ààà ààà"
+
+#: ../camel/camel-cipher-context.c:1173
+msgid "Decrypting message"
+msgstr "ààààà àà ààààààààà ààà ààà"
+
+#: ../camel/camel-data-cache.c:181
+#, c-format
+msgid "Unable to create cache path"
+msgstr "ààà àà ààààààà ààààààà ààààà"
+
+#: ../camel/camel-data-cache.c:507
+#, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ààà ààààààààà àààà àààà ààà: %s: %s"
 
-#: ../camel/camel-db.c:412
-msgid "Insufficient memory"
-msgstr "ààààà àààààà"
-
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1311,8 +1827,8 @@ msgstr ""
 "àà ààààà àà ààààà àààààààà àààà àààà àààààà ààààà  àààààààà àààààà\n"
 "àààààààà àààààààààà àààà àààà."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1323,120 +1839,189 @@ msgstr ""
 "%s\n"
 "àà àààààà ààààààà àààààà ààà àààààà àààààààà ààààà àààà."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "ààààààà àààààààààààà ààà ààà"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "àààààà àààààààààààà àààààà ààààààààààà ààààààà àààààà ààààààààà ààà"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../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:466
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààààààà '%s' àààààà àààà ààà ààà"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../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:3014
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#| msgid "Copy folder content locally for offline operation"
+msgid "Copy folder content locally for _offline operation"
+msgstr ""
+"àààààà àààààààààà ààààààààààààà àààààààààà àààààààà àààààààà àààà àààà (_o)"
+
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:2028
+#: ../camel/providers/imap/camel-imap-store.c:2523
+#: ../camel/providers/imap/camel-imap-store.c:3282
+#: ../camel/providers/imapx/camel-imapx-folder.c:407
+#: ../camel/providers/imapx/camel-imapx-folder.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:474
+#: ../camel/providers/imapx/camel-imapx-folder.c:530
+#: ../camel/providers/imapx/camel-imapx-folder.c:587
+#: ../camel/providers/imapx/camel-imapx-folder.c:621
+#: ../camel/providers/imapx/camel-imapx-folder.c:661
+#: ../camel/providers/imapx/camel-imapx-folder.c:697
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1367
+#: ../camel/providers/imapx/camel-imapx-store.c:1455
+#: ../camel/providers/imapx/camel-imapx-store.c:1501
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:393
+#: ../camel/providers/pop3/camel-pop3-store.c:805
+#, c-format
 msgid "You must be working online to complete this operation"
-msgstr "àà àààààààà àà àààààà àààà àà ààà àààà ààààààà ààà àà àààààà ààà àààà àààààà"
+msgstr ""
+"àà àààààààà àà àààààà àààà àà ààà àààà ààààààà ààà àà àààààà ààà àààà àààààà"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "ààààà àààààà àààà"
+#: ../camel/camel-file-utils.c:732
+#, c-format
+msgid "Canceled"
+msgstr "àààà àààà"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "'%s' ààààà ààààààààà àààààààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s àààà àààà ààààà àààà ààààààà: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "àààààà àààààààààà ààà ààà"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "àààà àààààààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààà ààààààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1347
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà àààààà àààààààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1359
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà àààààà àà ààààààààà ààààààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) ààààà ààààààà ààà ààà"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ààààà àààà àààà ààà"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d àààààààà àààà"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "àààààà ààààààà ààà ààà"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "àààààà"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d àà %d ààààà ààààààà ààà ààà"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d àà %d àààààà àà àààà"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "ààààà ààààààà ààààààà àààà"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "(àààààà-ààààà) à àààà àààà "
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "(àààààààà-ààà) àà àààà àààà"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, 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:262
+#, 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:302
+#, 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:350
+#, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ààààà àààà ààààà àààààà ààà ààà"
+msgstr[1] "'%s' ààààà àààà ààààà àààààà ààà ààà"
+
+#: ../camel/camel-folder.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:322
+msgid "Moving messages"
+msgstr "ààààà àààààààààààà ààà ààà"
+
+#: ../camel/camel-folder.c:921
+msgid "Copying messages"
+msgstr "ààààà ààààààààà ààà ààà"
+
+#: ../camel/camel-folder.c:1233
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "àààà àààààà àààààà '%s' ààààà ààààààà àààà"
+
+#: ../camel/camel-folder.c:3549
+#, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s' in %s"
+msgstr "%2$s ààààà ààààà '%1$s' ààààààààààà ààà ààà"
+
+#: ../camel/camel-folder.c:3698
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "'%s' ààààà àààà àààààà ààààààààààà ààà "
+
+#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
+#: ../camel/camel-folder-search.c:664
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1445,8 +2030,8 @@ 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:377 ../camel/camel-folder-search.c:491
+#: ../camel/camel-folder-search.c:676
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1455,72 +2040,48 @@ msgstr ""
 "ààà àààààààààà ààààààààà àààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àà bool àààààààà àààààààà ààà"
 
-#: ../camel/camel-folder-search.c:905
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "%s àààà àà (%s) àà ààààààà àààà"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) àà àààààà àààààà ààààààààààà àààààààà ààà"
 
-#: ../camel/camel-folder-search.c:945
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1037
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) àà àààààààà àààààààà ààààààà ààà"
 
-#: ../camel/camel-folder-search.c:954
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1047
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àààà àààààà ààà ààààà ààà"
 
-#: ../camel/camel-folder.c:683
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "àààààààà ààààà: ààààà àààà: %s àààà"
-
-#: ../camel/camel-folder.c:1388
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "àààààààà ààààà: àààààààààààà àààà: %s àààà"
-
-#: ../camel/camel-folder.c:1429
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "àààààààà ààààà: àààààààààà ààààà àààà: %s àààà"
-
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "àààààààà ààààààààààà: UID àààààà àààà: %s ààààà"
-
-#: ../camel/camel-folder.c:1581
-msgid "Moving messages"
-msgstr "ààààà àààààààààààà ààà ààà"
-
-#: ../camel/camel-folder.c:1581
-msgid "Copying messages"
-msgstr "ààààà ààààààààà ààà ààà"
-
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "ààà ààààà ààà ààà"
-
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "ààà-ààà ààààà ààà ààà"
+msgid "Failed to execute gpg: %s"
+msgstr "gpg ààààààààà àààà: %s"
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "àààà ààààà àààà ààà"
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
+msgid "Unknown"
+msgstr "ààààààà"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1531,15 +2092,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:769
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ààààààààààà àààààààààà àààà."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../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:824
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1548,7 +2111,7 @@ msgstr ""
 "ààààààà àààààààààààààà àà ààààà àààààààààà ààààààà PIN\n"
 "àà ààà ààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1557,140 +2120,137 @@ msgstr ""
 "àààààààà àààààààààààààà àà ààààààààààà \n"
 "àààààààààààà ààà ààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' àààà GnuPG àààà ààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "àààà àààà."
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"àààààà àààà ààààààààààà àààààààà ààààààààààà àààààààààààààà àààààà àààààààààà "
+"àààà, ààààààà àààààààà àààààààààà àààààààà ààààààà ààààààà ààààààààà ààààà."
+
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227
+#, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "àààà àààà"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:900
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà àà àààààààà àààà:à àààààà ààààààààà àààà àààà."
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àààà ààààààààà àààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:1044
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààààà ààààààà àààà: àààà ààà àààààààààààà àààà."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg ààààààààà àààà: %s"
-
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ààààààààà àààà ààààààà àààà ààà àààà: %s"
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
+msgstr "ààààààààà àààà ààààààà àààà ààààà: "
 
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "gpg ààààààààà àààà."
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "àà ààààààà àààààààààà àààààààà ààà"
-
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ààààà ààààààààààà ààààààà àààà ààà ààà: àààààà ààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1516
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ààààà ààààààààààà ààààààà àààà ààà ààà: ààààààà àààà ààààààà àààà ààà àààà: %s"
+#: ../camel/camel-gpg-context.c:1797
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "ààààà ààààààààààà àààààà ààààà: "
 
-#: ../camel/camel-gpg-context.c:1625
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "àààààààààààà àààà ààààààà àààà àààà ààà: %s"
+#: ../camel/camel-gpg-context.c:1920
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
+msgstr "àààààààààààà àààà ààààààà àààà ààààà: "
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "àà ààààààà ààààààààààà àààààààà ààà ààà"
 
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ààààà ààààààààà àà ààààààà àààà ààà ààà: àààààà ààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:2051
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ààààà ààààààààà ààààààà àààà: ààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ààààààààààà àààààààà"
 
-#: ../camel/camel-gpg-context.c:1829
-msgid "Unable to parse message content"
-msgstr "ààààà ààààà àààààààà ààààààà ààààà"
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream àà àààà àààààààààààà àààààààà ààà ààààààà ààà"
 
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-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
+#, 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 "fcntl(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:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ààààààà àààà àààààà ààààà àààà ààà ààà: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "àààààà ààààààà ààààà àààà ààà ààà: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../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' àà àààà àààà ààààà ààà: àààà àààààààààà ààààààààà àààààà"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' àà àààà àààà ààààà ààà"
 
-#: ../camel/camel-lock.c:103
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s àààà àààà àààà àààà ààààà ààà : %s"
-
-#: ../camel/camel-lock.c:144
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s àà ààà àààà àààààààààààà àààààààààà ààà àààààà. àààà àààààà ààààààà ààà."
-
-#: ../camel/camel-lock.c:199
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) àààààà àààààà àààà ààààààààà àààà: %s"
-
-#: ../camel/camel-lock.c:262
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) àààààà àààààà àààà ààààààààà àààà: %s"
-
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s ààà àààààà ààààààà àààà àààà ààà: %s"
@@ -1700,143 +2260,154 @@ msgstr "%s ààà àààààà ààààààà àààà à
 msgid "Could not open mail file %s: %s"
 msgstr "%s ààà àààà àààà ààààà ààà: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "%s ààààààà ààà àààà àààà ààààà ààà: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "%s ààààààà àààà ààà ààààààààààà àààà: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "àààà àààà ààààà ààà: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ààààà àààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ààààààààà àààà àààà: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(ààààààà àààààà)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "ààà àààà àààààààà àààààà: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "ààà ààààààà àààà ààààààààà àààààà: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ààà ààààààà àààà ààààààààà ààààààà àààààà: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "àààààà àààààààà ààà"
+#: ../camel/camel-multipart-signed.c:297
+#, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "àààààààà àààààà àààààà àààà"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-msgid "Canceled"
-msgstr "àààà àààà"
+#: ../camel/camel-multipart-signed.c:305
+#, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "ààààààààà àààààà àààà"
 
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
-msgstr "ààààà àààà ààààààà ààà ààà"
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
+msgid "parse error"
+msgstr "àààààà àààààààà ààà"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "ààààà ààà: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "ààààà àààààààà àààààà"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ààààà ààà àààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "ààààà ààààà ààà"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ààà ààààà àààà"
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ààà ààààà àààà: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-network-service.c:112
+#, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "%s àà ààààà ààààà: "
+
+#: ../camel/camel-offline-folder.c:206
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "%s àààààà àààà ààààà ààààà ààààà àààà ààà ààà"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../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:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "ààààà àààààà àààà àààà"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ààà àààààà àààààààà àààààà ààààà ààà ààààààààààà"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s ààààà àààà àààà ààà: àà àààààà àà ààààààà ààààààà àà àààààà àààà àà."
+msgstr ""
+"%s ààààà àààà àààà ààà: àà àààààà àà ààààààà ààààààà àà àààààà àààà àà."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s àà àààààààà àààà àààà ààà: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "%s àà ààààà àààà àààà ààà: ààààààà ààààà ààààààà àààààààà ààà àààà ààà."
+msgstr ""
+"%s àà ààààà àààà àààà ààà: ààààààà ààààà ààààààà àààààààà ààà àààà ààà."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ààààààààà '%s' ààààà ààààààà ààààààààààà àààààà àààà"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "àààààà"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "àà àààààà àààààà ààààààààààà ààààààà ààààà."
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "àààààààààà àààà."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1845,7 +2416,7 @@ msgstr ""
 "àààà àààà ààààà ààààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1854,7 +2425,7 @@ msgstr ""
 "àààà ààààààààà ààààà ààààà àààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1863,644 +2434,629 @@ msgstr ""
 "àààà ààààààà ààààà:\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."
 msgstr ""
-"àààààààà CRAM-MD5 ààààààààà àà ààààà àààà àà àààààà ààààààà ààààà, àà ààààà ààà àààààà "
+"àààààààà 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."
 msgstr ""
-"àààààààà DIGEST-MD5 àààààààààààà ààààà àààà àà àààààà ààààààà ààààà, àà ààààà ààà "
+"àààààààà DIGEST-MD5 àààààààààààà ààààà àààà àà àààààà ààààààà ààààà, àà ààààà "
+"ààà "
 "àààààà ààà àààà."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:850
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ààààà àààààà ààà àààà ààà (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:861
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààà àààààà àààà ààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ààààà àààààààààà àààà \"ààààààààà àààààààà \" àààà ààà"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:902
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ààààà àààààààààààààà ààààààààà àààà àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:923
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ààààà àààààààààààààà àààààà ààààààààà àààà ààà"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:936
+#, c-format
 msgid "Server response does not match"
 msgstr "ààààà àààààààà ààà àààà ààà ààà"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../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:159
+#: ../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:164
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààààààà àààààà ààà àààààà àààà (_n)."
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "ààààà àààààà àààààà_ààà ààààààààààààà àààà àà àààà àààààààà àààààà àààààà àààà."
+msgstr ""
+"ààààà àààààà àààààà_ààà ààààààààààààà àààà àà àààà àààààààà àààààà àààààà "
+"àààà."
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
-msgstr "ààààà_ààààààààà ààààà ààààà ààààààààà àààà àà ààààà_ààà_àààààààà àààààààààààààà àààààààà àààà."
+msgstr ""
+"ààààà_ààààààààà ààààà ààààà ààààààààà àààà àà ààààà_ààà_àààààààà "
+"àààààààààààààà àààààààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../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:180
+#: ../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:185
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àààààà àààààà àààà ààààà àààààà àààààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "àààààààà ààààààà input_token àà àààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "ààààà àà àààààà àààààààà ààààààà àààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "àààààà ààààà àà ààà àààààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààà àààà àààààà àààààààààà àààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:410
+#, 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:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"àààààààà ààààà àààà àààà àààà:\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:134
+#: ../camel/camel-sasl-login.c:107
+#, 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."
 msgstr ""
-"NTLM / àààààààà ààààààààà àààààààààà àààààà àà àààààà ààààààààà àààààààààààà ààààà ààà "
+"NTLM / àààààààà ààààààààà àààààààààà àààààà àà àààààà ààààààààà àààààààààààà "
+"ààààà ààà "
 "àààà."
 
-#: ../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 ààààààààààà ààààààààààà àà àààààà ààà àààààààà ààààààà àààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
-msgstr "POP ààààààà URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
+#| msgid "POP Source URI"
+msgid "POP Source UID"
+msgstr "POP ààààà UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "SMTP ààà POP ààààààà ààààààà àààà ààààà ààà"
+#: ../camel/camel-sasl-popb4smtp.c:96
+#, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "ààààààà àààààààààààààà àààà àààà POP ààààà SMTP ààà àààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "SMTP ààà POP àà ààà ààà ààààààà ààà"
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#, c-format
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr ""
+"%s àààààààààà SMTP ààà ààààààààààààà POP àààààà ààààààààà ààààààà ààààà"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààààà ààààààààà ààààààààà àààà: %s: %s"
 
-#: ../camel/camel-service.c:265
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "'%s' àà URL àààà ààààààà àààààà ààà ààà"
-
-#: ../camel/camel-service.c:269
+#: ../camel/camel-session.c:397
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "'%s' àà URL àààà ààààà àààààà ààà ààà"
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ààààààààà '%s' ààààà àààà GType àà àààààà àààà"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-session.c:466
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "'%s' àà URL àààà ààààà àààààà ààà ààà"
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "%s ààààààà ààààà àààààà ààààà àààà"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:481
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"àààààà àààà ààà àààà %s:\n"
-"%s"
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "%s ààà àààà ààààà"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:1187
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààà %3$s àààà %2$s ààààà %1$s ààààààààà àààààààà ààà."
 
-#: ../camel/camel-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel àààà ààààà àààààà àààà ààààà ààààà àààààà àààààà àààà."
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s'àààà àààààààààà àààà àààààà ààà"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS ààààà àààà ààààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààààà àààà àààà ààààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààààà àààà àààà àààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS àààà àààà àààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ààààà àààààà ààààààà ààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "àààààààààà àààààààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààà ààà àààà ààààà ààà"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' àà àààààààààà àààààààààà àààààààà àààà"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààààà ààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààààà ààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "àààààààààà àààààààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ààààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "àààààà àààààà ààààààà àààà ààà àààà"
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS ààààààà àààààà ààààà ààààààà àààà"
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "àààààà ààààà ààààà àààà"
-
-#: ../camel/camel-smime-context.c:697
+#. 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:699
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "àààààà ààà"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ààà ààà"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "ààààààààà àààààààà ààà ààààà ààààà àà ààà àààà"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ààà àààààààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ààààààà àààààààààà àààààààà àààà"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "àààààà àààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ààààààà ààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "àààààààà ààààààààà "
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ààààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ààààààààà ààààà ààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "àààààààààà ààààààààà ààààààà ààààààà"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "àààààààà àà àààà àààà ààà ààà"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ààààà àààààààààà ààà ààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "àààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "àààààààààà ààà àààà ààààà ààà, ààààààààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "àààààààààà ààà àààà ààààà ààà, ààààààààààà àààà àààà àààààà"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ààààààààà àààààààà ààààààà àààà ààà ààà"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+msgid "Cannot create encoder context"
+msgstr "àààààà àààààà ààààààà àààà ààà àààà"
+
+#: ../camel/camel-smime-context.c:848
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS ààààààà àààààà ààààà ààààààà àààà"
+
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+msgid "Failed to encode data"
+msgstr "àààààà ààààà ààààà àààà"
+
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "àààààà àààà"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààà àààà àààààààààà ààààààààà ààààà àààà"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àààààààààà àààà ààààààà ààà ààààà àààà ààà ààààà"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "CMS ààààà àààà ààààààà ààà ààà"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ààààà àààààà àààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ààààà àààààà àààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààààà àààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ààààààààààà àààààà àààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ààààààààà àààààà ààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "àààààààà àààààà ààààà àààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: ààààààà àààààààààà àààààà àààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr "ààà àààà ààà: à àààààààà àààààààà"
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr "ààà ààààààà ààà: à àààààààà àààààààà"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààà ààààààà ààà ààà ààààà: ààà àààààààà àààààà ààààààààà"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:1799
 #, c-format
 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:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "àààààà àààà ààà àààà: %s: àààààà àààààààààà ààà"
-
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:1842
 #, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "àààààà ààà ààà ààà àààà: %s: àààà ààààààààà"
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "'%s' àààà ààà"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:2027
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "àààààààà ààà ààà ààà ààà àààà: %s: àààà ààààààààà"
+#| 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:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "àààà"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "àààà-àààà àààààààààà àààààà àààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "àààààààààà àààààààààà àààà àààà àààà àààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "àààààààààà ààà ààààààààà àààà ààà àààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "àààààààààà àààààààààà àààà ààà ààààààààà àààà ààà àààà"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "àààà-àààà àààààà àà ààààà àààà ààà àààà"
+#: ../camel/camel-store.c:2501
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "àààààà àààà ààà àààà: %s: àààààà àààààààààà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "àààààààààà ààààààààà ààààààà"
+#: ../camel/camel-store.c:2515
+#, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "àààààà '%s' ààààààà ààà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "àààààààààà àààààààààà àààà ààà àààà"
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "àààààà ààà ààà ààà àààà: %s: àààà ààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "àààààààààà ààààà àààà"
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "àààààààà ààà ààà ààà ààà àààà: %s: àààà ààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "àààààààààààà àààà ààààà"
+#: ../camel/camel-stream-filter.c:334
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "CamelStreamFilter àà àààà ààààààààà àààààààà àààà ààààààà ààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "Certificate Revocation List (CRL) àààààà ààà àààà"
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "ààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-#| msgid "Certificate Revocation List signature failure"
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "Certificate Revocation List (CRL) àààààààààà ààààà"
+#: ../camel/camel-stream-process.c:272
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" àààà ààààààà àààààà ààààà ààà àààà: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:589
-#| msgid "Unable to get Certificate Revocation List"
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Certificate Revocation List (CRL) àààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr "NSPR àààààà ààà %d"
 
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "àààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "àààààààà ààààà SOCKS4 ààààà àààààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "àààà-ààààà àààà-ààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:662
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "àààààààà ààààààà àààààà àààààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "àààààààààà àààààààààààààà àààààààààà"
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "àààààààà SOCKS5 ààààà àààààà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "ààààààà àààààà àààà-àààà àààààààààà àààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:770
+#, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ààààà ààà àààà àààààà ààààà ààààà: ààà 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "ààà ààà àààààà àààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:782
+msgid "General SOCKS server failure"
+msgstr "àààààààààà SOCKS ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "àààààààààà ààààà ààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:783
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS ààààààààà àààààà àààààààààà ààààààà ààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "àààààààààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:784
+msgid "Network is unreachable from SOCKS server"
+msgstr "SOCKS àààààààààààà ààààààà àààààààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "àààà àààààààààà ààààààààà (CA)"
+#: ../camel/camel-tcp-stream-raw.c:785
+msgid "Host is unreachable from SOCKS server"
+msgstr "SOCKS ààààààà ààààà ààààà àààààààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "ààààà ààààà ààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:786
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "ààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "àààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:787
+msgid "Time-to-live expired"
+msgstr "àààà-àà-ààààà àààààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "àààààààààà àà ààààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:788
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS àààààààààààà àààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "àààààààààà àààààààà"
+#: ../camel/camel-tcp-stream-raw.c:789
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS àààààààààààà ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "àààà/ààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:790
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKS àààààààààààà ààààààà àààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ààààà"
+#: ../camel/camel-tcp-stream-raw.c:823
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "SOCKS àààààààààààà ààààààà ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ààààààà àààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:841
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS àààààààààààà àààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "ààààà àààà àààààààààà ààààààà àààààà ààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:861
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "àààààààà ààà àààà ààà (àààà 255 àààààà ààà)"
 
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "ààààààààà ààààààà àààààà"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "àààààààà àààààààààààà àààà àààààààà"
 
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:474
 #, 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 ""
-"ààààààà:            %s\n"
-"àààà:           %s\n"
-"ààààààààààà:       %s\n"
-"ààààààààà:         %s"
+"   ààààààà:       %s\n"
+"   àààà:      %s\n"
+"   ààààààààààà:  %s\n"
+"   ààààààààà:    %s "
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-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"
-"àààààà ààààà ààààààà ààà ààààààà?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:484
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"%s àààà SSL àààààààààà ààààààà:\n"
-"\n"
-"%s\n"
+"'%s' ààààà SSL àààààààààà àààààààààà àààà. àààààààà ààààà ààààààààààà?\n"
 "\n"
-"àààààà ààààààà ààà ààààààà?"
+"ààààààààààààààà àààààà àààààà:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:488
+msgid "_Reject"
+msgstr "àààààààà ààà (_R)"
+
+#: ../camel/camel-tcp-stream-ssl.c:489
+msgid "Accept _Temporarily"
+msgstr "àààààààààà àààààààà (_T)"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:490
+msgid "_Accept Permanently"
+msgstr "àààààààààà àààààààà (_A)"
+
+#: ../camel/camel-tcp-stream-ssl.c:548
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2509,7 +3065,7 @@ msgstr ""
 "àààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:600
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2518,7 +3074,7 @@ msgstr ""
 "àààà àààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:618
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2527,7 +3083,7 @@ msgstr ""
 "àààààààààà ààà àààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:635
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2536,379 +3092,87 @@ msgstr ""
 "àààààààààà àààààààààà àààà ààààà: %s\n"
 "àààààà: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s' àààà àààà àààà"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:651
+#, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr "%s àààààà ààààààà ààà ààà"
+
+#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "'%s' ààààààààà àààààà: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààààààààààà àààààà ààààà àààààààà ààààà àààà ààà àààà"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1358
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ààààà ààà ààààààà ààààà àààà %s"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààààààààà àààààà ààààà àààààààà ààààà àààà ààà àààà"
+#: ../camel/camel-vee-folder.c:1426
+#, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "'%s' àààààààààà àààààà: "
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. * all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "àààààà"
 
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "àààààà ààà ààà ààà àààà: %s: ààà ààààà àààà"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "àààààààà ààà ààà ààà ààà àààà: %s: ààà ààààà àààà"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../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
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, 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:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
-msgid "No such message"
-msgstr "ààà ààààà àààà"
+msgid "No output stream"
+msgstr "àààààà ààààààà àààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../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:819
-#: ../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:252
-#: ../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
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, 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:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "àààààà ààààààà àà ààààà àààààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
-msgid "Could not get message"
-msgstr "ààààà ààààààà ààà ààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s àààà àààààà àààààààààà ààà ààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
-#, c-format
-#| msgid "Checking for new messages"
-msgid "Checking for deleted messages %s"
-msgstr "àààà àààààà ààààà %s ààààà àààààà ààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
-msgstr "ààààà àààààà ààààà àààà àààà. ààààà àààààà ààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s àààà àààà ààààà ààààà àààààà àààààà ààààààà àààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "àààààà '%s' ààààà ààààà àààà ààà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ààààà àààà ààà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "%s ààààà àààààà ààààààà ààà ààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àààààà ààààààà ààààà ààààà àààà ààà àààà: ààà àààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "àààààà ààààààà ààààà ààààà àààà ààà àààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-msgid "Checking for new mail"
-msgstr "àààà ààààààà ààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-msgid "C_heck for new messages in all folders"
-msgstr "àààà àààààà ààààà àààà ààààà ààààà ààààà (_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../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:61
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "àààà ààààààààà ààààààààààà ààààà àààààààààààà ààààààààà àààà(_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
-msgid "Check new messages for J_unk contents"
-msgstr "ààà ààààààà ààààà àààà ààààà ààààà (_u)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ààààààà àààààà ààààà ààà ààààà ààààà àààà ààà (_B)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààààààààà ààààààààààààà àààà àààààààà ààà (_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "SOAP Settings"
-msgstr "SOAP àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Post Office Agent SOAP ààààà (_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "For accessing Novell GroupWise servers"
-msgstr "ààààààà ààààààààà ààààààààà àààààà ààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "Password"
-msgstr "ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "ààààààà àààààààààà ààààààààà àààààà àà àààààà àààààààààà àààààààààààà ààààà ààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
-msgid "Host or user not available in url"
-msgstr "url ààààà ààààà ààà àààà àààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
-msgid "You did not enter a password."
-msgstr "àààààà ààààààààà àààààààà àààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
-msgid "Some features may not work correctly with your current server version"
-msgstr "ààààààà ààààààààà ààààààà ààààààà ààààà àààà ààààààà ààà ààà ààà ààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../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:1266
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àààààà ààààààà ààààààààà ààààà ààààààà àààà ààà àààà."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../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:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Groupwise àààààà '%s' àà '%s' ààà àààààààààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ààààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àà %s àààà ààààààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àààààà ààààààààà ààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
-msgid "Sending Message"
-msgstr "ààààà ààààà ààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
-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 ""
-"ààààà ààààààà àààààà àààààà àààà àààà ààà. ààààà ààààà àààààààà ààààà àààààà àààààà àààà ààà. ààà "
-"àààà ààààà ààààà àààààààààà/ààààààà ààààààà àààààà ààààà.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ààààà ààààà ààà àààà: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "àààà ààààààààà ààààà ààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "ààààààà àààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../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:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "àààà:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "àààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "_Show only subscribed folders"
-msgstr "àààà àààààààà àààààà àààààà àààààà (_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-msgid "O_verride server-supplied folder namespace"
-msgstr "ààààà àààààà ààààààààà àààààà àààààààààà àààààà ààààà (_v)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "àààààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "àààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula ààààààààà àààààà ààààà"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "ààààà ààààààààààà àààà àààà àà àààààà Hula ààààààà àààààà àààà."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
-msgid "No output stream"
-msgstr "àààààà ààààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
 msgid "No input stream"
 msgstr "ààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
-msgid "Operation cancelled"
-msgstr "àààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, 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:352
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, 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 ààààà àààààààà ààààà, àààààà %s ààààà:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2917,679 +3181,617 @@ msgstr ""
 "%s %s: IMAP àààààààààà ààààà ààà\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ààààààààààà ààààààààà àààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP àààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:594
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ààààààà àààààààà ààà àààà ààààà."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "%s àààààà IMAP ààààààààà àààààààààà àààààà "
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààààààààà ààààààààà OK àààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
-msgid "Always check for new mail in this folder"
-msgstr "àààààà àààà àààà ààà ààààà ààààà àààà ààà"
+#: ../camel/providers/imap/camel-imap-folder.c:348
+#| msgid "Always check for new mail in this folder"
+msgid "Always check for _new mail in this folder"
+msgstr "àà ààààààààààà ààààà àààà àààààààà àààààà ààà (_n)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message _filters to this folder"
+msgstr "àà ààààààààààà ààààà àààààà àààà ààà (_f)"
+
+#: ../camel/providers/imap/camel-imap-folder.c:440
 #, 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:919
+#: ../camel/providers/imap/camel-imap-folder.c:461
 #, 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:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3949
 #, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND àààà àààà ààààààà ààààààààà àààààààà àààààà '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND àààà ààààààààààààà ààààà àààààààà ààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND àààà ààààààààààà ààààààà àààààà ààààà!"
+msgid "Scanning for changed messages in %s"
+msgstr "%s àààà ààààà àààààààà ààààà ààààà ààààà àààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ààààà àààààààààààà àààà ààà àààààà: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3478
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "ààààà ààààààààààà ààààààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3515
+#: ../camel/providers/imapx/camel-imapx-server.c:5509
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ààààà ID %s àààààà ààààà ààààààà ààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:3516
+#: ../camel/providers/imapx/camel-imapx-server.c:5510
 msgid "No such message available."
 msgstr "ààààààà ààààà àààààà àààà."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:3591
+#: ../camel/providers/imap/camel-imap-folder.c:4469
+#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#, c-format
 msgid "This message is not currently available"
 msgstr "àà ààààà ààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:4050
+#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imapx/camel-imapx-server.c:3901
+#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s àààà àààà ààààà ààààà àààààà àààààà ààààààà àààà ààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4267
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààààà ààààààà àààààààà: %d àààààààààà àààààà àààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4277
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààààà ààààààà àààààààà: %d àààààààààà àààààà UID àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:4509
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH àààààààààà àààààààà àà àààààà àààà."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "%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 "àààà àààààààààà ààààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s: %s ààà ààààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s: %s ààà ààààààà"
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "ààààà %s ààà ààààààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
+#, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "%s ààà ààààààà ààààà: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "àààà ààààààààà ààààà ààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+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:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "àààà ààààà ààààà àààààààààà àààààà ààààààà àààà àààà (_e)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "ààààààà àààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "ààààààààà ààààààà ààààà àààààà àààà ààààà (_U)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#| msgid "Command:"
+msgid "Co_mmand:"
+msgstr "àààà (_m):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
+msgid "Folders"
+msgstr "àààààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "àààà àààààààà àààààà àààààà àààààà (_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "ààààà àààààà ààààààààà àààààà àààààààààà àààààà ààààà (_v)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "àààààààà (_p):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Options"
+msgstr "àààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "àààààààààà:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "àààà ààààààààà ààààà àààà àààààààààà ààààààààà àààà ààà (_f)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "àààà ààààààààà ààààààààààà ààààà àààààààààààà ààààààààà àààà(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "àà ààààà àààà ààààààà àààà ààààà ààààà àààààà ààààà (_A)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Check new messages for _Junk contents"
+msgstr "ààà ààààààà ààààà àààà ààààààà àààààà ààà (_J)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-msgid "Check new messages for Jun_k contents"
-msgstr "àààààààà ààààààà ààààà àààà ààààà ààààà (_k)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ààààààà àààààà ààààà ààà ààààà ààààà àààà ààà (_B)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààà ààà ààààààààààààà ààààà àààààààà ààà (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:80
+msgid "IMAP default port"
+msgstr "IMAP àààààààààààààà ààààà"
+
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP ààààà SSL"
+
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ààààà àààà ààà àààààààààààà ààà àààààà àààààà ààààà."
 
-#: ../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-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ààààààààà %s"
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid "Password"
+msgstr "ààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s àà %s ààààà IMAP àààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"ààààà ààààà àààààààààààà àààà àààà àà àààààà IMAP àààààààààààà ààààà àààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
-#, 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:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-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 "ààààà àààà"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2694
+#: ../camel/providers/imapx/camel-imapx-store.c:373
+#: ../camel/providers/imapx/camel-imapx-store.c:844
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:675
+#: ../camel/providers/local/camel-maildir-store.c:681
+#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-spool-store.c:387
+msgid "Inbox"
+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:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "%s àààààààà ààààààà IMAP àààààààààààà àààààà àààààààà àààà ààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 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:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-msgid "SSL is not available in this build"
-msgstr "àààà ààààààààààà SSL àààààà àààà"
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2868
+#, c-format
+#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "àààààààà àààààààà IMAP ààààààà %s àà ààààà ààààààà ààààà: "
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2935
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" àààà ààààààà àààààà ààààà ààà àààà: %s"
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP ààààààà %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:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
-#: ../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:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "ààààààà"
+#: ../camel/providers/imap/camel-imap-store.c:809
+#: ../camel/providers/imapx/camel-imapx-store.c:155
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ààààààààà %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "%s IMAP ààààààààà àààààà àààààààà àààààààààà ààààààààà àààààà ààà àààà %s"
+msgid "IMAP service for %s on %s"
+msgstr "%s àà %s ààààà IMAP àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate without a username"
+msgstr "àààààààààààààààà ààà ààààà ààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:491
+#: ../camel/providers/pop3/camel-pop3-store.c:511
+#| msgid "Authentication failed"
+msgid "Authentication password not available"
+msgstr "àààààààààààààà ààààààà àààààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imap/camel-imap-store.c:2269
+#: ../camel/providers/imapx/camel-imapx-store.c:348
 #, c-format
-msgid "No support for authentication type %s"
-msgstr "àààààààààà ààààààààà àààààà àààà %s"
+msgid "No such folder %s"
+msgstr "%s ààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:2079
+#: ../camel/providers/imap/camel-imap-store.c:2538
+#: ../camel/providers/imapx/camel-imapx-store.c:1388
 #, c-format
 msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP àààààààààààà àààààààààà ààà ààà àààà.\n"
-"%s\n"
-"\n"
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "àààààààà ààà \"%s\" àààà ààà àààà ààààà àààààà àààà \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:2143
+#: ../camel/providers/imap/camel-imap-store.c:2602
+#: ../camel/providers/imapx/camel-imapx-store.c:1409
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "àààààààà ààà \"%s\" àààà ààà àààà ààààà àààààà àààà \"%c\""
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ààà ààààààà àààààààà àààààààà ààààààà àààà"
 
-#: ../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:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "àààààà '%s' àààà ààà àààà: àààààà àààààààààà ààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ààààààà àààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3326
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ààààààà àààààà ààààààààààààààà ààààà àààà"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP ààààà àààà ààààà àààààààààà àààà ààà %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP4 ààààà %s àààà ààààààààà àààààààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "àààà ààààà %s àààà ààààààààà àààààààà."
+#: ../camel/providers/imap/camel-imap-store.c:3329
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "ààààààà àààààààààààà ààààà àààà: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
+#: ../camel/providers/imapx/camel-imapx-folder.c:101
 #, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "àààààà '%s' ààààà ààà àààà: àààààà àààààààààà ààà"
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s ààààà àààààà àààààà ààààààà àààà ààààà"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
 #, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà ààà àààà: àààààà àààà"
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "%s ààààà àààà ààààààà àààà ààààà: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "IMAP ààààà %s àààà àààà àààààààààà ààààà: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ààààààà àààààà ààà ààààààà àààà àààààààà àààà ààà (_Q) "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "àààà àààààààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr "ààààààà ààà ààààààààààà ààà (_L)"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 àààààààààààà %s àààààààààààà àààààà ààààà: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "àààà:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"ààààà àààààà à àààààààààà àààà ààààà ààààààààà àààààà-àààà ààààà ààààààààààà àààà "
-"àààààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "àààààààààààà àààààà àààààààà àààààà (_r)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "X ààààààà à ààààààà ààà ààààà àààààààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "àààààààààà:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "X ààààà àààààà ààààà àààà ààà ààààà àààààààà ààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "Default IMAP port"
+msgstr "àààààààààààààà IMAP ààààà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "àààààà '%s' ààààà àààààà àààà: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
+#: ../camel/providers/imapx/camel-imapx-server.c:817
+#| msgid "Server unexpectedly disconnected"
+msgid "Server disconnected"
+msgstr "ààààààà ààààà àààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1206
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "àààà àààààààààààà ààààààààà àààààà: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1940
+#, c-format
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "ààà ààààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2005
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "IDLE àààààààà àààààà ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3160
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3228
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "tmp ààààààà ààà ààààààà ààààà: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3327
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "ààààààààà àààà ààààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3457
+#| msgid "Sending message"
+msgid "Error appending message"
+msgstr "ààààà àààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3637
+msgid "Error fetching message headers"
+msgstr "ààààà ààààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3778
+#| msgid ""
+#| "Error retrieving newsgroups:\n"
+#| "\n"
+#| "%s"
+msgid "Error retrieving message"
+msgstr "ààààà àààààààààààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3982
+#| msgid "Checking for new messages"
+msgid "Error fetching new messages"
+msgstr "àààà ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4172
+#| msgid "Verifying message"
+msgid "Error while fetching messages"
+msgstr "ààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4180
+#: ../camel/providers/imapx/camel-imapx-server.c:4210
+#, 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] "%2$s àààà %1$d àààààààààà àààààà àààààà ààààààà ààà ààà"
+msgstr[1] "%2$s àààà %1$d àààààààààààà àààààà àààààà ààààààà ààà ààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4332
+#: ../camel/providers/imapx/camel-imapx-server.c:4366
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "àààààà àààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4455
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "ààààà ààààà ààààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4540
+#| msgid "Storing folder"
+msgid "Error fetching folders"
+msgstr "ààààààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4614
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "àààààààà àààààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4667
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "àààààà ààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4712
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "àààààà àààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4762
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "àààààààà ààààààààààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4813
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "NOOP àààààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4908
+msgid "Error syncing changes"
+msgstr "ààà àààà àààààààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5664
+#: ../camel/providers/imapx/camel-imapx-server.c:5679
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "ààààà àààà ààààààà àààà ààààà: "
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+#| msgid "Preparing folder '%s' for offline"
+msgid "Retrieving folder list for %s"
+msgstr "%s ààààà àààààà àààà ààààààààààà ààà ààà"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
 #, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "àààààà '%s' àà ààààà àààààà ààà ààà àààà: ààààààà àààààà"
+msgid "No such folder: %s"
+msgstr "ààà àààààà àààà: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "àààààà '%s' àà ààà àààààààà ààà ààà àààà: àààààà àààà"
+msgid "Source stream returned no data"
+msgstr "ààààààà ààààààààà àààà àààààà àààà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "àààààà '%s' ààààà ààààà ààà àààà: ààààààà àààààà"
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "ààààààà ààààààà àààààààà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà ààààà ààà àààà: àààààà àààà"
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "àààààà '%s' ààààà ààààà %s ààààààà ààà ààà àààà: ààà ààààà àààà"
+msgid "mailbox: %s (%s)"
+msgstr "ààààààà: %s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà ààààà %s ààààààà ààà ààà àààà: àààààà àààà"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "àààààà '%s' àà ààààà àààà ààà àààà: àààààà àààà àààààààà ààà"
+#: ../camel/providers/local/camel-local-folder.c:483
+#| msgid "Index message body data"
+msgid "_Index message body data"
+msgstr "àààààààà ààààà àààà àààà (_I)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
+#: ../camel/providers/local/camel-local-folder.c:712
 #, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "àààààà '%s' àà ààààà àààà ààà àààà: ààààààà àààààà"
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"àààààà %2$s\n"
+"%3$s ààààà ààààà %1$s ààààààà àààà ààààà"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "àààààà '%s' àà ààààà àààà ààà àààà: àààààà àààà"
+#: ../camel/providers/local/camel-local-provider.c:44
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "'.folders' àààààà àààààà àààà ààààà (exmh) (_U)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààà ààà àààà: ààààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààààààà ààà ààà àààà: ààààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààà ààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààààààà ààà ààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "ààà ààààààà ààààà àààà ààààààà àààààà ààà (_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "ààààààà àààààà ààààà àààà ààà ààààà ààààà àààà àààà (_g)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 ààààà àààà àààà ààààààààààà ààààà àààààààà àààààààààà."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "ààààà ààààà ààààààààà àààààà àà àààààà IMAPv4rev1 àà àààààà ààààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "àààààà àààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "ààààààà ààààààà IMAP ààààà %s àà àààààà ààààà: ààààà STARTTLS àà àààààà ààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS àààààààà ààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, 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:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s àà àààà àààà %s IMAP ààààà àààà àààààààààà àààà ààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "àààààà ààààààà IMAP àààààà ààààààà àààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "IMAP ààààà %s àààà àààààà '%s' ààààààà ààà ààà àààà: ààààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "IMAP ààààà %s àààà '%s' ààààà àààà ààààà àààààà ààààààà ààà ààà àààà: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "àààààà '%s' àààà ààà àààà: àààà àààààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "àààààà '%s' àààà ààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "àààààà '%s' ààààà àààà ààà àààà: ààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "àààààà ààààààà IMAP àààààà ààààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "àààààà '%s' ààààà àààà ààà àààà: àààà àààààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà àààà ààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "àààààà '%s' àà '%s' ààà àààààààààààà ààà ààà àààà: àààààààà àààààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "àààààà ààààààà IMAP ààààààààà àààà ààà àààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "àààààà '%s' àà '%s' ààà àààààààààààà ààà ààà àààà: àààà àààààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-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:1572
-#, c-format
-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:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "àààààà ààààààà IMAP àààààà àààààààààà àààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "àààààà '%s' ààààà àààààààààà àààà àààà: àààà àààààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà àààààààààà àààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "àààààà ààààààà IMAP ààààààààà àààààààààààà àààà ààà àààà."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "àààààà '%s' ààààà ààààààà ààààà ààààà ààà àààà: àààà àààààààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "àààààà '%s' ààààà ààààààà àààà ààà àààà: àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "àààààààà àààààààààà ààààà ààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ààààà %s àààààà ààààààà ààà."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "àààà ààààààà ààààà ààààààà àààà ààà"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "ààààààààà IMAP àààààààààààààà àààààààà àààààà ààààààààà àààà %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "àààààà àààà"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP àààààààààààà %s àààààààààààà àààààà ààààà: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "ààààà ààààà"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-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:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s àààààà ààà ààààààààà àààà ààà àààà"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "àààà ààààà àààà ààà"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
-
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
-#, c-format
-#| msgid "mailbox:%s (%s)"
-msgid "mailbox: %s (%s)"
-msgstr "ààààààà: %s (%s)"
-
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "'.folders' àààààà àààààà àààà ààààà (exmh) (_U)"
-
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-àààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 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:70
 msgid "Local delivery"
 msgstr "ààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"àààà mbox-àààààà ààààà àààààà àààààà ààààà Evolution àààààà ààààààààà àààààà ààààà ààààààà "
+"àààà mbox-àààààà ààààà àààààà àààààà ààààà Evolution àààààà ààààààààà àààààà "
+"ààààà ààààààà "
 "ààà àààà."
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
-msgstr "ààààààà ààààà àààà ààààà ààààà àààààà àààà ààà (_A)"
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
+msgstr "ààààààà àààà àààà àààààààààà ààààààààà àààà ààà (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir- àààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "àààààààààà ààààààà ààààààààààààà ààààààà àààà."
 
@@ -3602,215 +3804,247 @@ msgid "Standard Unix mbox spool file"
 msgstr "àààà Unix mbox ààààà àààà"
 
 #: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"ààààààà àààààà ààààààà ààààà àààà ààààààà ààààààààààà à ààààààà ààà ààààààààààààà.\n"
+"ààààààà àààààà ààààààà ààààà àààà ààààààà ààààààààààà à ààààààà ààà "
+"ààààààààààààà.\n"
 "ààà àààà à àà àààà àààààà ààààààààààààà àà àààààà ààà àààà."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "àààà Unix mbox ààààà àààààà"
 
-#: ../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:128
+#: ../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:178
+#, c-format
+msgid "Local mail file %s"
+msgstr "ààààààà ààà àààà %s"
+
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, 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:227
 #, 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:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, 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:286
+#, 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:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, 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:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, 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:581
 #, 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"
-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:527
 #, c-format
-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:229
-msgid "Maildir append message canceled"
-msgstr "Maildir ààààà àààà àààà àààà"
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
+msgid "No such message"
+msgstr "ààà ààààà àààà"
+
+#: ../camel/providers/local/camel-maildir-folder.c:226
+#, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "maildir àààààà: %s ààààà ààààà àààààààà àààà ààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:232
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "ààààààààààààààà ààààà àààààà àààà ààà àààà: %s: %s"
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "àààààà %2$s ààààà ààààà %1$s ààààààà àààà ààààà: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ààààààààà: %s ààààà ààààààà ààà ààà àààà %s\n"
-"  %s"
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "àààààà àààààà : %s ààààà ààààà ààààààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:304
-msgid "Invalid message contents"
-msgstr "àààààà ààààà"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#, 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:119
+#: ../camel/providers/local/camel-maildir-store.c:782
+#, 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:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 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:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 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:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 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:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "àààààà '%s' ààààààà ààà ààà àààà: àààà àààààà àààà."
 
-#: ../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:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 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:331
 msgid "not a maildir directory"
 msgstr "àààààààà àààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "àààààà '%s' àà ààààà àààà àààà: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-store.c:773
+#, 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:416
+#: ../camel/providers/local/camel-maildir-summary.c:549
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ààààààààààààà ààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:540
 msgid "Checking folder consistency"
 msgstr "àààààà ààà àààààà ààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:633
 msgid "Checking for new messages"
 msgstr "àààà àààààààààà àààààà ààà ààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:793
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ààààà àààààà ààààà ààà ààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../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:231
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "àààààààà àààà ààà àààà: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "ààà àààà àààà àààà"
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "àààààààà: %s ààààà ààààà: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "àààààààà àààààà ààààà àààààà ààà ààà àààà: %s: %s"
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox àààà: %s: ààààà ààààà àààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "àààààà à ààààààààààààà àààà àààààà ààààà."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
-msgid "Message construction failed."
-msgstr "ààààà àààààààà ààààààà àààà."
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, 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:377
+#: ../camel/providers/local/camel-mbox-store.c:563
+#, 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:414
 #, c-format
 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:579
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "àààààà '%s' àààà ààà àààà: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:591
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "àààààà àààà ààà àààà: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:593
+msgid "Folder already exists"
+msgstr "àààààà àààààà àààààààààà ààà"
+
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3819,164 +4053,173 @@ msgstr ""
 "àààààà '%s' ààààà àààà ààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' àà àààààààà àààà àààà."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 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:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 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."
-msgstr "àààààà '%s' àààà ààà àààà: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, 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:805
 #, c-format
 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:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s'  àà '%s' àà ààà ààà ààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../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:582
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "àààà àààà àààààà àààààà %ld ààààààààààààààà ààààààààà %s ààààààà àààà"
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "àààààà %2$s ààààà ààààà %1$s àààà ààààà ààà àààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "àààààà ààààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "àààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ààààààà àààààààà àààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ààààààà ààààà ààà àààà ààà àààà %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààààà àààààà ààà ààà àààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "àààààààà ààà ààà ààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "àààààà ààààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX àààà àààààà ààà, ààààà àààààààà ààà. (ààààà àà àààààààà, ààààà ààààààà "
+"àààà àààà.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "àààààààà ààààààà àààààààààà, àààààà à à àààààà, àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ààààààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààààààà àààààààà ààààà àààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààààà àààààààà ààààà àààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
-msgid "MH append message canceled"
-msgstr "MH ààààà ààààà àààà àààà"
-
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "àààà àààààààà ààààà àààààà àààà ààà àààà: %s: %s"
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "mh àààààà: %s ààààà ààààà àààààààà àààà ààààà: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 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:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "àààààà '%s' ààààààà ààà ààà àààà: àààààà àààà."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../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:134
+#: ../camel/providers/local/camel-spool-store.c:94
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "ààààà '%s' àààà ààà àààà: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:108
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ààààà '%s' àà àààààààà àààà ààààà àààààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:416
+#, c-format
+msgid "Spool mail file %s"
+msgstr "ààààà àààà àààà %s"
+
+#: ../camel/providers/local/camel-spool-store.c:420
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "ààààà àààààà ààààà %s"
+
+#: ../camel/providers/local/camel-spool-store.c:423
+#| msgid "Invalid purpose"
+msgid "Invalid spool"
+msgstr "àààà ààààà"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "àààààà '%s/%s' àààààààààà àààà."
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3985,12 +4228,12 @@ msgstr ""
 "àààààà '%s' àààà ààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "àààààà '%s' àààààààààà àààà."
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3999,117 +4242,152 @@ msgstr ""
 "àààààà '%s' àààà ààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àààààààà àààà àààà."
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:584
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "ààààààààà àààààà àààààà ààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ààààà àààà àààà %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ààààà àààààààà ààààà ààààà ààààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "ààààà àààààà ààààà %s"
-
-#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà àààààààà ààààà ààà àààà ààààà àààà"
 
-#: ../camel/providers/local/camel-spool-store.c:237
-msgid "Spool folders cannot be deleted"
-msgstr "ààààà àààààààà ààààà ààààà ààààà àààà"
-
+#: ../camel/providers/local/camel-spool-summary.c:168
 #: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "ààààààààà àààààà àààààààààà ààà ààà àààà %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:216
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "ààààà àààààà àààààààààà ààà ààà àààà %s: %s"
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "ààààà àààààà %s: %s ààààààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
 #: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "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 ""
-"ààààà àààààà %s àààààààà ààà àààà àààà: %s\n"
-"àààààà àààààà ààààà, àààà '%s' àààà àààààààà ààà"
+"ààààà àààààà %s: %s ààààààààààà àààà ààààà\n"
+"àààààà àààààà ààà àààà, àààà '%s' ààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:290
+#: ../camel/providers/nntp/camel-nntp-folder.c:379
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àààààà àààààà: UID àààà àààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/nntp/camel-nntp-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ààààà ààààààà ààà ààà àààà %s: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "ààààà %s ààààààà àààà ààààà: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#: ../camel/providers/nntp/camel-nntp-folder.c:638
 #, c-format
 msgid "Posting failed: %s"
 msgstr "àààà ààààà àààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "àààààààà ààààà: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:662
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "àààààà ààà àààààà NNTP ààààà ààààà ààà ààà àààà!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:682
+#, 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)"
-msgstr "ààààààààà ààààà ààààà àààààà àààààà (à.àà. comp.os.linux àààà c.o.linux) (_S)"
-
 #: ../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) (_S)"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "àààààààààààà ààààà (_d) ààààà, ààààààà ààààààà ààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
+msgid "Default NNTP port"
+msgstr "àààààààààààààà NNTP ààààà"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
+msgid "NNTP over SSL"
+msgstr "SSL àààà NNTP"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "USENET ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "USENET àààààààààà àààààà àààààààà à àààààààà ààààààààààà àà ààààààààààà ààà."
+msgstr ""
+"USENET àààààààààà àààààà àààààààà à àààààààà ààààààààààà àà ààààààààààà ààà."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "àààà ààààà ààààààààà àààààà àà àààààà NNTP àààààààààààà àààààààààà àààà."
+msgstr ""
+"àààà ààààà ààààààààà àààààà àà àààààà NNTP àààààààààààà àààààààààà àààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s àààà àààààààà ààààà ààà ààà àààà: %s"
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s ààààà àààààààà ààààà ààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP àààààààààààà %s àà àààààààà àààààààà ààà àààà %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s àààààà USENET ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4120,7 +4398,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"àààààààààààà àààààààà àààààà àààààà ààààààà ààà ààà àààà: àààààààà àààààààààà "
+"ààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "ààààà ààààààààààà àààààààà àààààà ààà ààà ààà ààà àààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "ààààà àààààààààà àààààà àààààà àààà ààà àààà."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4130,7 +4426,8 @@ msgstr ""
 "\n"
 "ààà àààààààààà àààààààààà àààà. àààààààà ààààà àà àààààà ààà àààààà àààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4140,1116 +4437,1996 @@ msgstr ""
 "\n"
 "àààààààààà àààààà àààààààààà àààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "àààààààààààà àààààààà àààààà àààààà ààààààà ààà ààà àààà: àààààààà àààààààààà ààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:978
-msgid "You cannot rename a folder in a News store."
-msgstr "ààààà ààààààààààà àààààààà àààààà ààà ààà ààà ààà àààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:986
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "ààààà àààààààààà àààààà àààààà àààà ààà àààà."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "àààààààààààà àààààà àààà àà àààààààààààààà ààà àààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ààààà àààà àààààààààà ààà ààà àààà: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
+msgstr "NNTP àààà ààààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP ààààà ààààààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "ààààà àààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "ààà àààààà àààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: àààà ààààà ààààà ààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "ààààààààààà ààààààààà ààààààààà àààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "àààààààààààà ààààààààà ààààààààà àààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "àààà ààà ààà ààààà"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ààààààààà ààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
-msgid "Retrieving POP summary"
-msgstr "ààà àààààà ààà ààààààà ààà ààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "ààà àààààà àààà àààà: %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:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, 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:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ààà ààààà ààà ààààààà ààà ààà %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
+msgid "Retrieving POP summary"
+msgstr "ààà àààààà ààà ààààààà ààà ààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
+msgstr "POP àààààà ààààààà àààà ààààà: "
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
+msgid "Expunging old messages"
+msgstr "àààà ààààà àààà àààà ààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
+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 "ààààààà ààààà àààà (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ààààààààà ààààà àààà (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ààààààà àààààààà ààààà àààààààààà àààà ààà (_e)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "àààà POP3 ààààààà ààààà àààààà àààààààààààà ààà (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "àààààààààààààà POP3 ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3 ààààà SSL"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP àààààààààààà àààààà ààà à àààààààà ààà àààààà àààà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"àààà ààààà ààààààààà àààààà àà àààààà POP ààààààà ààààà àààà. àà ààà àààààà àààà "
+"àààà ààààà ààààààààà àààààà àà àààààà POP ààààààà ààààà àààà. àà ààà àààààà "
+"àààà "
 "ààààààà àààààààààààà ààà ààà ààààà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"APOP ààààààààààààààà ààààààààààà ààààààààà àààààà àà àààààà POP àààààààààààà ààààà "
+"APOP ààààààààààààààà ààààààààààà ààààààààà àààààà àà àààààà POP àààààààààààà "
+"ààààà "
 "àààà. àà àààà ààààààààààààààà àààà àà ààààààààààà ààà ààààà ààà àààà ààààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#. 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:136
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ààààà %s ààààà ààà àààààààà àààààààà àààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "àààà àààààààà ààààààà àààà ààà àààààààààààà %s àààààà àààààààà àààà ààà : %s"
+msgstr ""
+"àààà àààààààà ààààààà àààà ààà àààààààààààà %s àààààà àààààààà àààà ààà : %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
 msgstr "STLS àà ààààà àààààà ààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
-msgid "TLS is not available in this build"
-msgstr "TLS àà àààààà ààààà àààààà àààà"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#, 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 "àààààààà ààà%2$s ààààà POP ààààààà %1$s àà ààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP àààààààààààà àààààà ààààà ààà àààà %s"
+#| 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 ààààààà %1$s àà ààààà ààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"POP àààààààààààà ààààà àààààààà àààà %s: àààààà àààààààà àààààààààà àààààààààà àà àààà "
-"ààà àààà."
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr "àààà POP ààààà àààà àààààà àààà ààà àààà %s: SASL ààààààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:310
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL '%s' POP ààààà %s ààààà ààààà ààààà: %s"
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "POP ààààààà %s àà ààà ààààà ààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:359
 #, c-format
-msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "àààà POP ààààà àààà àààààà àààà ààà àààà %s: SASL ààààààààààà àààààà"
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "POP3 ààààààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:362
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "POP ààààà àààà àààààààààà ààà àààà àààà %s: %s"
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "%2$s àààà %1$s ààààà POP3 ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ààààà %s àà àààààà ààà ààà àààà:\tàààà APOP ID ààààààà. àààààà àààààà ààààà àààà. "
+"POP ààààà %s àà àààààà ààà ààà àààà:\tàààà APOP ID ààààààà. àààààà àààààà "
+"ààààà àààà. "
 "ààààà ààààààà àààààààà àààààà ààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:577
 #, 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 ""
-"ààà àààààààààààà ààààà àààà ààà àààà %s.\n"
-"ààààààààà ààààààààà àààààà àààà: %s"
+"POP ààààààà %s àà ààààà ààààà.\n"
+"ààààààà àààààààààà àààààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, 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 ""
-"ààà àààààààààààà ààààà àààà ààà àààà %s.\n"
-"àààààààààààààà ààà ààààààààà àààààà àààà: %s"
+"POP ààààààà %s àà ààààà ààààà.\n"
+"àààààààààààà%s àààààààààà àààààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:650
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP àààààààààààà àààààà ààààà ààà àààà %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ààà àààààà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:695
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ààààààààààà àààààà àààààà ààààà àààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "àààà ààààà"
 
-#: ../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."
 msgstr "ààààààà ààààààààà àààààààà\" àààààààààààà ààà àààààà ààà ààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "àààà ààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "ààààààààààà àààà àààààààààààààààà ààà ààààààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "àààààààààà àààà ààààà àààà ààà àààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "àààà ààààààààààààà àààà ààààààà àààà ààà àààà: %s: àààà ààààààà àààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "ààààààààà àààà ààààà àààà ààà àààà: %s: àààà ààààààà àààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "ààààà àààààà ààààà: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "ààààààààààààà ààààààààà àààà ààààà àààà %s: àààà ààààààà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "àààààà ààà àààà %s: àààà ààààààà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "àààààààà ààààààààà àààà ààààà àààà %d: àààà ààààààà àààà."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "àààà ààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "àààààààààààààà SMTP ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "ààààààààààà àààà àààààààààààààààà ààà ààààààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SMTP ààààà SSL"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "ààààà àààààààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP àààààà àààààà àààààààà àààààà ààààà àààà ààààààà ààà ààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "àààààà àààààààà àààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "àààà àààààààà ààààààà %s SMTP àààààààààààà àààààà ààààà ààà àààà : %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#, 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 ààààààà %1$s àà ààààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP ààààà %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s àààààà SMTP àààà ààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#, c-format
+#| msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "SMTP ààààààà %s, %s ààà àààààààà àààààà ààààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#, c-format
+msgid "No SASL mechanism was specified"
+msgstr "SASL àààààà ààààààààà àààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:459
+msgid "SMTP Authentication"
+msgstr "SMTP àààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "AUTH àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ààààà ààààà ààà: àààà ààààààà àààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ààààà ààààà ààà: àààààààààààà ààààà àààààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
+msgid "Sending message"
+msgstr "ààààà ààààà ààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ààààà ààààà ààà àààà: àààààà àààààààà ààààà."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ààààà àààààààà àààà: àà ààààà ààààà àààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "àààààààà àààààà, ààààà ààààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "ààààààààà àà ààààààà àààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "ààààà ààààà àààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "ààààà ààààààà ààààà àààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "ààààààà àààààà ààààà ààààààà ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "ààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "àààààà ààààààà àààà ààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "àààààà àààààà àààà, àààààààà ààààààà ààààà ààà ààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "àààààà àààààà ààà àààà ààààà, ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "ààààààààà ààààààà àààà; <ààààà-àààààààà> àààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "àààààà ààààà ààààààà ààààà àààà àààà: àààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààà àààààà àààà ààààà àààà àààà: àààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "àààààà àààààà àààà àààààà àààà: àààààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "ààààààààà ààààààà àààà; <ààààà-àààààààà> ààààà ààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "àààààà àààààà àààà ààààà àààà: ààààà ààààààà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "àààààà àààààà ààà àààà àààààà àààà: àààààààààà àààààààààààà ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "àààààà àààààà àààà àààà àààà: àààààààààààà àààààà ààààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "àààà ààààà àààà ààà; <CRLF>.<CRLF> ààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "àààààààààààààà àààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "àààààààààà ààààà àààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààà àààààààà àààààààààà àààààààààà ààààààààààààà àààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
-msgid "Temporary authentication failure"
-msgstr "ààààààààà àààààààààààà àààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
+msgid "Temporary authentication failure"
+msgstr "ààààààààà àààààààààààà àààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+msgid "SMTP Greeting"
+msgstr "SMTP àààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "HELO àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
+msgstr "DATA àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "RSET àààà ààààà: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "QUIT àààà ààààà: "
+
+#: ../libedataserver/e-categories.c:47
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:48
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:49
+#| msgid "Business"
+msgctxt "CategoryName"
+msgid "Business"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:50
+#| msgid "Competition"
+msgctxt "CategoryName"
+msgid "Competition"
+msgstr "ààààààààààà"
+
+#: ../libedataserver/e-categories.c:51
+#| msgid "Favorites"
+msgctxt "CategoryName"
+msgid "Favorites"
+msgstr "ààààà"
+
+#: ../libedataserver/e-categories.c:52
+#| msgid "Gifts"
+msgctxt "CategoryName"
+msgid "Gifts"
+msgstr "ààààà"
+
+#: ../libedataserver/e-categories.c:53
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
+msgid "Goals/Objectives"
+msgstr "àààààà/àààààààà"
+
+#: ../libedataserver/e-categories.c:54
+#| msgid "Holiday"
+msgctxt "CategoryName"
+msgid "Holiday"
+msgstr "àààààà"
+
+#: ../libedataserver/e-categories.c:55
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
+msgid "Holiday Cards"
+msgstr "àààààà ààààà"
+
+#. important people (e.g. new business partners)
+#: ../libedataserver/e-categories.c:57
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
+msgid "Hot Contacts"
+msgstr "àààààààààà àààààà"
+
+#: ../libedataserver/e-categories.c:58
+#| msgid "Ideas"
+msgctxt "CategoryName"
+msgid "Ideas"
+msgstr "ààààà"
+
+#: ../libedataserver/e-categories.c:59
+#| msgid "International"
+msgctxt "CategoryName"
+msgid "International"
+msgstr "ààààààààààààà"
+
+#: ../libedataserver/e-categories.c:60
+#| msgid "Key Customer"
+msgctxt "CategoryName"
+msgid "Key Customer"
+msgstr "ààààà àààààà"
+
+#: ../libedataserver/e-categories.c:61
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
+msgid "Miscellaneous"
+msgstr "ààààà"
+
+#: ../libedataserver/e-categories.c:62
+#| msgid "Personal"
+msgctxt "CategoryName"
+msgid "Personal"
+msgstr "àààààààà"
+
+#: ../libedataserver/e-categories.c:63
+#| 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:65
+#| msgid "Status"
+msgctxt "CategoryName"
+msgid "Status"
+msgstr "àààààà"
+
+#: ../libedataserver/e-categories.c:66
+#| msgid "Strategies"
+msgctxt "CategoryName"
+msgid "Strategies"
+msgstr "àààààà"
+
+#: ../libedataserver/e-categories.c:67
+#| msgid "Suppliers"
+msgctxt "CategoryName"
+msgid "Suppliers"
+msgstr "ààààààààà"
+
+#: ../libedataserver/e-categories.c:68
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
+msgid "Time & Expenses"
+msgstr "ààà à àààà"
+
+#: ../libedataserver/e-categories.c:69
+#| msgid "VIP"
+msgctxt "CategoryName"
+msgid "VIP"
+msgstr "VIP"
+
+#: ../libedataserver/e-categories.c:70
+#| msgid "Waiting"
+msgctxt "CategoryName"
+msgid "Waiting"
+msgstr "ààà àààà ààà"
+
+#: ../libedataserver/e-client.c:125
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "ààààà ààà àààà àààà"
+
+#: ../libedataserver/e-client.c:127
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "ààààààà ààààààààà ààà àààà"
+
+#: ../libedataserver/e-client.c:135
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "àààààà àààààààà"
+
+#: ../libedataserver/e-client.c:157
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "àà-àà àààààà"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+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.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+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.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+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.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+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:1666
+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:1671
+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:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
+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:1681
+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:1685
+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:1690
+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:1695
+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:1700
+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:1705
+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:1708 ../libedataserver/e-time-utils.c:1797
+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:1868 ../libedataserver/e-time-utils.c:1988
+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:1872 ../libedataserver/e-time-utils.c:1980
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. * in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+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:1881 ../libedataserver/e-time-utils.c:1977
+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:1884
+msgid "%H%M"
+msgstr "%H%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:1888
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr "àààààààààààà àààààààà àààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+"ààààà àààààààà àààààààà. \"0\" àààààà ààààààà, \"1\" àààààà àààààààà, \"2\" "
+"àààààà àààààààà àààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr "http-proxy àà àààà àààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr "HTTP ààààààààààà àààààààààà àààà àààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr "àààààààà ààààààààà ààà ààààààààà àààààààà ààà"
+
+#: ../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 "àààààààà àààààààààààà àààààààààà ààà ààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr "HTTP ààààààààààà ààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr "HTTP ààààààààààà àààààààààààà àààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr "HTTP ààààààààààà ààààà ààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr "HTTP ààààààààààà àààààààààààà ààààà ààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#| msgid "Unknown authentication state."
+msgid "Proxy authentication user name"
+msgstr "àààààààà àààààààààààààà ààààààààà ààà"
+
+#: ../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 "àààààààààà àààààààààààààà ààààààà"
+
+#: ../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 "àààààààà àààààààààààààà àààààààààààààà àààààààààààà ààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr "àààààààààààà ààààà àààààààààà ààààààà àààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr "àààààààààà àààà à àààààààà ààààààààà àààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr "HTTPS ààààààààààà ààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr "HTTPS ààààààààààà àààààààààààà ààààà ààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr "HTTPS ààààààààààà ààààà ààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr "HTTPS ààààààààààà àààààààààààà ààààà ààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid "Host name for SOCKS requests"
+msgstr "SOCKS ààààààààààà àààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr "SOCKS ààààààààààà àààààààààà àààààà ààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr "SOCKS ààààààààààà ààààà ààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr "SOCKS ààààààààààà àààààààààààà ààààà ààààààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr "ààààà àààààààà àààààà URL"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Where to read automatic proxy configuration from."
+msgstr "ààààà àààààààà àààààà ààààà ààààààà."
+
+#: ../libedataserverui/e-book-auth-util.c:96
+#: ../libedataserverui/e-book-auth-util.c:656
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP ààààà àààààà àààààààà ààààà ààà"
+
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:423
+msgid "Failed to authenticate.\n"
+msgstr "àààààààààà ààààààà ààààà.\n"
+
+#: ../libedataserverui/e-categories-editor.c:228
+msgid "Currently _used categories:"
+msgstr "ààààà ààààààààà ààààà (_u):"
+
+#: ../libedataserverui/e-categories-editor.c:237
+msgid "_Available Categories:"
+msgstr "àààààà ààààààà (_A):"
+
+#: ../libedataserverui/e-categories-selector.c:322
+msgid "Icon"
+msgstr "ààààà"
+
+#: ../libedataserverui/e-categories-selector.c:327
+msgid "Category"
+msgstr "ààààààà"
+
+#: ../libedataserverui/e-category-completion.c:299
+#, c-format
+msgid "Create category \"%s\""
+msgstr "ààààààà \"%s\" àààà"
+
+#: ../libedataserverui/e-category-editor.c:135
+msgid "Category Icon"
+msgstr "ààààààà àààà"
+
+#: ../libedataserverui/e-category-editor.c:139
+msgid "_No Image"
+msgstr "ààààààà àààà (_N)"
+
+#: ../libedataserverui/e-category-editor.c:176
+msgid "Category _Name"
+msgstr "ààààààà ààà (_N)"
+
+#: ../libedataserverui/e-category-editor.c:184
+msgid "Category _Icon"
+msgstr "ààààààà ààà (_I)"
+
+#: ../libedataserverui/e-category-editor.c:224
+msgid "Category Properties"
+msgstr "ààààààà ààààààà"
+
+#: ../libedataserverui/e-category-editor.c:285
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "àààà ààààààààààà àààà '%s' àà àààààààà ààà. ààààà ààààà ààà àààà"
+
+#: ../libedataserverui/e-client-utils.c:856
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"àààààààààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+"àààà: %s"
+
+#: ../libedataserverui/e-client-utils.c:858
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for calendar %s (user %s)"
+msgstr "àààààààààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#: ../libedataserverui/e-client-utils.c:862
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"ààààà àààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+"àààà: %s"
+
+#: ../libedataserverui/e-client-utils.c:864
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "ààààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#: ../libedataserverui/e-client-utils.c:868
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"àààà àààà %s (ààààààààà %s) ààààà ààààààà àààà\n"
+"àààà: %s"
+
+#: ../libedataserverui/e-client-utils.c:870
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "àààà àààà %s (ààààààààà %s) ààààà ààààààà àààà"
+
+#: ../libedataserverui/e-client-utils.c:981
+#| msgid "Enter password"
+msgid "Enter Passphrase"
+msgstr "àààààààà àààà"
+
+#: ../libedataserverui/e-client-utils.c:983
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "ààààààà àààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:187
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "àààààà ààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:209
+msgid "Address B_ook:"
+msgstr "ààààà àààààààà (_o):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:217
+msgid "Cate_gory:"
+msgstr "àààààà (_g):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:235
+msgid "_Search:"
+msgstr "àààà(_S):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
+msgid "Any Category"
+msgstr "ààààààà ààààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:255
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "àààààà (_n)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Search"
+msgstr "àààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:313
+msgid "Address Book"
+msgstr "ààààà ààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:316
+msgid "Contacts"
+msgstr "àààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:433
+msgid "Select Contacts from Address Book"
+msgstr "ààààààààààà àààààààààà àààààà ààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:781
+msgid "_Add"
+msgstr "àààààà ààà (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:785
+msgid "_Remove"
+msgstr "ààààà àààà (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:957
+#, 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:2823
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "%s àààààààà àààààààà(_x)"
+
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2838
+#, c-format
+msgid "Cop_y %s"
+msgstr "%s àà àààà àààà (_y)"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2848
+#, c-format
+msgid "C_ut %s"
+msgstr "%s àààà (_u)"
+
+#. Edit Contact item
+#: ../libedataserverui/e-name-selector-entry.c:2865
+#, c-format
+msgid "_Edit %s"
+msgstr "àààààà (_E) %s"
+
+#: ../libedataserverui/e-name-selector-list.c:524
+#, c-format
+msgid "_Delete %s"
+msgstr "%s àààà ààà(_D)"
+
+#: ../libedataserverui/e-passwords.c:126
+msgid "Keyring key is unusable: no user or host name"
+msgstr "àààààà àà àààààààààààà àààà: ààààààààà ààààà ààààà ààà àààà"
+
+#: ../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:821
+#: ../libedataserverui/e-passwords-win32.c:737
+msgid "_Remember this passphrase"
+msgstr "àà àààààààààààààà àààààà àààà (_R)"
+
+#: ../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:827
+#: ../libedataserverui/e-passwords-win32.c:743
+msgid "_Remember this password"
+msgstr "ààààààààà àààààà àààà(_R)"
+
+#: ../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:91
+msgid "Select destination"
+msgstr "àààààà ààààà"
+
+#: ../libedataserverui/e-source-selector-dialog.c:166
+msgid "_Destination"
+msgstr "àààààà (_D)"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+msgid "Keep running after the last client is closed"
+msgstr "àààààà ààààààà ààà àààààààà àààà àààà"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+msgid "Wait running until at least one client is connected"
+msgstr "ààààà àà ààààààà ààààà ààààààààà àààà àààà àààà"
+
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "àààààà ààà àààààà ààà ààà (%d)... "
+
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" àà \"%s\" àààà ààà ààà"
+
+#~ msgid "book busy"
+#~ msgstr "àààààà àààààà"
+
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA ààààà \"%s\" ààà ààààààà"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: ààààààà àààà àààààà àààà"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" àà \"%s\" àààà ààà ààààà"
+
+#~ msgid "%s: canceled"
+#~ msgstr "%s: àààà àààà"
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: URI `%s' ààààà ààààààà àààààà àààà"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: EBookListener ààààà ààà àààà"
+
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: gconf ààààà ààà àààààà UID ààààà àààà"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "àààààààààà ààààà àààà ààààà ààà"
+
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "ààà àààààààààà ààààà àààà ààààà ààà"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "ààààà ààààààà: àààààà"
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààà ààààààà: àààààà àààààà àààà"
+
+#~ msgid "Loading %s items"
+#~ msgstr "%s ààà ààà ààà ààà"
+
+#~ msgid "Calendar"
+#~ msgstr "àààààààààà"
+
+#~ msgid "Invalid server URI"
+#~ msgstr "àààà ààààà URI"
+
+#~ msgid "Cannot open message"
+#~ msgstr "ààààà àààà àààà ààà"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "àààààààà ààààà: ààààà àààà: %s àààà"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "àààààààà ààààà: àààààààààààà àààà: %s àààà"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "àààààààà ààààà: àààààààààà ààààà àààà: %s àààà"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "àààààààà ààààààààààà: UID àààààà àààà: %s ààààà"
+
+#~ msgid "Learning junk"
+#~ msgstr "ààà ààààà ààà ààà"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "ààà-ààà ààààà ààà ààà"
+
+#~ msgid "Canceled."
+#~ msgstr "àààà àààà."
+
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "àà ààààààà àààààààààà àààààààà ààà"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "ààààà ààààààààààà ààààààà àààà ààà ààà: ààààààà àààà ààààààà àààà ààà àààà: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "ààààà ààààà àààààààà ààààààà ààààà"
+
+#~ msgid "cannot create thread"
+#~ msgstr "ààààà àààà ààààààà ààà ààà"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "àà àààààà Kerberos 4 àààààààààààààà ààààààààà ààààààà àààààà àààà."
+
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "àààààààà ààààà àààà àààà àààà:\n"
+#~ "%s"
+
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "SMTP ààà POP àà ààà ààà ààààààà ààà"
+
+#~ msgid "URL '%s' needs a username component"
+#~ msgstr "'%s' àà URL àààà ààààààà àààààà ààà ààà"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "'%s' àà URL àààà ààààà àààààà ààà ààà"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "'%s' àà URL àààà ààààà àààààà ààà ààà"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "àààààà àààà ààà àààà %s:\n"
+#~ "%s"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel àààà ààààà àààààà àààà ààààà ààààà àààààà àààààà àààà."
+
+#~ 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 "Unable to get issuer's certificate"
+#~ msgstr "àààà-àààà àààààààààà àààààà àààà"
+
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "àààààààààà àààààààààà àààà àààà àààà àààà"
+
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "àààààààààà ààà ààààààààà àààà ààà àààà"
+
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "àààààààààà àààààààààà àààà ààà ààààààààà àààà ààà àààà"
+
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "àààà-àààà àààààà àà ààààà àààà ààà àààà"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "àààààààààà ààààààààà ààààààà"
+
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "àààààààààà àààààààààà àààà ààà àààà"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "àààààààààà ààààà àààà"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "àààààààààààà àààà ààààà"
+
+#~| msgid "Certificate Revocation List signature failure"
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "Certificate Revocation List (CRL) àààààà ààà àààà"
+
+#~| msgid "Certificate Revocation List signature failure"
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "Certificate Revocation List (CRL) àààààààààà ààààà"
+
+#~| msgid "Unable to get Certificate Revocation List"
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "Certificate Revocation List (CRL) àààà àààààà"
+
+#~ msgid "Out of memory"
+#~ msgstr "àààààààààà ààààà"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "àààà-ààààà àààà-ààààààààà àààààààààà"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "àààààààààà àààààààààààààà àààààààààà"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "ààààààà àààààà àààà-àààà àààààààààà àààààà àààà"
+
+#~ msgid "Unable to verify leaf signature"
+#~ 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 "àààà/ààààààà ààààà"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ààààà"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/ààààààà àààààààà ààààà"
+
+#~ 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 "Checking for new messages"
+#~ msgid "Checking for deleted messages %s"
+#~ msgstr "àààà àààààà ààààà %s ààààà àààààà ààà ààà"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ààààà àààààà ààààà àààà àààà. ààààà àààààà ààà."
+
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "àààààà '%s' ààààà ààààà àààà ààà àààà: %s"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr "àààààà ààààààà ààààà ààààà àààà ààà àààà: ààà àààààà àààà"
+
+#~ msgid "Cannot append message in offline mode: %s"
+#~ msgstr "àààààà ààààààà ààààà ààààà àààà ààà àààà: %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "àààà ààààààà ààààà ààà"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "ààà ààààààà ààààà àààà ààààà ààààà (_u)"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "àààààààààààà ààààààààààààà àààà àààààààà ààà (_z)"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "àààààà àààààààà àààààà"
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "àààà àààààààà ààààààà %s SMTP àààààààààààà àààààà ààààà ààà àààà : %s"
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "Post Office Agent SOAP ààààà (_P):"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS ààààà ààààààà: %s"
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS àààà àààà"
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "ààààààà ààààààààà ààààààààà àààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "àààààà àààààààà %s àààààààààà ààààààààà SMTP ààààààààà àààààà ààà àààà %s."
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ààààààà àààààààààà ààààààààà àààààà àà àààààà àààààààààà àààààààààààà ààààà ààà àààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP àààààààààààà àààààààààà àààà ààà àààà.\n"
-"%s\n"
-"\n"
+#~ msgid "Host or user not available in url"
+#~ msgstr "url ààààà ààààà ààà àààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ààààà %s"
+#~ msgid "You did not enter a password."
+#~ msgstr "àààààà ààààààààà àààààààà àààà àààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s àààààà SMTP àààà ààààààààà"
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr "ààààààà ààààààààà ààààààà ààààààà ààààà àààà ààààààà ààà ààà ààà ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
-msgstr "ààààà ààààà ààà: àààà ààààààà àààà."
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààààà ààààààà ààààààààà ààààà ààààààà àààà ààà àààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-msgid "Cannot send message: sender address not valid."
-msgstr "ààààà ààààà ààà: àààààààààààà ààààà àààààà."
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "Groupwise àààààà '%s' àà '%s' ààà àààààààààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-msgid "Sending message"
-msgstr "ààààà ààààà ààà"
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
-msgstr "ààààà ààààà ààà àààà: àààààà àààààààà ààààà."
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àà %s àààà ààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ààààà àààààààà àààà: àà ààààà ààààà àààààà àààààà"
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àààààà ààààààààà ààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
-msgid "SMTP Greeting"
-msgstr "SMTP àààààààà"
+#~ msgid "Sending Message"
+#~ msgstr "ààààà ààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO àààà àààà: %s"
+#~ 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 ""
+#~ "ààààà ààààààà àààààà àààààà àààà àààà ààà. ààààà ààààà àààààààà ààààà àààààà àààààà àààà ààà. "
+#~ "ààà àààà ààààà ààààà àààààààààà/ààààààà ààààààà àààààà ààààà.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO ààààà ààààààà"
+#~ msgid "Hula"
+#~ msgstr "àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
-msgid "SMTP Authentication"
-msgstr "SMTP àààààààààà"
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula ààààààààà àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
-msgid "Error creating SASL authentication object."
-msgstr "SASL àààààààààà àààà àààà àààààà àààààà."
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "ààààà ààààààààààà àààà àààà àà àààààà Hula ààààààà àààààà àààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH ààààà ààààààà: %s"
+#~ msgid "Operation cancelled"
+#~ msgstr "àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH àààà àààà"
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "APPEND àààà àààà ààààààà ààààààààà àààààààà àààààà '%s'"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "ààààà ààààà àààààà ààà àààààà àààààààà ààààààà àààà.\n"
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "APPEND àààà ààààààààààààà ààààà àààààààà ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM àààà àààà:  %s: ààà àààà àààààà"
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "APPEND àààà ààààààààààà ààààààà àààààà ààààà!"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM àààà àààà"
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "àà ààààà àààà ààààààà àààà ààààà ààààà àààààà ààààà (_A)"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO àààà àààà: %s: ààà àààà àààààà"
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "àààààààà ààààààà ààààà àààà ààààà ààààà (_k)"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> àààà"
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA àààà àààà: %s: ààà àààà àààààà"
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL ààààà àààààààà"
 
-#. 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:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATA  àààà àààà"
+#~ msgid "SSL is not available in this build"
+#~ msgstr "àààà ààààààààààà SSL àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET àààà àààà: %s"
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "IMAP ààààà àààà ààààà àààààààààà àààà ààà %s: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET àààà àààà"
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP4 ààààà %s àààà ààààààààà àààààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT àààà àààà: %s"
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "àààà ààààà %s àààà ààààààààà àààààààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT àààà àààà"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' ààààà ààà àààà: àààààà àààààààààà ààà"
 
-#: ../libedataserver/e-categories.c:47
-msgid "Business"
-msgstr "ààààààà"
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:48
-msgid "Competition"
-msgstr "ààààààààààà"
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "IMAP ààààà %s àààà àààà àààààààààà ààààà: %s"
 
-#: ../libedataserver/e-categories.c:49
-msgid "Favorites"
-msgstr "ààààà"
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 àààààààààààà %s àààààààààààà àààààà ààààà: %s"
 
-#: ../libedataserver/e-categories.c:50
-msgid "Gifts"
-msgstr "ààààà"
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "ààààà àààààà à àààààààààà àààà ààààà ààààààààà àààààà-àààà ààààà ààààààààààà àààà "
+#~ "àààààà ààà"
 
-#: ../libedataserver/e-categories.c:51
-msgid "Goals/Objectives"
-msgstr "àààààà / àààààààà"
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "X ààààààà à ààààààà ààà ààààà àààààààà ààà"
 
-#: ../libedataserver/e-categories.c:52
-msgid "Holiday"
-msgstr "àààààà"
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "X ààààà àààààà ààààà àààà ààà ààààà àààààààà ààà"
 
-#: ../libedataserver/e-categories.c:53
-msgid "Holiday Cards"
-msgstr "àààààà ààààà"
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "àààààà '%s' ààààà àààààà àààà: %s"
 
-#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
-msgid "Hot Contacts"
-msgstr "àààààààààà àààààà"
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "àààààà '%s' àà ààààà àààààà ààà ààà àààà: ààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:56
-msgid "Ideas"
-msgstr "ààààà"
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "àààààà '%s' àà ààà àààààààà ààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:57
-msgid "International"
-msgstr "àààààààààààààà"
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "àààààà '%s' ààààà ààààà ààà àààà: ààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:58
-msgid "Key Customer"
-msgstr "àà àààààà"
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà ààààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:59
-msgid "Miscellaneous"
-msgstr "ààààà"
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "àààààà '%s' ààààà ààààà %s ààààààà ààà ààà àààà: ààà ààààà àààà"
 
-#: ../libedataserver/e-categories.c:60
-msgid "Personal"
-msgstr "ààààà"
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà ààààà %s ààààààà ààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:61
-msgid "Phone Calls"
-msgstr "ààà ààààà"
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "àààààà '%s' àà ààààà àààà ààà àààà: àààààà àààà àààààààà ààà"
 
-#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
-msgid "Status"
-msgstr "àààààà"
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "àààààà '%s' àà ààààà àààà ààà àààà: ààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:64
-msgid "Strategies"
-msgstr "àààààà"
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "àààààà '%s' àà ààààà àààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:65
-msgid "Suppliers"
-msgstr "ààààààààà"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààà ààà àààà: ààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:66
-msgid "Time & Expenses"
-msgstr "ààà à àààà"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààààààà ààà ààà àààà: ààààààà àààààà"
 
-#: ../libedataserver/e-categories.c:67
-msgid "VIP"
-msgstr "VIP"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààà ààà àààà: àààààà àààà"
 
-#: ../libedataserver/e-categories.c:68
-msgid "Waiting"
-msgstr "ààààààààààà"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà àààààà '%s' àààà ààààà àààààààà ààà ààà àààà: àààààà àààà"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "ààààààà àààààà ààààà àààà ààà ààààà ààààà àààà àààà (_g)"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
 
-#. strptime format of a weekday, a date and a time,
-#. 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:1645 ../libedataserver/e-time-utils.c:1896
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %m/%d/%Y %I:%M %p"
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "IMAPv4rev1 ààààà àààà àààà ààààààààààà ààààà àààààààà àààààààààà."
 
-#. strptime format of a weekday, a date and a time,
-#. 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:1650 ../libedataserver/e-time-utils.c:1887
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %m/%d/%Y %H:%M"
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr "ààààà ààààà ààààààààà àààààà àà àààààà IMAPv4rev1 àà àààààà ààààà."
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %m/%d/%Y %I %p"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "ààààààà ààààààà IMAP ààààà %s àà àààààà ààààà: ààààà STARTTLS àà àààààà ààà àààà"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %m/%d/%Y %H"
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS àààààààà ààààà"
 
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "%s àà ààààààààààààà ààààà àààààà IMAP àààààààààààà %s àààààààààà àààà ààà àààà"
 
-#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%m/%d/%Y %I:%M:%S %p"
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "%s àà àààà àààà %s IMAP ààààà àààà àààààààààà àààà ààà àààà"
 
-#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%m/%d/%Y %H:%M:%S"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "àààààà ààààààà IMAP àààààà ààààààà àààà ààà àààà."
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%m/%d/%Y %I:%M %p"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "IMAP ààààà %s àààà àààààà '%s' ààààààà ààà ààà àààà: ààààààà àààààà"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
-msgid "%m/%d/%Y %H:%M"
-msgstr "%m/%d/%Y %H:%M"
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "IMAP ààààà %s àààà '%s' ààààà àààà ààààà àààààà ààààààà ààà ààà àààà: %s"
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
-msgid "%m/%d/%Y %I %p"
-msgstr "%m/%d/%Y %I %p"
+#~ msgid "Bad command"
+#~ msgstr "àààààà àààà"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
-msgid "%m/%d/%Y %H"
-msgstr "%m/%d/%Y %H"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' àààà ààà àààà: àààà àààààààààà ààà"
 
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "àààààà '%s' àààà ààà àààà: àààààà àààà"
 
-#. 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:1824 ../libedataserver/e-time-utils.c:1944
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "àààààà '%s' ààààà àààà ààà àààà: ààààà àààààà"
 
-#. 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:1828 ../libedataserver/e-time-utils.c:1936
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "àààààà ààààààà IMAP àààààà ààààà ààà àààà."
 
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' ààààà àààà ààà àààà: àààà àààààààààà ààà"
 
-#. 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:1837 ../libedataserver/e-time-utils.c:1933
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà àààà ààà àààà: àààààà àààà"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
-msgid "%H%M"
-msgstr "%H%M"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "àààààà '%s' àà '%s' ààà àààààààààààà ààà ààà àààà: àààààààà àààààà"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "àààààà ààààààà IMAP ààààààààà àààà ààà àààà ààà àààà."
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP ààààà àààààà àààààààà ààààà ààà"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' àà '%s' ààà àààààààààààà ààà ààà àààà: àààà àààààààààà ààà"
 
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "àààààààààà ààààààà ààààà.\n"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "àààààà '%s' àà '%s' ààà àààààààààààà ààà ààà àààà: àààààà àààà"
 
-#: ../libedataserverui/e-categories-dialog.c:327
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "àààà ààààààààààà àààà '%s' àà àààààààà ààà. ààààà ààààà ààà àààà"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "IMAP ààààà %s àààà àààà '%s' ààààà %s àààààà ààààà àààà: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:618
-msgid "Icon"
-msgstr "ààààà"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "àààààà ààààààà IMAP àààààà àààààààààà àààà ààà àààà."
 
-#: ../libedataserverui/e-categories-dialog.c:623
-msgid "Category"
-msgstr "ààààààà"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' ààààà àààààààààà àààà àààà: àààà àààààààààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "ààààààà àààà"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà àààààààààà àààà àààà: àààààà àààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "ààààààà ààààààà"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "àààààà ààààààà IMAP ààààààààà àààààààààààà àààà ààà àààà."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "ààààààà ààà (_I)"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "àààààà '%s' ààààà ààààààà ààààà ààààà ààà àààà: àààà àààààààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "ààààààà ààà (_N)"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "àààààà '%s' ààààà ààààààà àààà ààà àààà: àààààà àààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "ààà àà àààààààà àààààà àààà (_c):"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "àààààààà àààààààààà ààààà ààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "àààààà ààààààà (_A):"
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP ààààà %s àààààà ààààààà ààà."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "àààààà (_E)"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "àààà ààààààà ààààà ààààààà àààà ààà"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "ààààààà"
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "ààààààààà IMAP àààààààààààààà àààààààà àààààà ààààààààà àààà %s: "
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-msgid "Create category \"%s\""
-msgstr "ààààààà \"%s\" àààà"
+#~ msgid "No data"
+#~ msgstr "àààààà àààà"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ààà àààààà"
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP àààààààààààà %s àààààààààààà àààààà ààààà: %s"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ààààààààà àà ààà"
+#~ 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"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
-msgid "Select Contacts from Address Book"
-msgstr "ààààààààààà àààààààààà àààààà ààààà"
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "%s àà àààà ààà àààà (ààààà %s): %s"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
-msgid "_Add"
-msgstr "àààààà ààà (_A)"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "%s àààààà ààà ààààààààà àààà ààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
-msgid "_Remove"
-msgstr "ààààà àààà (_R)"
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir ààààà àààà àààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "ààààààà ààààààà"
+#~ msgid "Invalid message contents"
+#~ msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#~ msgid "Mail append canceled"
+#~ msgstr "ààà àààà àààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>àààààà (_n)</b>"
+#~ msgid "Message construction failed."
+#~ msgstr "ààààà àààààààà ààààààà àààà."
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>àààààà ààààà</b>"
+#~ msgid "MH append message canceled"
+#~ msgstr "MH ààààà ààààà àààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "ààààà àààààààà (_o):"
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "àààààààààààà àààààà àààà àà àààààààààààààà ààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "ààààà ààà"
+#~ msgid "Use cancel"
+#~ msgstr "àààà ààà ààà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "àààààà (_g):"
+#~ msgid "TLS is not available in this build"
+#~ msgstr "TLS àà àààààà ààààà àààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "àààààà"
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "POP àààààààààààà ààààà àààààààà àààà %s: àààààà àààààààà àààààààààà àààààààààà àà "
+#~ "àààà ààà àààà."
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "àààà"
+#~ msgid "SASL '%s' Login failed for POP server %s: %s"
+#~ msgstr "SASL '%s' POP ààààà %s ààààà ààààà ààààà: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "àààà(_S):"
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS àààà àààà"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2455
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "%s àààààààà àààààààà(_x)"
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP àààààààààààà àààààààààà àààà ààà àààà.\n"
+#~ "%s\n"
+#~ "\n"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
-#, c-format
-msgid "Cop_y %s"
-msgstr "%s àà àààà àààà (_y)"
+#~ msgid "HELO command failed"
+#~ msgstr "HELO ààààà ààààààà"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
-#, c-format
-msgid "C_ut %s"
-msgstr "%s àààà (_u)"
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL àààààààààà àààà àààà àààààà àààààà."
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
-#, c-format
-msgid "_Edit %s"
-msgstr "àààààà (_E) %s"
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH àààà àààà"
 
-#: ../libedataserverui/e-name-selector-list.c:469
-#, c-format
-msgid "_Delete %s"
-msgstr "%s àààà ààà(_D)"
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ààààà ààààà àààààà ààà àààààà àààààààà ààààààà àààà.\n"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "àààààà àà àààààààààààà àààà: ààààààààà ààààà ààààà ààà àààà"
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM àààà àààà:  %s: ààà àààà àààààà"
 
-#: ../libedataserverui/e-passwords.c:1093
-msgid "You have the Caps Lock key on."
-msgstr "Caps Lock àà àààà ààà."
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO àààà àààà: %s: ààà àààà àààààà"
 
-#: ../libedataserverui/e-passwords.c:1215
-msgid "_Remember this passphrase"
-msgstr "àà àààààààààààààà àààààà àààà (_R)"
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA àààà àààà: %s: ààà àààà àààààà"
 
-#: ../libedataserverui/e-passwords.c:1216
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "àà ààààààààà ààààààà ààààààààà ààààààààààààà àààààà àààà (_R)"
+#~ msgid "RSET command failed"
+#~ msgstr "RSET àààà àààà"
 
-#: ../libedataserverui/e-passwords.c:1221
-msgid "_Remember this password"
-msgstr "ààààààààà àààààà àààà(_R)"
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT àààà àààà"
 
-#: ../libedataserverui/e-passwords.c:1222
-msgid "_Remember this password for the remainder of this session"
-msgstr "àà ààààààààà ààààààà ààààààààà àà ààààààààà àààààà àààà (_R)"
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "ààà àà àààààààà àààààà àààà (_c):"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
-msgid "Select destination"
-msgstr "àààààà ààààà"
+#~ msgid "_Edit"
+#~ msgstr "àààààà (_E)"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
-msgid "_Destination"
-msgstr "àààààà (_D)"
+#~ msgid "categories"
+#~ msgstr "ààààààà"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ààààà ààààààààà àààààààà ààà"
+#~ msgid "Color Info"
+#~ msgstr "ààà àààààà"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "ààààààààà àààààààà ààà"
+#~ msgid "The color to render"
+#~ msgstr "ààààààààà àà ààà"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "àààà"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "ààààààà àààààà"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>àààààà (_n)</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "àààààà"
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>àààààà ààààà</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "ààààààà àààà"
+#~ msgid "Enter password for %s"
+#~ msgstr "%s ààààà ààààààààà àààààààà ààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "àààà"
+#~ msgid "Owner"
+#~ msgstr "àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "ààà àààààà àààà"
+#~ msgid "Publishing Editor"
+#~ msgstr "ààààààà àààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "ààààààà"
+#~ msgid "Editor"
+#~ msgstr "àààààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "àààààà"
+#~ msgid "Publishing Author"
+#~ msgstr "ààààààà àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "ààààà àààà"
+#~ msgid "Author"
+#~ msgstr "àààà"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "àààààààààà"
+#~ msgid "Non-editing Author"
+#~ msgstr "ààà àààààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "ààààààà àààààà"
+#~ msgid "Reviewer"
+#~ msgstr "ààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "àààà àààààà àààààà àààà ààà"
+#~ msgid "Contributor"
+#~ msgstr "àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "àààààà àààààààà àààààà ààà àààà"
+#~ msgid "None"
+#~ msgstr "ààààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O àààààà"
+#~ msgid "Custom"
+#~ msgstr "àààààààààà"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "àààààà àààà àààààààààà àààààà àààà àààà"
+#~ msgid "Generic error"
+#~ msgstr "ààààààà àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "àààààà àààààà àààà"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "àààà àààààà àààààà àààà ààà"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "àààààà àààààà àààààà àààààà"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "àààààà àààààààà àààààà ààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "àààà ààààààà àààààààà ààààààààà àààààà"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "àààààà àààà àààààààààà àààààà àààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "àààààà ààààààà àààà àà"
+#~ msgid "The folder is not empty"
+#~ msgstr "àààààà àààààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "àààà ààààààà àààààà ààààààààà àààààà àààà"
+#~ msgid "The specified folder was not found"
+#~ msgstr "àààààà àààààà àààààà àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "àààààààà àààààà ààààààà àà ààààà ààààà ààààà àààà"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "àààà ààààààà àààààààà ààààààààà àààààà"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "àààààààà àà àààààà àààà ààà àààà"
+#~ msgid "Operation not supported"
+#~ msgstr "àààààà ààààààà àààà àà"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "àààà àààààà àààààà àààà ààà àààà"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "àààà ààààààà àààààà ààààààààà àààààà àààà"
 
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "àààààà ààààààà àà ààààààààà àààà ààààà àààà"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "àààààààà àààààà ààààààà àà ààààà ààààà ààààà àààà"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s' àà àààààà"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "àààààààà àà àààààà àààà ààà àààà"
 
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "ààààààààà ààààààà"
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "àààà àààààà àààààà àààà ààà àààà"
 
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "àààààà ààààààààà ààààààà"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "àààààà ààààààà àà ààààààààà àààà ààààà àààà"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "àààà ààààààààà ààààààà"
+#~ msgid "%s's Folders"
+#~ msgstr "%s' àà àààààà"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "ààààààà ààààà àààà"
+#~ msgid "Personal Folders"
+#~ msgstr "ààààààààà ààààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "àààà àààààààà àààà"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "àààààà ààààààààà ààààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ààààà"
+#~ msgid "All Public Folders"
+#~ msgstr "àààà ààààààààà ààààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ààààà"
+#~ msgid "Global Address List"
+#~ msgstr "ààààààà ààààà àààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "àààà"
+#~ msgid "Deleted Items"
+#~ msgstr "àààà àààààààà àààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "àààààààà"
+#~ msgid "Drafts"
+#~ msgstr "ààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "àààààààààà ààààà"
+#~ msgid "Journal"
+#~ msgstr "ààààà"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "àààà"
+#~ msgid "Notes"
+#~ msgstr "àààà"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "àààà ààààààà"
+#~ msgid "Outbox"
+#~ msgstr "àààààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ààààààààà àààà àààààààà"
+#~ msgid "Sent Items"
+#~ msgstr "àààààààààà ààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ààààààààà àààààààà àààà"
+#~ msgid "Tasks"
+#~ msgstr "àààà"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "àààà àààààààà"
+#~ msgid "Invalid connection"
+#~ msgstr "àààà ààààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "ààààààààà ààààà àààààààà àààà àààààà"
+#~ msgid "No response from the server"
+#~ msgstr "ààààààààà àààààààà àààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "ààààààààà àààààààààà àààà àààà àààààà àààààà"
+#~ msgid "Bad parameter"
+#~ msgstr "àààà àààààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "ààààààààà àààààààààà ààààààà ààààààà àààà"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "ààààààààà ààààà àààààààà àààà àààààà"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "ààààààààà àààààààààà ààààà àààààà àààà"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "ààààààààà àààààààààà àààà àààà àààààà àààààà"
 
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "ààààààààà àààààààààà ààààààà ààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "àààà àààààààà"
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "ààààààààà àààààààààà ààààà àààààà àààà"



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