[evolution-data-server/gnome-3-4] hindi translation by Chandan Kumar



commit 272838575fa772e815ce7166b4c3faa97c4a0aa8
Author: Rajesh Ranjan <rranjan redhat com>
Date:   Tue Mar 27 12:27:03 2012 +0530

    hindi translation by Chandan Kumar

 po/hi.po | 3895 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1975 insertions(+), 1920 deletions(-)
---
diff --git a/po/hi.po b/po/hi.po
index 85099ab..8a05ef9 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,1134 +3,1131 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Rajesh Ranjan <rranjan redhat com>, 2004, 2005, 2006, 2009, 2011.
+# chandankumar(ciypro) <chandankumar 093047 gmail com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-09-03 11:37+0000\n"
-"PO-Revision-Date: 2011-09-14 14:41+0530\n"
-"Last-Translator: Rajesh <rranjan>\n"
-"Language-Team: Hindi <hindi.sf.net>\n"
+"POT-Creation-Date: 2012-03-26 09:17+0000\n"
+"PO-Revision-Date: 2012-03-26 15:55+0530\n"
+"Last-Translator: chandankumar(ciypro) <chandankumar 093047 gmail com>\n"
+"Language-Team: Hindi <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"X-DamnedLies-Scope: partial\n"
 "X-Generator: Lokalize 1.2\n"
-"Language: hi\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:823
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c: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:4597 ../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:594
+#: ../libedataserver/e-client.c:166
+msgid "Unknown error"
+msgstr "àààààà àààààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:154
+#, c-format
+msgid "Failed to remove file '%s': %s"
+msgstr "'%s' ààààà àà ààààà ààà àààà: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:177
+#, c-format
+msgid "Failed to make directory %s: %s"
+msgstr "àààààààààà %s ààààà ààà àààà: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:473
+#, c-format
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr " '%s' àààààà àà ààà hardlink ààààà ààà àààà: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:575
+#: ../addressbook/backends/file/e-book-backend-file.c:1132
+msgid "No UID in the contact"
+msgstr "àààààà ààà ààà àààààà àààà"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1566
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
 msgid "Loading..."
 msgstr "ààà àà ààà àà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:826
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
 msgid "Searching..."
 msgstr "ààà ààà àà..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2111
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr "ààà àààààààà %s àà ààà àààààà ààààà ààà àààà"
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:788
+#: ../addressbook/backends/google/e-book-backend-google.c:874
 msgid "Querying for updated contactsâ"
-msgstr ""
+msgstr "àààààà àààà àà àààààààà àà ààà àààààà àààà àà ààà àà ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:839
-#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1337
-#: ../libedataserver/e-client.c:1851
+#: ../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:1920
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:841
-#| msgid "Favorites"
+#: ../addressbook/backends/google/e-book-backend-google.c:925
 msgid "Friends"
 msgstr "ààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:843
-#| msgid "Family Name"
+#: ../addressbook/backends/google/e-book-backend-google.c:927
 msgid "Family"
 msgstr "àààààà"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:845
+#: ../addressbook/backends/google/e-book-backend-google.c:929
 msgid "Coworkers"
 msgstr "ààààààà"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:924
+#: ../addressbook/backends/google/e-book-backend-google.c:1019
 msgid "Querying for updated groupsâ"
-msgstr ""
+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:1329
+#: ../addressbook/backends/google/e-book-backend-google.c:1451
 msgid "Creating new contactâ"
-msgstr ""
+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:1433
+#: ../addressbook/backends/google/e-book-backend-google.c:1568
 msgid "Deleting contactâ"
-msgstr ""
+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 "The backend does not support bulk modifications"
+msgstr "àààààà ààà àààààà àà àààààà àààà àààà ààà"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1699
+#: ../addressbook/backends/google/e-book-backend-google.c:1851
 msgid "Modifying contactâ"
-msgstr ""
+msgstr "àààààà ààààààà àà ààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1892
-#| msgid "Loading..."
+#: ../addressbook/backends/google/e-book-backend-google.c:2058
 msgid "Loadingâ"
 msgstr "ààà àà ààà àà..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2047
-#, fuzzy
-#| msgid "Authentication required"
+#: ../addressbook/backends/google/e-book-backend-google.c:2187
 msgid "Authenticating with the serverâ"
-msgstr "ààààààà àààààà"
+msgstr "ààààà àà ààà ààààààà àààà àà ààà àà ..."
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
-#| msgid "Not connected."
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:177
 msgid "Not connected"
 msgstr "ààààààà àààà."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
 msgid "Using Distinguished Name (DN)"
 msgstr "ààààààà ààà àà ààààà àà ààà àà (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
 msgid "Using Email Address"
 msgstr "àààà ààà àà ààààà àà ààà àà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ààààà àà àààà ààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
-#| msgid "Invalid argument"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
 msgid "Invalid DN syntax"
 msgstr "àààà DN ààààààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
+#: ../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:1818
+#: ../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:2250
+#: ../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:4559
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4720
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ààà àààààà àà ààà àà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
 msgid "Error performing search"
 msgstr "ààààààà ààà àààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "àààààà ààààààà àà ààà àà (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:442
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4439 ../calendar/libecal/e-cal-client.c:140
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imapx/camel-imapx-server.c:2250
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
-#: ../libedataserver/e-client.c:152
-msgid "Unknown error"
-msgstr "àààààà àààààà"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr ""
+msgstr "àààààà '%s' ààààà ààà àààà HTTP àààààà àà ààà: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3158
+#: ../addressbook/libebook/e-book.c:3198
 #, c-format
-#| 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: ààà ààà àààààà UID `%s' àà àààà GConf ààà ààààààà àààà àà"
 
-#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1317
-#: ../libedataserver/e-client.c:1846
+#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
+#: ../libedataserver/e-client.c:1915
 msgid "On This Computer"
 msgstr "àà ààààààààà àà"
 
-#: ../addressbook/libebook/e-book.c:3592
-#: ../addressbook/libebook/e-book-client.c:635
-#: ../addressbook/libedata-book/e-data-book.c:310
-#| msgid "Folder '%s/%s' does not exist."
+#: ../addressbook/libebook/e-book.c:3640
+#: ../addressbook/libebook/e-book-client.c:702
+#: ../addressbook/libedata-book/e-data-book.c:322
 msgid "Address book does not exist"
 msgstr "ààà àààààààà ààààà àààà àà."
 
-#: ../addressbook/libebook/e-book-client.c:85
-#| msgid "No such folder %s"
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ààà ààà ààààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:87
-#: ../addressbook/libedata-book/e-data-book.c:303
-#| msgid "Object not found"
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "àààààà àààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:89
-#: ../addressbook/libedata-book/e-data-book.c:304
-#| msgid "Object ID already exists"
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "àààààà ID àààà àà ààààà"
 
-#: ../addressbook/libebook/e-book-client.c:91
-#| msgid "No such message"
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "ààà ààà ààààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:93
-#: ../addressbook/libedata-book/e-data-book.c:320
-#| msgid "Namespace"
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "ààà ààà ààààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:449
-#, fuzzy
-#| msgid "Failed to encode data"
+#: ../addressbook/libebook/e-book-client.c:515
 msgid "Failed to run book factory"
-msgstr "àààààà ààààà ààà àààà"
+msgstr "àààààà ààààààà ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:459
-#: ../addressbook/libedata-book/e-data-book-factory.c:375
-#: ../addressbook/libedata-book/e-data-book-factory.c:433
-#: ../calendar/libecal/e-cal-client.c:565
-#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#: ../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:560
-#: ../calendar/libecal/e-cal-client.c:678
+#: ../addressbook/libebook/e-book-client.c:627
+#: ../calendar/libecal/e-cal-client.c:728
 #, c-format
 msgid "Incorrect uri '%s'"
-msgstr ""
+msgstr "ààà uri '%s'"
 
-#: ../addressbook/libebook/e-book-client.c:598
-#, fuzzy
-#| msgid "Failed on message %d"
+#: ../addressbook/libebook/e-book-client.c:665
 msgid "Failed to find system book"
-msgstr "%d ààààà àà àààà"
+msgstr "ààààààà ààààà àà ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-book-client.c:705
-#: ../calendar/libecal/e-cal-client.c:826
-#, fuzzy, c-format
-#| msgid "%s: there was no source for uid `%s' stored in gconf."
+#: ../addressbook/libebook/e-book-client.c:774
+#: ../calendar/libecal/e-cal-client.c:881
+#, c-format
 msgid "There was no source for UID '%s' stored in a source list."
-msgstr "%s: ààà ààà àààààà uid `%s' àà àààà gconf ààà ààààààà àààà àà"
+msgstr "ààààà àààà ààà àààààà '%s' àà ààà ààà ààààà àààààààà àààà àà."
 
-#: ../addressbook/libebook/e-book-client.c:2094
-#: ../calendar/libecal/e-cal-client.c:4132
-#, fuzzy
-#| msgid "Connection to Server"
+#: ../addressbook/libebook/e-book-client.c:2566
+#: ../calendar/libecal/e-cal-client.c:4536
 msgid "Cannot get connection to view"
-msgstr "ààààà àà ààààà"
+msgstr "ààààà àà ààà ààààààà àààà àààà"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "àààààààà ID"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "àààà ààààààà àààà àààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:128
 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:127
+#. * so we can set the N property (since evo 1.4 works fine with
+#. * vcards that don't even have a N attribute.  *sigh*)
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "àààà ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "àààààà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ààààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "Email 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "Email 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "Email 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "Email 4"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "àààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "àà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "àààà ààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "ààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "ààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "àààààààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "àààààààà"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "àààààà URL"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ààààààà "
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:88
 msgid "Categories"
 msgstr "ààààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "àààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà URI"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS àààààà"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "àààààà ààààààà URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ààà/ààààà àà àààà"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "ààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààà àààààà ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààà àààààà ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààà àààààà ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààà àààààà ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààà àààààà ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààà àààààà ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#| msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
-#| msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#| msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
-#| msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "àààà ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:210
-#| msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "àààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:211
-#| msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "àààà ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ààààà ààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ààààà ààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ààààà ààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#| msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "àààààààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#| msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "àààààààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#| msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "àààààààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:227
-#| msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "àààààààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:228
-#| msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "àààààààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:229
-#| msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "àààààààà ààààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ààààà ààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:233
+#. Translators: This is an EContact field description, in this case it's a
+#. virtual field, which returns either name of the contact or the organization
+#. name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ààà àà ààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "àà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "àààà àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "àààà ààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "àààààà àààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:248
+#. Translators: This is an EContact field description, in this case it's a name
+#. of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "àààà àààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:253
-#| msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "àààà àààààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:254
-#| msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "àààà ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:257
-#| msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ICQ ID àààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML ààà ààààà àà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#. Translators: This is an EContact field description, in this case it's a
+#. field describing whether it's a Contact list (list of email addresses) or a
+#. regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a flag
+#. used to determine whether when sending to Contact lists the addresses should be
+#. shown or not to other recipients - basically whether to use BCC field or CC
+#. message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
 msgid "List Show Addresses"
 msgstr "ààààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
 msgid "Anniversary"
 msgstr "àààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:270
-#| msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "àààà-àààà ààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#| msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "àààà-àààà ààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#| msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "àààà-àààà ààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#| msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "àààà-àààà ààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:274
-#| msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "àààà-àààà ààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:275
-#| msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "àààà-àààà ààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:276
-#| msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "àààà-àààà ID àààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "àààààà ààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "àààààà ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "àààààà ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "àààààà ààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "àààààà ààààà ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "àààààà ààààà ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "àààààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP ààà"
 
-#: ../addressbook/libebook/e-contact.c:293
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "àààà ààà ààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:294
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "àààà ààà ààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:295
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "àààà ààà ààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:296
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "àààà ààà ààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:297
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "àààà ààà ààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:298
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "àààà ààà ààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:299
-#| msgid "Skype Name List"
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "àààà ààà ààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:1550
-#: ../addressbook/libebook/e-destination.c:868
+#: ../addressbook/libebook/e-contact.c:1611
+#: ../addressbook/libebook/e-destination.c:878
 msgid "Unnamed List"
 msgstr "àààààà àààà"
 
 #: ../addressbook/libedata-book/e-book-backend.c:19
 msgid "Cannot process, book backend is opening"
-msgstr ""
+msgstr "ààààààààà àààà àà àààà, ààà àààààà ààà ààà àà"
 
-#: ../addressbook/libedata-book/e-book-backend.c:92
-#, fuzzy, c-format
-#| msgid "Unknown error: %s"
+#: ../addressbook/libedata-book/e-book-backend.c:91
+#, c-format
 msgid "Unknown book property '%s'"
-msgstr "àààààà ààà:%s"
+msgstr "àààààà àààààà ààà '%s'"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
-#, fuzzy, c-format
-#| msgid "Cannot create folder '%s': %s"
+#: ../addressbook/libedata-book/e-book-backend.c:108
+#, c-format
 msgid "Cannot change value of book property '%s'"
-msgstr "'%s' ààààààà àààà ààà àààà àà: %s"
+msgstr "àààààà ààà '%s' àà ààà àààà ààà àààà ààà"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
-#: ../camel/camel-db.c:470
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ààààààààà àààààà"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "àààààà '%s' àààà àààà"
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../addressbook/libedata-book/e-data-book.c:209
-#: ../addressbook/libedata-book/e-data-book.c:694
-#| msgid "Invalid query"
+#: ../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: "
 msgstr "àààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "ààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4407 ../calendar/libedata-cal/e-data-cal.c:415
-#: ../libedataserver/e-client.c:111
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:123
 msgid "Backend is busy"
 msgstr "àààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
-#| msgid "Repository is offline"
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
 msgid "Repository offline"
 msgstr "àààààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4421 ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:125
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:139
 msgid "Permission denied"
 msgstr "àààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:422
-#| msgid "Authentication failed"
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:423
-#| msgid "Authentication required"
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "àààààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:133
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:147
 msgid "Unsupported authentication method"
 msgstr "àààààààà ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:135
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:149
 msgid "TLS not available"
 msgstr "TLS àààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
-msgstr ""
+msgstr "ààà ààààà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:430
-#| msgid "This message is not available in offline mode."
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "ààààààà ààà àààààà àààà àà."
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:151
 msgid "Search size limit exceeded"
 msgstr "ààà àààà àààà àààààà àà ààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:153
 msgid "Search time limit exceeded"
 msgstr "ààà ààà àààà ààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:155
 msgid "Invalid query"
 msgstr "àààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:143
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:157
 msgid "Query refused"
 msgstr "àààààà àààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:129
-#| msgid "%s: could not cancel"
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:143
 msgid "Could not cancel"
 msgstr "àààà àààà àà ààà"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "àààà ààààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4405 ../calendar/libedata-cal/e-data-cal.c:438
-#: ../libedataserver/e-client.c:109
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4563 ../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:323
-#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:440
-#: ../libedataserver/e-client.c:131
-#| msgid "Protocol not supported"
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:145
 msgid "Not supported"
 msgstr "ààààààà àààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
-#, fuzzy
-#| msgid "Backend is busy"
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:163
 msgid "Backend is not opened yet"
-msgstr "àààààààà àààààà"
+msgstr "àààààà ààà àà àààà àààà àà"
 
-#: ../addressbook/libedata-book/e-data-book.c:332
-#: ../calendar/libecal/e-cal-client.c:573
-#: ../calendar/libedata-cal/e-data-cal.c:449 ../libedataserver/e-client.c:147
-#| msgid "I/O error"
+#: ../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:161
 msgid "Other error"
 msgstr "àààà àààààà"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:536
-#: ../addressbook/libedata-book/e-data-book.c:866
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 msgid "Cannot get contact: "
 msgstr "àààààà àààà àà àààà àà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
-#: ../addressbook/libedata-book/e-data-book.c:580
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
-msgstr ""
+msgstr "ààààà àààààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:602
-#: ../addressbook/libedata-book/e-data-book.c:932
-#| msgid "Cannot add encryption certificate"
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot add contact: "
 msgstr "àààààà àààà àààà àààà àà"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:624
-#: ../addressbook/libedata-book/e-data-book.c:951
-#, fuzzy
-#| msgid "Cannot get folder container %s"
-msgid "Cannot modify contact: "
-msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+#: ../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:717
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, fuzzy
-#| msgid "Cannot authenticate to server: %s"
+#: ../addressbook/libedata-book/e-data-book.c:759
+#: ../calendar/libedata-cal/e-data-cal.c:866
 msgid "Cannot authenticate user: "
-msgstr "ààààà àà ààààààà àààà àà ààà: %s"
+msgstr "ààààà àà ààààààà àààà àà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:779
-#| msgid "Cannot open mailbox: %s: %s\n"
+#: ../addressbook/libedata-book/e-data-book.c:830
 msgid "Cannot open book: "
 msgstr "àààààà ààà àààà àààà àà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:793
+#: ../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:818
+#: ../addressbook/libedata-book/e-data-book.c:873
 msgid "Cannot refresh address book: "
-msgstr ""
+msgstr "ààà àààààààà àà ààààà àààà àà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:834
+#: ../addressbook/libedata-book/e-data-book.c:899
 msgid "Cannot get backend property: "
-msgstr ""
+msgstr "àààààà ààà ààààààà àààà àà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:850
-#: ../calendar/libedata-cal/e-data-cal.c:1001
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 msgid "Cannot set backend property: "
-msgstr ""
+msgstr "àààààà ààà ààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:881
-#, fuzzy
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list: "
-msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+msgstr "àààààà àààà ààààààà àààà àà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:905
-#, fuzzy
-#| msgid "Cannot get folder container %s"
+#: ../addressbook/libedata-book/e-data-book.c:995
 msgid "Cannot get contact list uids: "
-msgstr "ààààààà àààààà àààà àà àààà àà: %s"
+msgstr "àààààà àààà uids ààààààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:969
-#, fuzzy
-#| msgid "Cannot create encoder context"
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
-msgstr "àààààà àààààà àààà ààà àààà"
+msgstr "àààààà àà ààà àààà àààà ààà:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:359
-#: ../addressbook/libedata-book/e-data-book-factory.c:392
-#: ../calendar/libedata-cal/e-data-cal-factory.c:410
+#: ../addressbook/libedata-book/e-data-book-factory.c: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:518
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Server is unreachable (%s)"
-msgstr ""
+msgstr "ààààà àà ààààà ààààà àààà àà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
-#, fuzzy, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
-msgstr ""
-"ààààààààààà GnuPG àààààà ààààà encountered:\n"
-"\n"
-"%s"
+msgstr "ààààààààààà HTTP àààààà ààà %d àààà (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c: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:4272
+#: ../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 address book %s (user %s)\n"
+"Reason: %s"
 msgstr ""
+"ààà àààààààà %s àà ààà ààààààà àààà àààà (àààààààà %s)\n"
+"àààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
+#: ../libedataserverui/e-client-utils.c:877
+#, c-format
+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:752
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
 #, c-format
 msgid "Birthday: %s"
 msgstr "ààààààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
 #, c-format
 msgid "Anniversary: %s"
 msgstr "àààààààà: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../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:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "àààààà àààà àààà àààà ààà"
 
@@ -1138,17 +1135,17 @@ msgstr "àààààà àààà àààà àààà ààà"
 msgid "Redirected to Invalid URI"
 msgstr "àààààà URI ààà àààààààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:443
+#: ../calendar/backends/http/e-cal-backend-http.c:446
 msgid "Bad file format."
 msgstr "ààà àààà ààààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:450
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Not a calendar."
 msgstr "àààààà àààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:764
-#: ../calendar/backends/http/e-cal-backend-http.c:765
-#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+#: ../calendar/backends/http/e-cal-backend-http.c: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 "ààà àààà àààà ààà ààà"
 
@@ -1156,422 +1153,421 @@ msgstr "ààà àààà àààà ààà ààà"
 msgid "Could not retrieve weather data"
 msgstr "àààà àààà àààà àà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Fog"
 msgstr "àààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy Night"
 msgstr "àààà: àààà ààààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Cloudy"
 msgstr "àààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Overcast"
 msgstr "àààà: àààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Showers"
 msgstr "àààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Snow"
 msgstr "àààà: àààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Clear Night"
 msgstr "àààà: ààà ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Sunny"
 msgstr "àààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Thunderstorms"
 msgstr "àààà: ààààààààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:439
+#: ../calendar/backends/weather/e-cal-backend-weather.c:435
 msgid "Forecast"
 msgstr "ààààààààààà"
 
-#: ../calendar/libecal/e-cal.c:867 ../libedataserverui/e-book-auth-util.c:198
-#: ../libedataserverui/e-book-auth-util.c:417
+#: ../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.
+#. * This password prompt will be prompted rarely. Since the key that is passed to
+#. * the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:881
+#: ../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:4409
+#: ../calendar/libecal/e-cal.c:4567
 msgid "Repository is offline"
 msgstr "àààààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4411 ../calendar/libecal/e-cal-client.c:127
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:137
 msgid "No such calendar"
 msgstr "ààà ààà àààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4413 ../calendar/libecal/e-cal-client.c:129
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal.c:4571 ../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:4415 ../calendar/libecal/e-cal-client.c:131
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "àààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4417
+#: ../calendar/libecal/e-cal.c:4575
 msgid "URI not loaded"
 msgstr "URI ààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4419
+#: ../calendar/libecal/e-cal.c:4577
 msgid "URI already loaded"
 msgstr "URI àààà àà ààà"
 
-#: ../calendar/libecal/e-cal.c:4423
+#: ../calendar/libecal/e-cal.c:4581
 msgid "Unknown User"
 msgstr "àààààà àààààààà"
 
-#: ../calendar/libecal/e-cal.c:4425 ../calendar/libecal/e-cal-client.c:135
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:4583 ../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:4427
+#: ../calendar/libecal/e-cal.c:4585
 msgid "Protocol not supported"
 msgstr "ààààààààà ààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4429
+#: ../calendar/libecal/e-cal.c:4587
 msgid "Operation has been canceled"
 msgstr "àààààà àààà àààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4431
+#: ../calendar/libecal/e-cal.c:4589
 msgid "Could not cancel operation"
 msgstr "àààààà àààà àààà àà ààà"
 
-#: ../calendar/libecal/e-cal.c:4433 ../libedataserver/e-client.c:117
+#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:129
 msgid "Authentication failed"
 msgstr "ààààààà àààà"
 
-#: ../calendar/libecal/e-cal.c:4435
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-#: ../libedataserver/e-client.c:119
+#: ../calendar/libecal/e-cal.c:4593
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:131
 msgid "Authentication required"
 msgstr "ààààààà àààààà"
 
-#: ../calendar/libecal/e-cal.c:4437
-#, fuzzy
-#| msgid "A CORBA exception has occurred"
+#: ../calendar/libecal/e-cal.c:4595
 msgid "A D-Bus exception has occurred"
-msgstr "CORBA ààààà àààà ààà"
+msgstr "A D-Bus ààààà àààà ààà"
 
-#: ../calendar/libecal/e-cal.c:4441
+#: ../calendar/libecal/e-cal.c:4599
 msgid "No error"
 msgstr "ààà àààà àààà"
 
-#: ../calendar/libecal/e-cal-client.c:133
-#: ../calendar/libedata-cal/e-data-cal.c:429
-#| msgid "Unknown User"
+#: ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "àààààà àààààààà"
 
-#: ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:418
+#: ../calendar/libecal/e-cal-client.c:147
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "àààà ààààà"
 
-#: ../calendar/libecal/e-cal-client.c:555
-#, fuzzy
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:603
 msgid "Failed to run calendar factory"
-msgstr "àààààà ààààà ààà àààà"
+msgstr "àààààà ààààààà ààààà ààà àààà"
 
-#: ../calendar/libecal/e-cal-client.c:717
-#, fuzzy
-#| msgid "Failed to encode data"
+#: ../calendar/libecal/e-cal-client.c:768
 msgid "Failed to find system calendar"
-msgstr "àààààà ààààà ààà àààà"
+msgstr "ààààààà àààààà àà ààààà ààà àààà"
 
-#: ../calendar/libecal/e-cal-client.c:755
-#: ../calendar/libedata-cal/e-data-cal.c:428
-#, fuzzy
-#| msgid "Folder '%s' does not exist."
+#: ../calendar/libecal/e-cal-client.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:441
 msgid "Calendar does not exist"
-msgstr "'%s' ààààààà ààààà àààà àà."
+msgstr "àààààà ààààà àààà àà"
 
-#: ../calendar/libecal/e-cal-client.c:865
-#| msgid "%s: Invalid source."
+#: ../calendar/libecal/e-cal-client.c:922
 msgid "Invalid source type"
 msgstr "àààààà ààààà àààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1298
+#: ../calendar/libecal/e-cal-component.c:1337
 msgid "Untitled appointment"
 msgstr "àààààààà ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "àààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "àààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
-#| msgid "High"
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
 msgctxt "Priority"
 msgid "High"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
-#| msgid "Normal"
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
-#| msgid "Low"
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Low"
 msgstr "àà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:702
-#| msgid "Undefined"
+#: ../calendar/libecal/e-cal-util.c:716
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:38
 msgid "Cannot process, calendar backend is opening"
-msgstr ""
+msgstr "ààààààààà àààà àà àààà, àààààà àààààà ààà ààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:207
-#, fuzzy, c-format
-#| msgid "Unknown error: %s"
+#: ../calendar/libedata-cal/e-cal-backend.c:146
+#, c-format
 msgid "Unknown calendar property '%s'"
-msgstr "àààààà ààà:%s"
+msgstr "àààààà àààààà ààà '%s'"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:219
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-cal-backend.c:163
+#, c-format
 msgid "Cannot change value of calendar property '%s'"
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààà '%s' àà ààà àààà ààà àààà ààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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:123
+#: ../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:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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:176
+#: ../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:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:397
+#, c-format
+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 third argument to be a string"
+msgstr "\"%s\" ààààà àààà àà àààààààà àààà àà ààà àààà"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#, c-format
+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
-#, fuzzy, c-format
-#| msgid ""
-#| "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-#| "\"description\", or \"location\""
+#: ../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\" àààà àààà àà \"any\", \"summary\", or \"description\", àà \"location\" "
-"ààà àà àààà ààà ààà ààà àààà àà"
+"\"%s\"  àààà àààà àà \"any\", \"summary\",  àà \"description\",  àà \"location"
+"\",  àà \"attendee\",  àà \"organizer\", àà\"classification\" ààà àà àààà ààà "
+"ààà "
+"ààà àààà àà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
+#: ../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:937
+#: ../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 "
@@ -1581,205 +1577,153 @@ msgstr ""
 "ààà (#f) "
 "àààà àà àààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "àààààààà àààà"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:962
 msgid "Cannot open calendar: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà àààà ààà àààà àà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:930
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:987
 msgid "Cannot remove calendar: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààà àààà àààà àà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:955
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 msgid "Cannot refresh calendar: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà àà ààà àà àààà àààà àà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:979
-#, fuzzy
-#| msgid "Cannot create encoder context"
+#: ../calendar/libedata-cal/e-data-cal.c:1043
 msgid "Cannot retrieve backend property: "
-msgstr "àààààà àààààà àààà ààà àààà"
+msgstr "àààààà ààà ààààààà àààà àà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1025
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1098
 msgid "Cannot retrieve calendar object path: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààà àà àààà ààààààà àààà àà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1050
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot retrieve calendar object list: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààà àààà ààààààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1157
 msgid "Cannot retrieve calendar free/busy list: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààà/àààààà àààààà àààà ààààààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1101
-#, fuzzy
-#| msgid "Cannot create encoder context"
+#: ../calendar/libedata-cal/e-data-cal.c:1188
 msgid "Cannot create calendar object: "
-msgstr "àààààà àààààà àààà ààà àààà"
+msgstr "àààààà ààààà àààà ààà àààà àà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1220
 msgid "Cannot modify calendar object: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààà àà ààààààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1156
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot remove calendar object: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààà àà ààà àààà àààà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1179
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1281
 msgid "Cannot receive calendar objects: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààààà àà ààààààà àààà àà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1204
-#, fuzzy
-#| msgid "Cannot save calendar data"
+#: ../calendar/libedata-cal/e-data-cal.c:1312
 msgid "Cannot send calendar objects: "
-msgstr "àààààà àààà àààà àààà ààà"
+msgstr "àààààà ààààààà àà àààà ààà àààà àà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1231
-#, fuzzy
-#| msgid "Could not retrieve weather data"
+#: ../calendar/libedata-cal/e-data-cal.c:1344
 msgid "Could not retrieve attachment uris: "
-msgstr "àààà àààà àààà àà ààà"
+msgstr "àààààààà uris ààààààà àààà àà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1255
-#, fuzzy
-#| msgid "Could not store folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1372
 msgid "Could not discard reminder: "
-msgstr "ààààààà ààààà àààà àà ààà: %s"
+msgstr "ààààààààà àààààà àààà àààà àà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1279
-#, fuzzy
-#| msgid "Could not generate encrypting data: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1401
 msgid "Could not get calendar view path: "
-msgstr "àààà àààààà ààààààà àààà ààà: %s"
+msgstr "àààààà ààààà àà ààà àààà ààà: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1304
-#, fuzzy
-#| msgid "Could not retrieve weather data"
+#: ../calendar/libedata-cal/e-data-cal.c:1431
 msgid "Could not retrieve calendar time zone: "
-msgstr "àààà àààà àààà àà ààà"
+msgstr "àààààà ààà ààààààà àà àààà ààààààà àààà àààà àà ààà:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1326
-#, fuzzy
-#| msgid "Could not rename folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1457
 msgid "Could not add calendar time zone: "
-msgstr "ààààààà àà àààà àààààà àààà àà ààà: %s"
+msgstr "àààààà ààà ààààààà àààà àààà ààà:"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
-#| msgid "Invalid range"
 msgid "Invalid call"
 msgstr "àààà ààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:424
-#, c-format
-#| msgid "Invalid server URI"
-msgid "Invalid URI"
-msgstr "àààààà URI"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:485
-#, fuzzy, c-format
-#| msgid "Could not create cache file"
-msgid "Could not instantiate backend"
-msgstr "ààà àààà àààà ààà ààà"
-
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ààààààààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "àààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "àààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "àààààà àà àààà àà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "àà àààà àà àà ààààà àààà àààà àà àààà ààà"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "àà àààà àà àà ààààà ààààààà àààà àà àààà ààà"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:805
 msgid "Signing message"
 msgstr "ààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1046
 msgid "Encrypting message"
 msgstr "ààààà àà àààà àà ààà àà"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1173
 msgid "Decrypting message"
 msgstr "ààààà àà àààààà àà ààà àà"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ààà àà ààààààà ààà ààààà"
 
-#: ../camel/camel-data-cache.c:495
+#: ../camel/camel-data-cache.c:507
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ààà ààààààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1790,8 +1734,8 @@ msgstr ""
 "àà ààààà àà ààà àà àààààààà àààà àààà ààààà àààààà àà àà\n"
 "ààààà àà àààààààààà àààààààà."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:300
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1802,180 +1746,183 @@ msgstr ""
 "%s\n"
 "àà ààààààà ààà àààà ààà àààààààà ààààààààààààààà àààà àà àààààà."
 
-#: ../camel/camel-disco-diary.c:304
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "ààààà àà àààààààààààààà"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "àààààà ààà àà àààà àà ààààà àà àààààààà àà ààà àà"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:416
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààà àà àààà '%s' ààààààà àà ààààà àà ààà àà"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
-msgstr "àààààà àààààààà àà ààà ààààààà àààààààààà àà ààààààà ààà àà àààà àààà"
+#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+msgid "Copy folder content locally for _offline operation"
+msgstr ""
+"àààààà àààààààà àà ààà ààààààà àààààààààà àà ààààààà ààà àà àààà àààà (_o)"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1153
-#: ../camel/providers/imap/camel-imap-store.c:1925
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imap/camel-imap-store.c:3171
-#: ../camel/providers/imapx/camel-imapx-folder.c:311
-#: ../camel/providers/imapx/camel-imapx-folder.c:344
-#: ../camel/providers/imapx/camel-imapx-folder.c:398
-#: ../camel/providers/imapx/camel-imapx-folder.c:444
-#: ../camel/providers/imapx/camel-imapx-folder.c:478
-#: ../camel/providers/imapx/camel-imapx-folder.c:518
-#: ../camel/providers/imapx/camel-imapx-folder.c:554
-#: ../camel/providers/imapx/camel-imapx-store.c:238
-#: ../camel/providers/imapx/camel-imapx-store.c:1278
-#: ../camel/providers/imapx/camel-imapx-store.c:1366
-#: ../camel/providers/imapx/camel-imapx-store.c:1412
+#: ../camel/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 ""
 "àà àààààààà àà àààààà àààà àà ààà àààà ààààààà ààà àà àààààà ààà àààà àààààà"
 
-#: ../camel/camel-file-utils.c:722
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "àààà"
 
-#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
+#: ../camel/camel-filter-driver.c: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:866
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s àà àààà ààààà àààà ààààààà: %s"
 
-#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "ààààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
+#: ../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:1161 ../camel/camel-filter-driver.c:1605
+#: ../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:1258
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà ààààààà àà ààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà ààààààà àà ààààààààà ààà ààààà"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) ààààà ààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d ààààà àà àààà"
 
-#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "ààààààà àà ààààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "ààààà"
 
-#: ../camel/camel-filter-driver.c:1396
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d àà %d ààààà ààààààà àà ààà àà"
 
-#: ../camel/camel-filter-driver.c:1414
+#: ../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:403
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààà àààà àààà (àààààà-ààààà)"
 
-#: ../camel/camel-filter-search.c:418
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààà àààà àààà (àààààààà-ààà)"
 
-#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
+#: ../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.c:243
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#: ../camel/camel-folder.c:262
+#, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "%s ààà ààààààààà ààààà àà àààà àààààààà"
-msgstr[1] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgstr[0] "'%s' ààà ààà ààààà ààààà ààà ààà àà"
+msgstr[1] "'%s' ààà ààà ààààà ààààà ààà ààà àà"
 
-#: ../camel/camel-folder.c:283
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#: ../camel/camel-folder.c:302
+#, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "%s ààà ààààààààà ààààà àà àààà àààààààà"
-msgstr[1] "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgstr[0] "'%s' ààà ààà ààà ààààà ààà ààà àà"
+msgstr[1] "'%s' ààà ààà ààà ààààà ààà ààà àà"
 
-#: ../camel/camel-folder.c:331
-#, fuzzy, c-format
-#| msgid "Filtering new message(s)"
+#: ../camel/camel-folder.c:350
+#, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "àà ààààà(ààà) àà àààààààà àà ààà àà"
-msgstr[1] "àà ààààà(ààà) àà àààààààà àà ààà àà"
+msgstr[0] "'%s' ààà àà ààààà àà àààààààà àà ààà àà"
+msgstr[1] " '%s' ààà àà ààààà àà àààààààà àà ààà àà"
 
-#: ../camel/camel-folder.c:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ààààà àààààààààààà àà ààà àà"
 
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:921
 msgid "Copying messages"
 msgstr "ààààà àààà àà ààà àà"
 
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1233
 #, c-format
 msgid "Quota information not supported for folder '%s'"
-msgstr ""
+msgstr "ààààààà '%s' àà ààà àààà ààààààà ààààààà àààà"
 
-#: ../camel/camel-folder.c:3269
-#, fuzzy, c-format
-#| msgid "Retrieving POP message %d"
+#: ../camel/camel-folder.c:3549
+#, c-format
 msgid "Retrieving message '%s' in %s"
-msgstr "%d POP àààààà àààààààààààà àà ààà àà"
+msgstr "ààààà '%s' àà ààààààààààààà %s ààà"
 
-#: ../camel/camel-folder.c:3394
-#, fuzzy, c-format
-#| msgid "Fetching summary information for new messages in %s"
+#: ../camel/camel-folder.c:3698
+#, c-format
 msgid "Retrieving quota information for '%s'"
-msgstr "%s ààà àà ààààà àà àààà àààààà ààààà àà ààà àà"
+msgstr "'%s' àà ààà àààà ààààààà àà ààààààààààààà"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../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"
@@ -1984,8 +1931,8 @@ msgstr ""
 "ààà àààààààààà àà àààààààà àààà àà àààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
+#: ../camel/camel-folder-search.c:676
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1995,47 +1942,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) àà ààà ààà ààà àààààà ààààà àà"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:941
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ààààààà àààà àà %s àà àààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
+#: ../camel/camel-folder-search.c:1001 ../camel/camel-folder-search.c:1009
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) àà ààà ààààà àààààà àààààààà àà ààààà àà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:984
+#: ../camel/camel-folder-search.c:1037
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) àà àààà àààààà àà ààà àààà àà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:994
+#: ../camel/camel-folder-search.c:1047
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) àà ààà ààààààà ààà àà ààààà àà"
 
-#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
-#: ../camel/camel-gpg-context.c:1272
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg àà àààààààà ààà àààà: %s"
 
-#: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "àààààà"
 
-#: ../camel/camel-gpg-context.c:711
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2046,17 +1993,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:728
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid ààààà àà àààààààà ààà àààà."
 
-#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg ààààààà ààààà àà àààààààà ààà àààà."
 
-#: ../camel/camel-gpg-context.c:789
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2065,7 +2012,7 @@ msgstr ""
 "àààà àààà ààààààà ààààà àà ààààà àà ààà\n"
 "ààà àà ààààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2074,92 +2021,91 @@ msgstr ""
 "àààà àààààààà àà ààà ààààà ààààà àà ààà\n"
 "ààààààà àà ààààà àà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG àà '%s' àà ààà ààààààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4962
-#: ../camel/providers/imapx/camel-imapx-server.c:4979
-#: ../camel/providers/imapx/camel-imapx-store.c:159
-#: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../libedataserver/e-client.c:127 ../libedataserverui/e-book-auth-util.c:221
+#: ../camel/camel-gpg-context.c:850
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"ààààà ààà ààààà ààààààà ààà àààààààààààà àà àààà ààà ààààààà ààààà àààà àà, "
+"àà àààààà àààà "
+"àààààààà àààà ààààà àà ààà àà ààààààà ààààààààà àààà."
+
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:141 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
-#| msgid "Canceled"
 msgid "Cancelled"
 msgstr "àààà"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà ààààà ààààà ààà àààà:à ààà ààààààà àààà ààà."
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àà ààààààààààà ààààààààà: %s"
 
-#: ../camel/camel-gpg-context.c:989
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "àààà ààà àààà: ààà ààà àààààààààààà àààà."
 
-#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
-#, fuzzy
-#| msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
-msgstr "ààààààààà àààààà ààààààà àààà àà ààà: %s"
+msgstr "ààààààààà àààààà ààààààà àààà àà ààà: "
 
-#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
-#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
-#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "gpg àà àààààààà ààà àààà."
 
-#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
-#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
-#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
-#: ../camel/camel-smime-context.c:973
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ààààà ààààààààà àà àààà àààà àà àààà: àààààà ààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:1741
-#, fuzzy
-#| msgid "Cannot verify message signature: Incorrect message format"
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
-msgstr "ààààà ààààààààà àà àààà àààà àà àààà: àààààà ààààà ààààààà"
+msgstr "ààààà ààààààààà àà àààà àààà àà àààà: "
 
-#: ../camel/camel-gpg-context.c:1864
-#, fuzzy
-#| msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
-msgstr "àààà àààààà ààààààà àààà ààà: %s"
+msgstr "àààà àààààà ààààààà àààà ààà: "
 
-#: ../camel/camel-gpg-context.c:1917
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "àà àààààà ààà àà ààààà ààààà àà àààààà àà"
 
-#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
-#: ../camel/camel-gpg-context.c:2007
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ààààà ààààààààà àà àààà àààà àà àààà: àààààà ààààà ààààààà"
 
-#: ../camel/camel-gpg-context.c:1995
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME àààààà àà àààààà ààà àààà: ààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ààààà àààààààààà"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr ""
+msgstr "àààà àààààà àààà àà ààà ààààà CamelHttpStream àà ààà ààààààà àà"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2167,10 +2113,9 @@ msgid "Could not create lock file for %s: %s"
 msgstr "%s àà ààà àààà ààààà àààà ààà ààà: %s"
 
 #: ../camel/camel-lock.c:145
-#, fuzzy, c-format
-#| msgid "Timed out trying to get lock file on %s. Try again later."
+#, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr "%s àà ààà àààà àààà àà àààà ààààà ààà ààà àààààà. ààà ààààà àààà."
+msgstr "%s àà ààà àààà àààà àà àààà ààààà ààà ààà àààààà.  ààà ààààà àààà."
 
 #: ../camel/camel-lock.c:205
 #, c-format
@@ -2251,76 +2196,64 @@ msgstr "ààà ààààà ààààà ààà ààà: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "ààà ààààààà ààààà àà ààààà ààà ààà: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ààà ààààààà ààààà àà àààà àààà ààà ààà: %s"
 
 #: ../camel/camel-multipart-signed.c:297
-#, fuzzy, c-format
-#| msgid "No description available"
+#, c-format
 msgid "No content available"
-msgstr "ààà ààààà àààààà àààà"
+msgstr "ààà ààààààà àààààà àààà"
 
 #: ../camel/camel-multipart-signed.c:305
-#, fuzzy, c-format
-#| msgid "No description available"
+#, c-format
 msgid "No signature available"
-msgstr "ààà ààààà àààààà àààà"
+msgstr "ààà ààààààààà àààààà àààà"
 
 #: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "àààààà àààààààà àààà"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s ààà àààà àààà ààà: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "SSL àààààààà"
-
-#: ../camel/camel-network-service.c:123
-#, fuzzy, c-format
-#| msgid "Could not connect to %s: %s"
-msgid "Could not connect to %s: "
-msgstr "%s ààà àààà àààà ààà: %s"
-
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "àà àà ààà àà: %s"
 
-#: ../camel/camel-net-utils.c:718
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "àààààà ààààà ààà àààààà"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "àààààà ààààà ààà àààààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:845
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "ààà àà àà ààà àà"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ààà ààààà àààà"
 
-#: ../camel/camel-net-utils.c:872
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ààà ààààà àààà: %s"
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-network-service.c:112
+#, c-format
+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:144 ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "'%s' ààààààà àà ààà àààààà ààààà ààà àààà àààà àà: %s"
@@ -2333,23 +2266,23 @@ msgstr "ààààà ààààààà àààà ààààààà
 msgid "For reading mail as a query of another set of folders"
 msgstr "àààà ààààààà ààààààà àà àààààà àà ààà ààà ààà ààààà àà ààà"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s àààààààà àààà àà ààà: àà àààààà àà ààààààà ààààààà àà àààààà àààà àà."
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s àà àààààààà àààà àà ààà: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s àà àààààààà àààà àà ààà: ààààààà ààà ààà àààààààà ààà àààà àà."
 
-#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ààààààààà àà àààà ààà ààààààà àààààà àààà"
@@ -2394,11 +2327,11 @@ msgstr ""
 "àààà ààààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2407,11 +2340,11 @@ msgstr ""
 "ààà àààààà àààà "
 "àà."
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2420,45 +2353,45 @@ msgstr ""
 "ààà àààààà "
 "àààà àà."
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../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:831
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààà àààààà àààà àà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../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:873
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ààààà ààààààààà àà ààà ààààààààà àààààà àààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:894
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ààààà ààààààààà àà ààà àààààà ààààààààà àààààà àà"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "ààààà ààààààààà ààà àààà àààà àà"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Kerberos 5 ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2467,11 +2400,11 @@ msgstr ""
 "àà àààààà "
 "ààààààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "àààà ààà ààààààààà àààààààà àà-ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2479,7 +2412,7 @@ msgstr ""
 "àààà ààà ààààààààà àààààààà àà àààà àà àààààààà ààà àà àààààà àà àààààà àààà "
 "àà."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2488,7 +2421,7 @@ msgstr ""
 "àààààààà "
 "àà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2496,7 +2429,7 @@ msgstr ""
 "ààààààà àà ààà àà àààà ààààààààà àà, àà àà ààààààààà àà ààààà ààààà àààà àà "
 "ààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2505,52 +2438,52 @@ msgstr ""
 "àà àààààà àààà "
 "àààà àà."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àà àà àààààà àààààààà ààààà àààààà àà ààààà àààà àààà."
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "àààààààà àààà input_token àà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "ààààà àà àààà àààààààà àààà àààà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ààààà ààààà àà ààà àààààà àà ààà."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
-#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1228
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c: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:385
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "àààààààà ààààààà ààà."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ààààà"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "àààààà ààààààà àà ààààà àà àà àààààà ààààà àà ààààààà."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "àààààà ààààààà àààààà."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2558,449 +2491,446 @@ msgstr ""
 "NTLM / àààààààà ààààààà ààààààà àà ààààà àà àà àààààà ààààà àààààà ààààà àà "
 "ààààààà."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP àà àààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP àà àààààà àà àààà àà àààààà àà POP ààààààà àà ààààààààà ààààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
-#, fuzzy
-#| msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
-msgstr "POP ààààà URI"
+msgstr "POP ààààà UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
-#, fuzzy, c-format
-#| msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:96
+#, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
-msgstr "àà àààààà àààààà àà àààààà àà SMTP ààààààààà àà ààààà POP"
+msgstr "àà àààààà àààààà àà àààààà àà SMTP ààààààà àà ààààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr ""
+msgstr "SMTP ààààààà ààààà àà àààà POP àààààà %s àà ààà "
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààààà ààààààààà ààààààààà àààà: %s: %s"
 
-#: ../camel/camel-service.c:526
-#, fuzzy, c-format
-#| msgid "URL '%s' needs a username component"
-msgid "URL '%s' needs a user component"
-msgstr "'%s' URL àà àà ààààààààààà ààà àà ààààà àà"
-
-#: ../camel/camel-service.c:537
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "'%s' URL àà àà àààààà ààà àà ààààà àà"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "àààà GType ààààààà '%s' ààààààààà àà ààà "
 
-#: ../camel/camel-service.c:548
+#: ../camel/camel-session.c:472
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2985
+#: ../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 %s authentication"
+msgstr "ààààààà %s àà àààà ààà àààààà àààà"
 
-#: ../camel/camel-session.c:361
-#, fuzzy, c-format
-#| msgid "No provider available for protocol '%s'"
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "'%s' ààààààààà àà àààà ààà ààààààà àààààà àààà"
+#: ../camel/camel-session.c:487
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s ààààààà àààà"
 
-#: ../camel/camel-session.c:938
+#: ../camel/camel-session.c:1194
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ààààà %s ààààààà %s àà ààà %s àààààà àà ààààà àààà."
 
-#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àà àààà àààààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:372
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS ààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààààààà àààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:383
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààààààà àààààà àààà àààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà àààà àààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:396
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS àààààààààààààà ààààà àààà ààààààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:402
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "àààààààààà àààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:408
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààà ààà àààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' àà àààà àààà àààààààààà ààààà àààà àà"
 
-#: ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààà ààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààà ààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "àààà àààààààààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS Signer ààààà àààà àààà àààà àà"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "ààààààààà"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "ààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "àààààà ààà ààààà àààà ààààààà"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "àààààààààà àà ààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "àààààààààà àà ààààààààà àààààààà àààà"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ààààààààà àààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ààààààààà àààààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ààààà ààààààààà "
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ààààààààà ààà ààà ààààààààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "ààààààààà ààààààà àà àààààààà àààà ààà ààà àà"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "àààààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ààààà àààààààà ààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "àààààààààà àààà àààà"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ààààà ààààà àà àààààààààà ààà, àààààààààààà àà àààà àààà àà àààà"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "àààààààààà ààààà ààààà àà, àààààààààà àààààà àààà ààà àà àààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ààààààààà àààààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "àààààààààààààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "àààààà àààààà àààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:841
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS àààààà ààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "àààààà ààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "àààààà àààà"
 
-#: ../camel/camel-smime-context.c:1058
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "àààà àààààà àààà àààààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1066
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "àààà àààà ààààà àà àààà ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1077
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "CMS ààààà àààà ààààààà àà àààà"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ààààààààà àààààà ààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:1089
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ààààààààà àààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "CMS àààààà ààààà àààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1104
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS àààààààààààà ààààà ààààààà àààà àà àààà àà"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS àààààààààààà ààààà àààà àààà àààà àà"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "àààààà ààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME àààààà àààà: ààà ààààà ààààààààà ààààààà àààà ààà"
 
-#: ../camel/camel-store.c:1814
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ààààààà ààààààà àààà àà àààà àà: ààààààà ààààà àà"
 
-#: ../camel/camel-store.c:1857
-#, fuzzy, c-format
-#| msgid "Syncing folders"
+#: ../camel/camel-store.c:1842
+#, c-format
 msgid "Opening folder '%s'"
-msgstr "ààààààà àà ààààààààà àà ààà àà"
+msgstr "'%s' ààààààà àà ààà ààà"
 
-#: ../camel/camel-store.c:2042
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#: ../camel/camel-store.c:2027
+#, c-format
 msgid "Scanning folders in '%s'"
-msgstr "%s ààà ààààààààà ààààà àà àààà àààààààà"
+msgstr "'%s' ààà ààààààà ààààà àà ààà àà"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2054 ../camel/camel-store.c:2064
+#: ../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:2057 ../camel/camel-store.c:2068
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ààà"
 
-#: ../camel/camel-store.c:2519
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ààààààà ààààààà àààà àà àààà àà: %s: ààààààà ààààà àà"
 
-#: ../camel/camel-store.c:2533
-#, fuzzy, c-format
-#| msgid "Cannot get folder '%s': %s"
+#: ../camel/camel-store.c:2515
+#, c-format
 msgid "Creating folder '%s'"
-msgstr "'%s' ààààààà àààà ààààààà àà àààà àà: %s"
+msgstr " '%s' ààààààà ààà ààà àà"
 
-#: ../camel/camel-store.c:2651 ../camel/camel-vee-store.c:350
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../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-store.c:2794 ../camel/camel-vee-store.c:400
-#: ../camel/providers/local/camel-maildir-store.c:704
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ààààààà àà ààà àààà ààà àààà àà: %s: àààà àààààààà"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
-msgstr ""
+msgstr "àààà àààààà àààà àà ààà ààààà CamelStreamFilter àà ààà ààààààà àà"
 
-#: ../camel/camel-stream-process.c:265
+#: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
 msgstr "ààààààà àààà"
 
-#: ../camel/camel-stream-process.c:270
+#: ../camel/camel-stream-process.c:272
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" ààààà àà àààà àààà ààà: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-tcp-stream-raw.c:310
+#, c-format
+msgid "NSPR error code %d"
+msgstr "NSPR àààààà ààà %d"
+
+#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
 #, c-format
 msgid "The proxy host does not support SOCKS4"
-msgstr ""
+msgstr "àààààààà ààààà SOCKS4 àà àààààà àààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
-msgstr ""
+msgstr "àààààààà ààààà ààààà àààààà àà àààààààà àààà: ààà %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
-msgstr ""
+msgstr "àààààààà ààààà SOCKS4 àà àààààà àààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:879
-#, fuzzy, c-format
-#| msgid "No support for authentication type %s"
+#: ../camel/camel-tcp-stream-raw.c:777
+#, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "ààààààà àààààà %s àà àààà ààà àààààà àààà"
+msgstr "ààààààà àààààà àà àààà ààà àààààà àààà: ààà 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
-msgstr ""
+msgstr "ààààààà SOCKS ààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
-msgstr ""
+msgstr "SOCKS ààààà àà àààà ààààààà àà àààààà àààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
-msgstr ""
+msgstr "SOCKS ààààà àà ààààà àà ààààà ààààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
-msgstr ""
+msgstr "SOCKS ààààà àà ààààà àà ààààà ààààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:895
-#| msgid "Connection canceled"
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "ààààààà àààààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
-msgstr ""
+msgstr "ààà àààà àààààà àà àà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:897
-#, fuzzy
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
-msgstr "SSLS ààààà àààààà ààààààà àààà"
+msgstr "ààààà SOCKS ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:898
-#, fuzzy
-#| msgid "STLS not supported by server"
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
-msgstr "SSLS ààààà àààààà ààààààà àààà"
+msgstr "SOCKS ààààà àààààà ààà àààààà ààààààà àààà àà"
 
-#: ../camel/camel-tcp-stream-raw.c:899
-#, fuzzy
-#| msgid "Unknown error: %s"
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
-msgstr "àààààà ààà:%s"
+msgstr "SOCKS ààààà àà àààààà àààààà"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
-msgstr ""
+msgstr "SOCKS ààààà àà àààààà ààà àààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:950
-#, fuzzy, c-format
-#| msgid "Invalid response from server"
+#: ../camel/camel-tcp-stream-raw.c:848
+#, c-format
 msgid "Incomplete reply from SOCKS server"
-msgstr "ààààà àà ààà ààààààààà."
+msgstr "SOCKS ààààà àà ààààà àààà"
 
-#: ../camel/camel-tcp-stream-raw.c:970
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
-msgstr ""
+msgstr "àààààààà àààà àààà àà (àààààà 255 àààà àà)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
-#, fuzzy, c-format
-#| msgid "Invalid response from server"
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
+#, c-format
 msgid "Invalid reply from proxy server"
-msgstr "ààààà àà ààà ààààààààà."
+msgstr "àààààààà ààààà àà ààà àààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:453
+#: ../camel/camel-tcp-stream-ssl.c:474
 #, c-format
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"ààààààà:            %s\n"
-"àààà:           %s\n"
-"ààààààààààà:       %s\n"
-"ààààààààà:         %s"
+"   ààààààà:       %s\n"
+"  àààà:      %s\n"
+"  ààààààààààà:  %s\n"
+"  ààààààààà:    %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "GOOD"
 msgstr "ààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:480
 msgid "BAD"
 msgstr "ààà"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../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"
+"SSL àààààààààà '%s' àà ààà ààààààààà àààà àà.  àà ààà ààààààà àààà àà?\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:507
+#: ../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"
@@ -3009,7 +2939,7 @@ msgstr ""
 "àààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:559
+#: ../camel/camel-tcp-stream-ssl.c:600
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3018,7 +2948,7 @@ msgstr ""
 "ààà àààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:577
+#: ../camel/camel-tcp-stream-ssl.c:618
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3027,7 +2957,7 @@ msgstr ""
 "àààààààààà àààààà àà ààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:594
+#: ../camel/camel-tcp-stream-ssl.c:635
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3041,34 +2971,38 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "'%s' URL àà àààààààà àààà àà ààà"
 
-#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
+#: ../camel/camel-vee-folder.c:652
+#, c-format
+msgid "Updating %s folder"
+msgstr "%s ààààààà àààààà àà ààà àà"
+
+#: ../camel/camel-vee-folder.c:1326 ../camel/camel-vee-folder.c:1483
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ààààà ààààààà ààà ààààààà àà àààà àà àààààààààààà àààà àà àààà àà"
 
-#: ../camel/camel-vee-folder.c:1330
+#: ../camel/camel-vee-folder.c:1359
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ààà %s ààà ààà ààààà àààà"
 
-#: ../camel/camel-vee-folder.c:1398
-#, fuzzy, c-format
-#| msgid "Error storing '%s': %s"
+#: ../camel/camel-vee-folder.c:1427
+#, c-format
 msgid "Error storing '%s': "
-msgstr "'%s' àà ààààà àààà ààà àààààà: %s"
+msgstr "'%s' ààà àààà ààà àààààà:"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
-#. all messages not belonging into any other configured search folder
+#. * all messages not belonging into any other configured search folder
 #: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "ààààà"
 
-#: ../camel/camel-vee-store.c:376
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààààà ààààààà àààà àà àààà àà: %s:ààà ààà ààààààà àààà"
 
-#: ../camel/camel-vee-store.c:410
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ààààààà àà ààà àààà ààà àààà àà: %s:ààà ààà ààààààà àààà"
@@ -3081,24 +3015,33 @@ msgstr "ààààà ààààààà àà ààààààà à
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ààà ààààààà àà ààààààà àà àààà àààà àà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "ààà àààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ààà ààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, c-format
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"àààààà %s ààà IMAP ààààà %s %s àà àààà àààà:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3107,121 +3050,121 @@ msgstr ""
 "IMAP ààààà %s %s àà àààà àààà:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../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:483
+#: ../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:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ààààà ààààààààà àààà àààà àààààà àà àà."
 
-#: ../camel/providers/imap/camel-imap-command.c:774
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ààààà ààààààààà àà ààà %s ààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-command.c:812
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààà àà ààààààààààà OK ààààààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
-msgstr "àà ààààààà ààà ààààà àà ààààà àà àààà àààààà"
+#: ../camel/providers/imap/camel-imap-folder.c:348
+msgid "Always check for _new mail in this folder"
+msgstr "àà ààààààà ààà ààààà àà ààààà àà àààà àààààà (_n)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:370
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/imapx/camel-imapx-folder.c:767
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+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"
 
-#: ../camel/providers/imap/camel-imap-folder.c:393
+#: ../camel/providers/imap/camel-imap-folder.c:461
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s àà àààà àààààà àààààààà àààà àà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1049
-#: ../camel/providers/imapx/camel-imapx-server.c:4018
+#: ../camel/providers/imap/camel-imap-folder.c:1127
+#: ../camel/providers/imapx/camel-imapx-server.c:4011
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ààà ààààààààà ààààà àà àààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3462
-#, fuzzy
-#| msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3486
 msgid "Unable to retrieve message: "
-msgstr "ààààà àààààààààààà àààà ààà àààààà: %s"
+msgstr "ààààà àààààààààààà àààà ààà àààààà: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3497
-#: ../camel/providers/imapx/camel-imapx-server.c:5291
+#: ../camel/providers/imap/camel-imap-folder.c:3523
+#: ../camel/providers/imapx/camel-imapx-server.c:5630
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ààààà àààà àà ààààà ààààààà àààà àà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3498
-#: ../camel/providers/imapx/camel-imapx-server.c:5292
+#: ../camel/providers/imap/camel-imap-folder.c:3524
+#: ../camel/providers/imapx/camel-imapx-server.c:5631
 msgid "No such message available."
 msgstr "ààà ààà ààààà àààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3573
-#: ../camel/providers/imap/camel-imap-folder.c:4491
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/imap/camel-imap-folder.c:3599
+#: ../camel/providers/imap/camel-imap-folder.c:4477
+#: ../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:4075
-#: ../camel/providers/imap/camel-imap-folder.c:4158
-#: ../camel/providers/imapx/camel-imapx-server.c:3976
-#: ../camel/providers/imapx/camel-imapx-server.c:4126
+#: ../camel/providers/imap/camel-imap-folder.c:4058
+#: ../camel/providers/imap/camel-imap-folder.c:4141
+#: ../camel/providers/imapx/camel-imapx-server.c:3963
+#: ../camel/providers/imapx/camel-imapx-server.c:4151
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ààà àà ààààà àà àààà àààààà ààààà àà ààà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4292
+#: ../camel/providers/imap/camel-imap-folder.c:4275
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "àààààà ààààà ààààààààà: %d ààààà àà àààà ààà ààààà àààà àà àà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4302
+#: ../camel/providers/imap/camel-imap-folder.c:4285
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "àààààà ààààà ààààààààà: %d ààààà àà àààà ààà UID àààà àààà ààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4531
+#: ../camel/providers/imap/camel-imap-folder.c:4517
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ààà ààààààààà ààà ààààà àààà àà àààà àà ààà."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
-#, fuzzy
-#| msgid "Could not open cache directory: %s"
 msgid "Could not open cache directory: "
-msgstr "ààà àààààààààà ààà àààà ààà: %s"
+msgstr "ààà àààààààààà ààà àààà ààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ààààà ààà àààà ààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
-#, fuzzy, c-format
-#| msgid "Failed to cache message %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
+#, c-format
 msgid "Failed to cache message %s: "
-msgstr "%s ààààà ààà àààà ààà àààà: %s"
+msgstr "%s ààààà ààà àààà ààà àààà: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:531
-#, fuzzy, c-format
-#| msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
+#, c-format
 msgid "Failed to cache %s: "
-msgstr "%s ààà àààà ààà àààà: %s"
+msgstr "%s ààà àààà ààà àààà: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
@@ -3229,12 +3172,12 @@ msgid "Checking for New Mail"
 msgstr "ààà ààà àà àààà àààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c: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:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ààààààà àààà ààààààà ààà ààà ààààà àà àààà àààààà (_e)"
 
@@ -3249,13 +3192,12 @@ msgid "_Use custom command to connect to server"
 msgstr "ààààà àà àààààà àà ààà ààààà ààààà àà àààààà àààà (_U)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#| msgid "Command:"
 msgid "Co_mmand:"
 msgstr "ààààà:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ààààààààà"
 
@@ -3270,226 +3212,201 @@ msgid "O_verride server-supplied folder namespace"
 msgstr "ààààà ààààààà ààààààà àààààààà àààààààààà àààà (_v)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#| msgid "Namespace:"
 msgid "Names_pace:"
 msgstr "àààààààà:"
 
 #: ../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/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "àààààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "àà ààààà àà ààààààà ààà àà ààààà àà ààà àààààà ààààà (_A)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "ààà ààààààààà ààà àà ààààààà àà àààààà àààà àààà (_f)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_k)"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "àà ààààà àà ààààààà ààà àà ààààà àà ààà àààààà ààààà (_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_B)"
+msgid "Check new messages for _Junk contents"
+msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_J)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../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: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:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
-msgstr ""
+msgstr "IMAP àààààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
-#, fuzzy
-#| msgid "IMAP server %s"
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
-msgstr "IMAP ààààà %s"
+msgstr "SSL àà ààà IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c: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:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../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-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../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 ààààà àà ààààààà."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:222
-#: ../camel/providers/imap/camel-imap-store.c:2587
-#: ../camel/providers/imapx/camel-imapx-store.c:333
-#: ../camel/providers/imapx/camel-imapx-store.c:771
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:325
+#: ../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:679
+#: ../camel/providers/local/camel-maildir-store.c:685
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-spool-store.c:387
 msgid "Inbox"
 msgstr "ààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:354
-#: ../camel/providers/imap/camel-imap-store.c:381
-#: ../camel/providers/imap/camel-imap-store.c:408
-#: ../camel/providers/imapx/camel-imapx-server.c:3007
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2867
 #, 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:355
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2868
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà àààà."
 
-#: ../camel/providers/imap/camel-imap-store.c:374
-#: ../camel/providers/imapx/camel-imapx-server.c:3046
-#, fuzzy, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "àààààà àààà àààààà àà àà ààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:707
-#: ../camel/providers/imapx/camel-imapx-server.c:3141
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "%s IMAP ààààà ààààààà ààààààà àààààà %s àà àààààà àààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:718
-#: ../camel/providers/imapx/camel-imapx-server.c:3154
-#: ../camel/providers/smtp/camel-smtp-transport.c:347
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "ààààààà àààààà %s àà àààà ààà àààààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL ààààààà ààààààààà ààààààà ààà ààà."
-
-#: ../camel/providers/imap/camel-imap-store.c:777
-#: ../camel/providers/imapx/camel-imapx-server.c:3199
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2907
 #, c-format
-msgid "You did not enter a password."
-msgstr "àààà ààààààà àààà ààààà àààà."
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "àààààààà ààà ààà %s IMAP ààààà àà àààààà ààà àààà: "
 
-#: ../camel/providers/imap/camel-imap-store.c:818
-#: ../camel/providers/imapx/camel-imapx-server.c:3244
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"IMAP ààààà àà ààà ààààààà ààà ààààà.\n"
-"%s\n"
-"\n"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "%s IMAP ààààà ààààààà %s àà àààààà àààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:874
-#: ../camel/providers/imapx/camel-imapx-store.c:142
+#: ../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:877
-#: ../camel/providers/imapx/camel-imapx-store.c:145
+#: ../camel/providers/imap/camel-imap-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:158
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s àà %s àà ààà IMAP àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1962
-#: ../camel/providers/imap/camel-imap-store.c:2164
-#: ../camel/providers/imapx/camel-imapx-store.c:309
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:3004
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+msgid "Cannot authenticate without a username"
+msgstr "àààààààààà ààà àà àààà àààà àààààààà àà àààà ààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:3013
+#: ../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 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 such folder %s"
 msgstr "ààà ààà %s ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1976
-#: ../camel/providers/imap/camel-imap-store.c:2431
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../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 ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ààààààà ààà \"%s\" àààà àà ààààààà àà \"%c\" àààààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2040
-#: ../camel/providers/imap/camel-imap-store.c:2495
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../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 parent folder is not allowed to contain subfolders"
 msgstr "àààà ààààààà àà ààààààààà àààà àà àààààà àààà àà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2093
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:416
-#: ../camel/providers/local/camel-mh-store.c:547
+#: ../camel/providers/imap/camel-imap-store.c: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:2444
-#: ../camel/providers/imapx/camel-imapx-store.c:1310
+#: ../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:3214
-#, fuzzy, c-format
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3326
+#, c-format
 msgid "Server unexpectedly disconnected"
-msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: %s"
+msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:3217
-#, fuzzy
-#| msgid "Server unexpectedly disconnected: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
-msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: %s"
+msgstr "ààààà ààààààààààà ààà àà àààààààà àà ààà: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:88
-#, fuzzy, c-format
-#| msgid "Could not load summary for %s"
+#: ../camel/providers/imapx/camel-imapx-folder.c:101
+#, c-format
 msgid "Could not create folder summary for %s"
-msgstr "%s àà àààà àààààà àààààààà àààà àà ààà"
+msgstr "%s àà àààà àààààà ààààààà àààà àà ààà"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:96
-#, fuzzy, c-format
-#| msgid "Could not create cache file"
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
+#, c-format
 msgid "Could not create cache for %s: "
-msgstr "ààà àààà àààà ààà ààà"
+msgstr "%s àà àààà ààà ààà àààà ààà: "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
-msgstr ""
+msgstr "ààà àà àààààà àààà àà àààààà àààà ààà àà ààààà àà àààààà àààà àà (_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr "ààààà àààààààà àààààààà àà ààà àààà (_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3497,47 +3414,126 @@ msgstr "ààààà:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
-msgstr ""
+msgstr "ààààà ààààààà àà àààààà ààààà àààà àà ààà (_r)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "àààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
-msgid "Default IMAP port"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "Default IMAP port"
+msgstr "àààààààà IMAP ààààà"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
+msgid "IMAP+"
+msgstr "IMAP+"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:852
+msgid "Server disconnected"
+msgstr "ààààà àààààààà àà ààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1241
+msgid "Error writing to cache stream: "
+msgstr "ààà ààààà ààà ààààà ààà àààààà: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1968
+#, c-format
+msgid "Not authenticated"
+msgstr "ààà àààààààà àààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2037
+msgid "Error performing IDLE"
+msgstr "IDLE ààààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3202
+msgid "Error fetching message"
+msgstr "àà ààà ààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3274
+msgid "Closing tmp stream failed: "
+msgstr "ààààà tmp ààààààà ààà àààà: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3376
+msgid "Error copying messages"
+msgstr "ààààà ààà àààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3511
+msgid "Error appending message"
+msgstr "ààààà àà ààà ààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3697
+msgid "Error fetching message headers"
+msgstr "àààààà ààààà àààà àà ààààààà àààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3841
+msgid "Error retrieving message"
+msgstr "ààààà àààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4049
+msgid "Error fetching new messages"
+msgstr "àà ààààà àààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4244
+msgid "Error while fetching messages"
+msgstr "ààààà àà àààà àà ààààà àààààà "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4252
+#: ../camel/providers/imapx/camel-imapx-server.c:4282
+#, c-format
+msgid "Fetching summary information for %d message in %s"
+msgid_plural "Fetching summary information for %d messages in %s"
+msgstr[0] "%d ààààà àà àààà àààààà ààààà àà ààà àà %s ààà "
+msgstr[1] "%d ààààà àà àààà àààààà ààààà àà ààà àà %s ààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4407
+#: ../camel/providers/imapx/camel-imapx-server.c:4443
+msgid "Error refreshing folder"
+msgstr "ààààààà àà àààà àààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4536
+msgid "Error expunging message"
+msgstr "àààààà àà ààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4625
+msgid "Error fetching folders"
+msgstr "àà ààà ààààààà ààà àààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4704
+msgid "Error subscribing to folder"
+msgstr "ààààààà ààà ààà ààààààààà ààà àààààà"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
-msgid "IMAP+"
-msgstr "IMAP+"
+#: ../camel/providers/imapx/camel-imapx-server.c:4761
+msgid "Error creating folder"
+msgstr "ààààààà ààààà ààà àààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1480
-#, fuzzy
-#| msgid "Error writing mail temp file: %s"
-msgid "Error writing to cache stream: "
-msgstr "ààà ààààààà ààààà àà ààààà ààà ààà: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:4810
+msgid "Error deleting folder"
+msgstr "ààààààà àààààà ààà àààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2186
-#, fuzzy, c-format
-#| msgid "Failed to authenticate.\n"
-msgid "Not authenticated"
-msgstr "àààààààààà ààà àààà.\n"
+#: ../camel/providers/imapx/camel-imapx-server.c:4864
+msgid "Error renaming folder"
+msgstr "ààààààà àà ààà ààààà ààà àààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3416
-#, fuzzy
-#| msgid "Posting failed: %s"
-msgid "Closing tmp stream failed: "
-msgstr "àààààà àààà: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:4919
+msgid "Error performing NOOP"
+msgstr "NOOP ààààààà ààà àààààà"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5437
-#: ../camel/providers/imapx/camel-imapx-server.c:5452
-#, fuzzy
-#| msgid "Cannot create message: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:5017
+msgid "Error syncing changes"
+msgstr "ààààààà ààà àààààà ààà àààààààà"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5785
+#: ../camel/providers/imapx/camel-imapx-server.c:5800
 msgid "Cannot create spool file: "
-msgstr "ààààà ààà àààà àààà: %s"
+msgstr "ààààà ààààà àààà ààà àààà àà: "
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "%s àà ààà ààààààà àààà àà ààààààààààààà"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1087
-#: ../camel/providers/nntp/camel-nntp-store.c:1704
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1790
 #, c-format
 msgid "No such folder: %s"
 msgstr "ààà ààà ààààààà àààà àà: %s"
@@ -3545,64 +3541,59 @@ msgstr "ààà ààà ààààààà àààà àà: %s"
 #: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
-msgstr ""
+msgstr "ààààà ààààààà àà ààà àààà àààà ààààààà ààà"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, fuzzy, c-format
-#| msgid "service unavailable"
+#, c-format
 msgid "Source stream unavailable"
-msgstr "àààà àààààààà"
+msgstr "ààààà ààààààà àààààààà"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
-#: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
-#| msgid "mailbox:%s (%s)"
 msgid "mailbox: %s (%s)"
 msgstr "ààààààà:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
-msgstr "àààà ààààà àààà ààà"
+#: ../camel/providers/local/camel-local-folder.c:492
+msgid "_Index message body data"
+msgstr "àààà ààààà àààà ààà (_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:700
-#, fuzzy, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
+#: ../camel/providers/local/camel-local-folder.c:721
+#, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
 msgstr ""
-"ààààà àààà ààààààà àà àààà àà: %s ààààààà àà %s\n"
-"  %s"
+"%s ààààà àààà ààààààà àà àààà àà ààààààà àà %s\n"
+" %s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "ààààààà àààààà ààààà `.folders' (exmh) àà àààààà àààà (_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-ààààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààà ààà àààààààààà ààà ààààààà ààà àà ààààà àààà àà ààà."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3611,29 +3602,29 @@ msgstr ""
 "àà ààààààààààààà "
 "(àààààààà) àà ààà."
 
-#: ../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 "INBOX ààà àà ààààà àà àààààà ààààà"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+msgid "_Apply filters to new messages in Inbox"
+msgstr "INBOX ààà àà ààààà àà àààààà ààààà (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir- ààààààà ààà àààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "maildir àààààààààà ààà ààààààà ààà àà àààààà àà ààà."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt ààààààà ààà àààààà ààààààà àà ààà àààà (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "àààà Unix mbox ààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3642,240 +3633,231 @@ msgstr ""
 "ààà.\n"
 "Elm, Pine, àà Mutt àààà ààààààààà àà ààà àà ààààà ààà àà àààààààà àà àààà àà."
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "àààà Unix mbox ààààà àà àààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ààààààà `%s' àà `%s' ààà àààà àààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "ààààààà ààà ààààà %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:534
-#: ../camel/providers/local/camel-spool-store.c:571
+#: ../camel/providers/local/camel-local-store.c: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:244
+#: ../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:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c: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:297
+#: ../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:435
-#: ../camel/providers/local/camel-mbox-store.c:708
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' ààààààà ààààààà ààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:738
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ààààààà àààà ààààà ààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' àà àààà àààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:548
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààà ààà ààààà àààààà ààà ààààà:àààààà àààà"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "ààà ààà ààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
-#, fuzzy, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:226
+#, c-format
 msgid "Cannot append message to maildir folder: %s: "
-msgstr "maildir ààààààà ààà ààààà àààà àààà àààà: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
-#, fuzzy, c-format
-#| msgid ""
-#| "Cannot get message: %s from folder %s\n"
-#| "  %s"
+msgstr "maildir ààààààà ààà ààààà àààà àààà àààà: %s:"
+
+#: ../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 get message %s from folder %s: "
-msgstr ""
-"ààààà àààà ààààààà àà àààà àà: %s ààààààà àà %s\n"
-"  %s"
+msgstr "%s ààààà àààà ààààààà àà àààà àà ààààààà àà %s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
-#, fuzzy, c-format
-#| msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:354
+#, c-format
 msgid "Cannot transfer message to destination folder: %s"
-msgstr "maildir ààààààà ààà ààààà àààà àààà àààà: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-store.c:100
-#, fuzzy, c-format
-#| msgid "Cannot create folder: %s: folder exists"
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr "ààààààà ààààààà àààà àà àààà àà: %s: ààààààà ààààà àà"
+msgstr "àààààà ààààààà àà ààà ààààà ààààààààààà àààà àà àààà: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
-#| msgid "Folder already 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:786
+#, c-format
 msgid "Folder %s already exists"
 msgstr "ààààààà %s àààà àà ààààààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:384
-#: ../camel/providers/local/camel-mbox-store.c:398
+#: ../camel/providers/local/camel-maildir-store.c: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:206
-#: ../camel/providers/local/camel-mbox-store.c:350
-#: ../camel/providers/local/camel-mh-store.c:502
+#: ../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:212
-#: ../camel/providers/local/camel-mbox-store.c:360
-#: ../camel/providers/local/camel-mh-store.c:511
+#: ../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:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'%s' ààààààà àààà àà àààà àà: maildir àààààààààà àààà àà."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:649
+#: ../camel/providers/local/camel-maildir-store.c: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:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "maildir àààààààààà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:974
+#: ../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-store.c:713
-#, fuzzy, c-format
-#| msgid "Cannot create folder: %s: folder exists"
+#: ../camel/providers/local/camel-maildir-store.c:777
+#, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "ààààààà ààààààà àààà àà àààà àà: %s: ààààààà ààààà àà"
+msgstr ""
+"ààààààà ààà àààà ààà àààà àà: %s: ààààààà àà ààà ààà ààà ààààà àààà àà àààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:436
-#: ../camel/providers/local/camel-maildir-summary.c:566
+#: ../camel/providers/local/camel-maildir-summary.c:416
+#: ../camel/providers/local/camel-maildir-summary.c:549
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir àààààààààà àà ààà àààà àààà àà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:557
+#: ../camel/providers/local/camel-maildir-summary.c:540
 msgid "Checking folder consistency"
 msgstr "ààààààà àààààà àà àààà àà ààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:650
+#: ../camel/providers/local/camel-maildir-summary.c:633
 msgid "Checking for new messages"
 msgstr "àà ààààà àà àààà àààà àà ààà àà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:743
-#: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c: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:183
-#, fuzzy, c-format
-#| msgid "Cannot open mailbox: %s: %s\n"
+#: ../camel/providers/local/camel-mbox-folder.c:187
+#, c-format
 msgid "Cannot open mailbox: %s: "
-msgstr "ààààààà ààà àààà àààà àà: %s: %s\n"
+msgstr "ààààààà ààà àààà àààà àà: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
-#, fuzzy, c-format
-#| msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:253
+#, c-format
 msgid "Cannot append message to mbox file: %s: "
-msgstr "mbox ààààà ààà ààààà àààà àààà àààà: %s: %s"
+msgstr "mbox ààààà ààà ààààà àààà àààà àààà: %s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààààààà àààààààààààà àààà ààà àà àààà àà àààààà ààà àààà àà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s àà ààààààà àààà àààà ààààààà àà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:372
-#: ../camel/providers/local/camel-mbox-store.c:542
+#: ../camel/providers/local/camel-mbox-store.c: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:409
+#: ../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:558
+#: ../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:574
+#: ../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:576
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "ààààààà àààà àà ààààààà àà"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
-#: ../camel/providers/local/camel-mbox-store.c:632
-#: ../camel/providers/local/camel-mbox-store.c:661
+#: ../camel/providers/local/camel-mbox-store.c: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"
@@ -3884,131 +3866,131 @@ msgstr ""
 "'%s' ààààààà àààà àààà àààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:642
+#: ../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:651
+#: ../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:678
-#: ../camel/providers/local/camel-mbox-store.c:693
+#: ../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:775
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "àà ààààààà àà ààà àààà àà."
 
-#: ../camel/providers/local/camel-mbox-store.c:791
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' àà ààà àààà ààà àààà àà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:874
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "`%s' àà %s àà ààààààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:478
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààààà àààà ààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:539
-#, fuzzy, c-format
-#| msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:490
+#, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "%ld àààààà ààà ààààà ààà àààààààà àààààà %s ààà"
+msgstr "%s àààààà ààà àààà ààà àààààà% s àà ààà àààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:628
+#: ../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:713
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../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:727
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../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:744
-#: ../camel/providers/local/camel-mbox-summary.c:969
+#: ../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:755
+#: ../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:772
+#: ../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:867
-#: ../camel/providers/local/camel-mbox-summary.c:1134
+#: ../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:906
-#: ../camel/providers/local/camel-mbox-summary.c:1165
+#: ../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:915
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../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:1080
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../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:1244
-#: ../camel/providers/local/camel-mbox-summary.c:1274
+#: ../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:1263
+#: ../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:115
-#, fuzzy, c-format
-#| msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:119
+#, c-format
 msgid "Cannot append message to mh folder: %s: "
-msgstr "mh ààààààà ààà ààààà àààà àààà àààà àà:  %s: %s"
+msgstr "mh ààààààà ààà ààààà àààà àààà àààà àà:  %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../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:539
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ààààààà àààà àà àààà àà:àààààààààà àààà àà."
@@ -4018,22 +4000,36 @@ msgstr "'%s' ààààààà àààà àà àààà àà:à
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH àààààààààà àà ààà àààà àààà àà: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:347
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "'%s' ààààà ààà àààà àààà àà: %s"
+
+#: ../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:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s ààààà ààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "%s ààààà ààààààà ààà"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:423
+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:405
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4042,12 +4038,12 @@ msgstr ""
 "'%s' ààààààà ààà àààà ààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:411
+#: ../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:418
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4056,174 +4052,145 @@ msgstr ""
 "'%s' ààààààà ààààààà àààà ààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:430
+#: ../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:478
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "àà INBOX àà ààààà àààààà àààà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ààààà ààààààà ààààààà àààà àààà àà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà ààààààà àà àààààààààà àààà àààà àà àààà àà"
 
-#: ../camel/providers/local/camel-spool-store.c:580
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "'%s' ààààà ààà àààà àààà àà: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "'%s' ààààà àà àààààà ààààà àà àààààààààà àààà àà"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
-#, fuzzy, c-format
-#| 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:211
-#, fuzzy, c-format
-#| msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:210
+#, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "%s ààààà ààààààà àà ààààààààà àààà àà ààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
-#, fuzzy, c-format
-#| msgid ""
-#| "Could not sync spool folder %s: %s\n"
-#| "Folder may be corrupt, copy saved in '%s'"
+#: ../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 synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "%s ààààà ààààààà àà ààààààààà àààà àà ààà: %s\n"
-"ààààààà àààà àà àààà àà, `%s' ààà àààà àààààààà àà"
+"ààààààà àààà àà àààà àà, '%s' ààà àààà àààààààà àà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:207
-#: ../camel/providers/nntp/camel-nntp-folder.c:296
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c: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:257
-#: ../camel/providers/nntp/camel-nntp-folder.c:261
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:692
+#: ../camel/providers/nntp/camel-nntp-folder.c: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:268
-#: ../camel/providers/nntp/camel-nntp-folder.c:435
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:438
-#, fuzzy, c-format
-#| msgid "Cannot get message %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: "
-msgstr "%s ààààà ààààààà àààà àà àààà: %s"
+msgstr "%s ààààà ààààààà àààà àà àààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:494
-#: ../camel/providers/nntp/camel-nntp-folder.c:500
-#: ../camel/providers/nntp/camel-nntp-folder.c:547
+#: ../camel/providers/nntp/camel-nntp-folder.c: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:542
-#, fuzzy
-#| msgid "Posting failed: %s"
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 msgid "Posting failed: "
-msgstr "àààààà àààà: %s"
+msgstr "àààààà àààà: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:571
+#: ../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:591
+#: ../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:44
+#: ../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 ""
 "ààààààààà àààààà ààà ààààààà ààààààà (ààà. c.o.linux àààà comp.os.linux àà) "
 "(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../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:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
-msgstr ""
+msgstr "àààààààà NNTP ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
-msgstr ""
+msgstr "SSL àà ààà NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "USENET àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr ""
 "àà USENET àààààà àààà àà ààààà àà ààààààà àààà àà àààà ààààààààààààà àà."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "ààààààààààà ààààààà àà àààààà àà àà àààààà NNTP ààààà àà ààà ààààààà ààààà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ààààààà àààààà ààààà àààààààà ààà àààà àààà ààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ààààà àà ààààààà àààà àà ààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
-#, fuzzy, c-format
-#| msgid "Could not read greeting from %s: %s"
 msgid "Could not read greeting from %s: "
-msgstr "%s àà ààààààà àààààààà àààà àààà ààà ààà: %s"
+msgstr "%s àà ààààààà àààààààà àààà àààà ààà ààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP ààààà àà àààààà ààà àààà %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../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:1053
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4234,24 +4201,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#: ../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:1162
+#: ../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:1185
+#: ../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:1329
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4262,7 +4229,7 @@ msgstr ""
 "\n"
 "ààà ààà àààààà àààà àààà àà. ààààà àà àààààà àààà ààààààà àà."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1380
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4273,73 +4240,68 @@ msgstr ""
 "\n"
 "àààààà àààà ààààà àààà àà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1573
-#, fuzzy
-#| msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
-msgstr "NNTP ààààà àààà: %s"
+msgstr "NNTP ààààà àààà: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "ààààààà àààà."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:235
-#: ../camel/providers/nntp/camel-nntp-summary.c:353
+#: ../camel/providers/nntp/camel-nntp-summary.c: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:251
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover àà ààààààààààà ààààà ààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ààààà àà ààààààààààà ààààà ààààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààààààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:283
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "%s UID àà ààà ààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:350
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP àààààà àààààààààààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:430
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "àààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:470
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "POP àààààà àààààààààààà àà ààà àà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:485
-#, fuzzy
-#| msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
-msgstr "POP àààààà àààà ààààààà àà àààà àà: %s"
+msgstr "POP àààààà àààà ààààààà àà àààà àà: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "àààààà ààààààà àà àààà ààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:567
+#: ../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 "ààààà àààààà"
 
@@ -4355,7 +4317,7 @@ msgstr "%s ààà àà àààààà àààààà (_D)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Delete _expunged from local Inbox"
-msgstr ""
+msgstr "ààààààà ààààààà àà àààààà ààààà (_e)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
@@ -4363,11 +4325,11 @@ msgstr "ààà POP3 ààààààà àà àààà ààààà
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "Default POP3 port"
-msgstr ""
+msgstr "àààààààà POP3 ààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP3 over SSL"
-msgstr ""
+msgstr "SSL àà ààà POP3"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
@@ -4377,7 +4339,7 @@ msgstr "POP"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP ààààà àà àààààà àà ààà ààààààà àà ààà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../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."
@@ -4386,7 +4348,7 @@ msgstr ""
 "àààààà ààààààà "
 "ààààààà àààààà àà."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../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 "
@@ -4402,137 +4364,95 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../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:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 msgid "STLS not supported by server"
 msgstr "SSLS ààààà àààààà ààààààà àààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
-#, fuzzy, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#, fuzzy, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
-msgid "Failed to connect to POP server %s in secure mode: "
-msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: %s"
+msgstr "POP ààààà %s àà àààààààà ààà %s ààà àààààà ààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "àààààà àààà àààààà àà àà ààààà ààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
+#: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"POP ààààà %s àà àààààà ààà àààà: ààààààà ààààààà ààààààààà àà ààà ààà àààààà "
-"àààà."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, fuzzy, c-format
-#| msgid "SASL '%s' Login failed for POP server %s: %s"
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "SASL '%s' POP ààààà %s àà ààà ààààà àààà: %s"
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "POP ààààà %s àà àààààààà ààà ààà àààààà ààà àààà: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ààààà %s àà ààààà àààà àà àààà: SASL ààààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
-#, fuzzy, c-format
-#| msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:310
+#, c-format
 msgid "Failed to authenticate on POP server %s: "
-msgstr "%s POP ààààà àà ààààààà ààà àààà: %s"
+msgstr "%s POP ààààà àà ààààààà ààà àààà: "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ààààà %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s àà %s àà ààà POP3 àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../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 ""
+"%s POP ààààà àà àààààà ààà àààààà:\tàààà APOP ID ààààààà. ààààààààà àà àààà "
+"àà ààààà àà. ààààà "
+"àààà àààààààààà àà àààààà àààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:427
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
 msgstr ""
 "%s POP ààààà àà àààààà ààà àààààà.\n"
-"ààààààà ààààà ààà àààààà: %s"
+"ààààààà ààààà ààà àààààà: "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending username: %s"
+#. 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"
 msgstr ""
 "%s POP ààààà àà àààààà ààà àààààà.\n"
-"àààààààà ààà ààààà ààà àààààà: %s"
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, fuzzy, 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"
-msgstr ""
-"%s POP ààààà àà àààààà ààà àààààà.\n"
-"ààààààà ààààà ààà àààààà: %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-#| msgid "IMAP server %s"
-msgid "POP3 server %s"
-msgstr "POP3 ààààà %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, fuzzy, c-format
-#| msgid "IMAP service for %s on %s"
-msgid "POP3 server for %s on %s"
-msgstr "%s àà %s àà ààà IMAP àààà"
+"àààààààà ààà %s ààààà ààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../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:653
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' àààà ààà ààààààà àààà."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
-msgstr ""
+msgstr "POP3 ààààà ààà ààà ààààààà ààààààààà àààà àà"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
@@ -4567,40 +4487,36 @@ msgstr "sendmail àà ààà àààà ààà àààà ààà:
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail àà fork àààà àà ààà:%s:ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
-#, fuzzy
-#| msgid "Could not send message: %s"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
-msgstr "ààààà àààà ààà ààà: %s"
+msgstr "ààààà àààà ààà ààà: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s ààààà àà àààààààà àà: ààà àààà àààà ààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../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:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail àààààààà àà àààààààà %d: ààà àààà àààà ààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
-msgstr ""
+msgstr "àààààààà SMTP ààààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-#, fuzzy
-#| msgid "SMTP server %s"
 msgid "SMTP over SSL"
-msgstr "SMTP ààààà %s"
+msgstr "SMTP ààààà SSL"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:44
 msgid "Message submission port"
-msgstr ""
+msgstr "ààààà ààà àààà àààà ààààà"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
@@ -4611,773 +4527,921 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "SMTP àà àààààà àààà ààà àààààà mailhub àà àààààà ààà ààà àààààààà àà ààà."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
-#| msgid "Welcome response error"
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ààààààààà àààààà àà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c: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:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-#| msgid "STARTTLS command failed: %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: "
 msgstr "STARTTLS ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
-#, fuzzy, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
-msgstr "àààààààà àààà ààà %s SMTP ààààà àà àààààà ààà àààà: %s"
+msgstr "àààààààà àààà ààà %s SMTP ààààà àà àààààà ààà àààà: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ààààà %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../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:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "%s SMTP ààààà ààààà àà ààààààà àààààà %s àà àààààà àààà àààà àà."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "%s SMTP ààààà ààààààà %s àà àààààà àààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:437
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ààààà ààààààà ààà àààà.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
+msgstr "ààà SASL àààààààà ààààààààà àààà àààà ààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c: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: "
+msgstr "AUTH ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#: ../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:561
+#: ../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:565
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "ààààà ààà ààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:590
+#: ../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:603
+#: ../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:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "ààààà àààà àààààà, ààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààààà àà àààà ààà ààààà àààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:710
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "ààààà àààà àààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "ààààà àààààààà àààà àààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "àààààà àààààà, àààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "àààà ààààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:722
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "ààààààà ààà àààààà ààà, àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "àààààààà ààààààà àààà;ààà ààààààààà àààà àààààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ààààààà ààà àààààààà àààà àà àà: àààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ààààààà àààààààà àààà àà àà: àààààààà àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "ààààààà àààààààà àààà àà àà: ààààààààà ààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "àààààààà ààààààà àààà; ààààà àààààà àààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:736
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ààààààà àààààààà àààà àà àà: ààààààààà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:738
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ààààààà ààà àààààà àààà àà: àààààà àààààà àà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../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:742
+#: ../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:744
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "ààà ààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:748
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "ààààààà ààààààà àà àààààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààà ààààààààà àààà ààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ààààààà ààààààà ààààààààà àà àààà àààà àà àààààààà àà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "ààààààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1004
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "SMTP àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1031
-#: ../camel/providers/smtp/camel-smtp-transport.c:1048
-#: ../camel/providers/smtp/camel-smtp-transport.c:1056
-#| msgid "HELO command failed: %s"
+#: ../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: "
 msgstr "HELO ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
-msgid "SMTP Authentication"
-msgstr "SMTP ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1144
-#: ../camel/providers/smtp/camel-smtp-transport.c:1155
-#: ../camel/providers/smtp/camel-smtp-transport.c:1168
-#| msgid "AUTH command failed: %s"
-msgid "AUTH command failed: "
-msgstr "AUTH ààààà àààà:"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1299
-#| msgid "MAIL FROM command failed"
+#: ../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: "
 msgstr "MAIL FROM ààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1326
-#| msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "RSET ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
-#: ../camel/providers/smtp/camel-smtp-transport.c:1351
+#: ../camel/providers/smtp/camel-smtp-transport.c: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:1393
-#: ../camel/providers/smtp/camel-smtp-transport.c:1403
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
-#: ../camel/providers/smtp/camel-smtp-transport.c:1491
-#: ../camel/providers/smtp/camel-smtp-transport.c:1504
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
-#| msgid "DATA command failed"
+#: ../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: "
 msgstr "DATA ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#: ../camel/providers/smtp/camel-smtp-transport.c:1559
-#| msgid "RSET command failed: %s"
+#: ../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: "
 msgstr "RSET ààààà àààà:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1584
-#: ../camel/providers/smtp/camel-smtp-transport.c:1598
-#: ../camel/providers/smtp/camel-smtp-transport.c:1605
-#| msgid "QUIT command failed: %s"
+#: ../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: "
 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:113
-#| msgid "URI not loaded"
+#: ../libedataserver/e-client.c:125
 msgid "Source not loaded"
 msgstr "ààààà ààààà àààà"
 
-#: ../libedataserver/e-client.c:115
-#| msgid "URI already loaded"
+#: ../libedataserver/e-client.c:127
 msgid "Source already loaded"
 msgstr "ààààà àààà àà ààà"
 
-#: ../libedataserver/e-client.c:123
-#| msgid "Offline mode unavailable"
+#. Translators: This means that the EClient does not support offline mode, or
+#. it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:137
 msgid "Offline unavailable"
 msgstr "àààààà àààààààà"
 
-#: ../libedataserver/e-client.c:145
-#| msgid "parse error"
+#: ../libedataserver/e-client.c:159
 msgid "D-Bus error"
 msgstr "D-Bus àààààà "
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c: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.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c: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.
+#. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c: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.
+#. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c: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:1654
+#. * 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:1659
+#. * 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:1662 ../libedataserver/e-time-utils.c:1782
-#: ../libedataserver/e-time-utils.c:1912
+#: ../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:1669
+#: ../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:1673
+#: ../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:1678
+#. * 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:1683
+#. * 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:1688
+#. * 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:1693
+#. * 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:1696 ../libedataserver/e-time-utils.c:1785
+#: ../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:1854 ../libedataserver/e-time-utils.c:1974
+#: ../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:1858 ../libedataserver/e-time-utils.c:1966
+#: ../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.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c: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:1867 ../libedataserver/e-time-utils.c:1963
+#. * 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:1870
+#: ../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:1874
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:94
-#: ../libedataserverui/e-book-auth-util.c:651
+#: ../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 àààààààà àà àààààà àààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr "àààà àààààààà àààààà àà ààà àà àààààààà àà àààààà àààà."
+
+#: ../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 "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 "àààààààà àààààà àà ààà ààààà àà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr "àààààààà àààààà àà ààà ààààà àà ààà àà àààààà àààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr "àààààààà àààààà àà ààà ààààà àààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr "àààààààà àààààà àà ààà ààààà àààààà àà àààààà àààà."
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "Proxy authentication user name"
+msgstr "àààààààà ààààààà àààààààààà ààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "User name to use to authenticate against proxy server."
+msgstr ""
+" àààààààà ààààà àà ààààà ààààààà àààà àà ààà àààààààààà ààà àà  ààààà àààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "Proxy authentication password"
+msgstr "àààààààà ààààààà ààààààà"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+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 is unreachable from SOCKS server"
+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 "àààààààà àààààààà ààààààà àààààà"
+
+#: ../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 ààààà àà àààààà ààà àà Access àà ààà àà"
 
-#: ../libedataserverui/e-book-auth-util.c:191
-#: ../libedataserverui/e-book-auth-util.c:412
+#: ../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:221
+#: ../libedataserverui/e-categories-editor.c:228
 msgid "Currently _used categories:"
-msgstr ""
+msgstr "ààà àààààààà ààààààà:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:237
 msgid "_Available Categories:"
 msgstr "àààààà ààààààà (_A)"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:322
 msgid "Icon"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:327
 msgid "Category"
 msgstr "àààà"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "\"%s\" àààààà ààààà"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:135
 msgid "Category Icon"
 msgstr "àààààà àààà"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:139
 msgid "_No Image"
-msgstr ""
+msgstr "ààà ààà àààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:176
 msgid "Category _Name"
 msgstr "àààààà ààà (_N)"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:184
 msgid "Category _Icon"
 msgstr "àààààà ààà (_I)"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:224
 msgid "Category Properties"
 msgstr "àààààà ààà"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../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:799
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:856
+#, c-format
 msgid ""
 "Enter password for calendar %s (user %s)\n"
 "Reason: %s"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr ""
+"àààààà %s àà ààà ààààààà àààà àààà (àààààààà %s)\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-client-utils.c:801
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:858
+#, c-format
 msgid "Enter password for calendar %s (user %s)"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr " àààààà %s àà ààà ààààààà àààà àààà (àààààààà %s)"
 
-#: ../libedataserverui/e-client-utils.c:805
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:862
+#, c-format
 msgid ""
 "Enter password for task list %s (user %s)\n"
 "Reason: %s"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr ""
+"ààààà àààà %s àà ààà ààààààà àààà àààà (àààààààà %s)\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-client-utils.c:807
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:864
+#, c-format
 msgid "Enter password for task list %s (user %s)"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr "ààààà àààà %s àà ààà ààààààà àààà àààà (àààààààà %s)"
 
-#: ../libedataserverui/e-client-utils.c:811
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:868
+#, c-format
 msgid ""
 "Enter password for memo list %s (user %s)\n"
 "Reason: %s"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr ""
+"àààààà àààà %s àà ààà ààààààà àààà àààà (àààààààà %s)\n"
+"àààà: %s"
 
-#: ../libedataserverui/e-client-utils.c:813
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
+#: ../libedataserverui/e-client-utils.c:870
+#, c-format
 msgid "Enter password for memo list %s (user %s)"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
-
-#: ../libedataserverui/e-client-utils.c:818
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
+msgstr "àààààà àààà %s àà ààà ààààààà àààà àààà (àààààààà %s)"
 
-#: ../libedataserverui/e-client-utils.c:820
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "%s àà àààà ààààààà ààààà (àààààààà %s)"
-
-#: ../libedataserverui/e-client-utils.c:917
-#| msgid "Enter password"
+#: ../libedataserverui/e-client-utils.c:981
 msgid "Enter Passphrase"
 msgstr "ààààààà ààààà àààà"
 
-#: ../libedataserverui/e-client-utils.c:919
-#| msgid "Enter password"
+#: ../libedataserverui/e-client-utils.c:983
 msgid "Enter Password"
 msgstr "ààààààà ààààà àààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:184
-#| msgid "Hot Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:187
 msgid "Show Contacts"
 msgstr "àààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:209
 msgid "Address B_ook:"
 msgstr "ààà àààààààà (_o):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
+#: ../libedataserverui/e-name-selector-dialog.c:217
 msgid "Cate_gory:"
 msgstr "àààààà (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:235
 msgid "_Search:"
 msgstr "àààààà (_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1011
+#: ../libedataserverui/e-name-selector-dialog.c:253
+#: ../libedataserverui/e-name-selector-dialog.c:1038
 msgid "Any Category"
 msgstr "ààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
-#| msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:255
 msgid "Co_ntacts"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Search"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Address Book"
 msgstr "ààà àààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:316
 msgid "Contacts"
 msgstr "àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:433
 msgid "Select Contacts from Address Book"
 msgstr "ààà àààààààà àà àààààààà àà ààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:766
+#: ../libedataserverui/e-name-selector-dialog.c:781
 msgid "_Add"
 msgstr "àààààà (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:770
+#: ../libedataserverui/e-name-selector-dialog.c:785
 msgid "_Remove"
 msgstr "àààààà (_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:930
-#, fuzzy, c-format
-#| msgid "Error reading mail file: %s"
+#: ../libedataserverui/e-name-selector-dialog.c:957
+#, c-format
 msgid "Error loading address book: %s"
-msgstr "ààà ààààà ààààà ààà ààà: %s"
+msgstr "ààà àààààààà ààà àààà ààà ààààààà %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2741
+#: ../libedataserverui/e-name-selector-entry.c:2823
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s àààààà àààààà (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2756
+#: ../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:2766
+#: ../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:2783
+#: ../libedataserverui/e-name-selector-entry.c:2865
 #, c-format
 msgid "_Edit %s"
 msgstr "àààààà (_E) %s"
 
-#: ../libedataserverui/e-name-selector-list.c:509
+#: ../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 ""
+msgstr "ààààà àààààà àààààà àà: ààà àààààààààà àà ààààà ààà àààà"
 
-#: ../libedataserverui/e-passwords.c:699
-#: ../libedataserverui/e-passwords-win32.c:612
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "àààà ààà ààààà ààà ààààà àààà àà."
 
-#: ../libedataserverui/e-passwords.c:819
-#: ../libedataserverui/e-passwords-win32.c:735
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "àà ààààààà àà ààà àààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:820
-#: ../libedataserverui/e-passwords-win32.c:736
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "àà àààà ààà ààà ààà àà àààà àà ààààààà àà ààà àààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:825
-#: ../libedataserverui/e-passwords-win32.c:741
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "àà ààààààà àà ààà àààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:826
-#: ../libedataserverui/e-passwords-win32.c:742
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "àà àààà ààà ààà ààà àà àààà àà ààààààà àà ààà àààà (_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:91
 msgid "Select destination"
 msgstr "àààààà ààààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:169
+#: ../libedataserverui/e-source-selector-dialog.c:166
 msgid "_Destination"
 msgstr "àààààà (_D)"
 
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+msgid "Keep running after the last client is closed"
+msgstr "àààà àà ààà ààààà ààààààà àà ààà àààà"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:52
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:56
+msgid "Wait running until at least one client is connected"
+msgstr "àààà àà ààààààààà àààà àà àà àà àà àà àà ààààààà ààààà ààà àà "
+
+#~| msgid "Invalid server URI"
+#~ msgid "Invalid URI"
+#~ msgstr "àààààà URI"
+
+#, fuzzy
+#~| msgid "Could not create cache file"
+#~ msgid "Could not instantiate backend"
+#~ msgstr "ààà àààà àààà ààà ààà"
+
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "%s ààà àààà àààà ààà: %s"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL àààààààà"
+
+#, fuzzy
+#~| msgid "URL '%s' needs a username component"
+#~ msgid "URL '%s' needs a user 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 ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "%s àà ààà SSL àààààààààà ààààààà:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "àààà àà ààààààà àààà ààààà ààà?"
+
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_k)"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "àààààà àààà àààààà àà àà ààààà ààà"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL ààààààà ààààààààà ààààààà ààà ààà."
+
+#~ msgid "You did not enter a password."
+#~ msgstr "àààà ààààààà àààà ààààà àààà."
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "ààààààà àààààà ààààà àààààààà ààà àààà àààà ààà"
+
+#~ msgid "TLS is not available in this build"
+#~ msgstr "àààààà àààà àààààà àà àà ààààà ààà"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "POP ààààà %s àà àààààà ààà àààà: ààààààà ààààààà ààààààààà àà ààà ààà àààààà àààà."
+
+#, fuzzy
+#~| msgid "SASL '%s' Login failed for POP server %s: %s"
+#~ msgid "SASL '%s' Login failed for POP server %s%s"
+#~ msgstr "SASL '%s' POP ààààà %s àà ààà ààààà àààà: %s"
+
+#, fuzzy
+#~| 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"
+#~ msgstr ""
+#~ "%s POP ààààà àà àààààà ààà àààààà.\n"
+#~ "ààààààà ààààà ààà àààààà: %s"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP ààààà ààààààà ààà àààà.\n"
+#~ "%s\n"
+#~ "\n"
+
 #~ msgid "Updating contacts cache (%d)... "
 #~ msgstr "àààààà ààà àààààà àà ààà àà (%d)... "
 
@@ -5426,9 +5490,6 @@ msgstr "àààààà (_D)"
 #~ msgid "Calendar"
 #~ msgstr "àààààà"
 
-#~ msgid "Verifying message"
-#~ msgstr "ààààà àà àààà àà ààà àà"
-
 #~ msgid "Cannot open message"
 #~ msgstr "ààààà àààà ààà àààà àà"
 
@@ -5583,9 +5644,6 @@ msgstr "àààààà (_D)"
 #~ msgid "AKID/Issuer serial mismatch"
 #~ msgstr "AKID/ààààààà àààààààà ààààà"
 
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "ààààà àààààà àààààààààà ààààààààà àà àààààà àààà àààà"
-
 #~ msgid "Error in application verification"
 #~ msgstr "ààààà àààà ààà ààà"
 
@@ -5806,9 +5864,6 @@ msgstr "àààààà (_D)"
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 #~ msgstr "'%s' ààààààà àà '%s' ààààààà ààà ààààà àààà àààà àà àààà àà: ààà ààààà"
 
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "ààà ààààà àà ààà àààààààààà àà àààà àààààà (_J)"
-
 #~ msgid "Only check for Junk messa_ges in the INBOX folder"
 #~ msgstr "ààààààà ààààààà ààà ààààà ààà ààààà àà àààà àààààà (_g)"
 



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