[evolution-data-server] Updated Oriya Translation



commit fee9da21d9cd01ff5edc80ae7d6315dd408ba5f6
Author: Manoj Kumar Giri <mgiri dhcp193-76 pnq redhat com>
Date:   Fri Sep 9 19:41:32 2011 +0530

    Updated Oriya Translation

 po/or.po | 5261 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 3098 insertions(+), 2163 deletions(-)
---
diff --git a/po/or.po b/po/or.po
index bace7ad..cc37fa6 100644
--- a/po/or.po
+++ b/po/or.po
@@ -3,19 +3,20 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Subhransu Behera <arya_subhransu yahoo co in>, 2006.
-# Manoj Kumar Giri <mgiri redhat com>, 2009, 2010.
+# Manoj Kumar Giri <mgiri redhat com>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2010-04-24 15:06+0000\n"
-"PO-Revision-Date: 2010-05-12 12:19+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-08-31 16:22+0000\n"
+"PO-Revision-Date: 2011-09-09 14:58+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri redhat com>\n"
 "Language-Team: Oriya <Translation-team-or lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -29,84 +30,245 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"Language: or\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/file/e-book-backend-file.c:823
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "àààà àààààà..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
+#: ../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
 msgid "Searching..."
 msgstr "àààààà àààààà..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "(%d) ààààààà ààààààà àààà àààààà... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:788
+msgid "Querying for updated contactsâ"
+msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "(%d) ààààààà ààààààà ààààààà àààààà... "
+#: ../addressbook/backends/google/e-book-backend-google.c:839
+#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1337
+#: ../libedataserver/e-client.c:1851
+msgid "Personal"
+msgstr "ààààààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:841
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "ààààààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:843
+#| msgid "Family Name"
+msgid "Family"
+msgstr "àààààà"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:845
+msgid "Coworkers"
+msgstr "ààààààààààà"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:924
+msgid "Querying for updated groupsâ"
+msgstr "ààààààà àààààààààààà àààààà ààààààààâ"
+
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1329
+#| msgid "Cannot get folder container %s"
+msgid "Creating new contactâ"
+msgstr "àààà ààààààà ààààààààààààâ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
+msgid "Deleting contactâ"
+msgstr "ààààààààà ààààààà ààààààâ"
+
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1699
+#| msgid "Cannot create encoder context"
+msgid "Modifying contactâ"
+msgstr "ààààààààà ààààààààààà ààààààâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
+#| msgid "Loading..."
+msgid "Loadingâ"
+msgstr "àààà àààààà..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ"
+msgstr "ààààà àààà ààààààà àààààà..."
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "ààààà àààààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "àààààààà ààà (DN) àà ààààààà àààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "à-ààà ààààààà ààààààà àààààà"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP àààà àààà ààààààààààà àààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "àààà DN ààààà ààààààà"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP àààààà ààààààà ààà àààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP àààààà ààààààà ààààààà àààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP àààààà "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "LDAP àààààà ààààààà ààààààà àààààà..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "àààààà ààààà ààààà àààààà"
 
-#: ../addressbook/libebook/e-book.c:2152
-#, fuzzy, c-format
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#, 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
+#, c-format
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
+"àààà '%s' àà ààààààà àààààà àààààà ààààààà HTTP àààààà àààà àààà àààààà: %d (%"
+"s)"
+
+#: ../addressbook/libebook/e-book.c:3158
+#, 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: gconf àà ààààààààà `%s' àà.à.àà. àààà ààààà àààà ààààà"
+msgstr "%s: GConf àà àààààààà UID '%s' àààà ààààà àààà ààààà"
+
+#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1317
+#: ../libedataserver/e-client.c:1846
+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."
+msgid "Address book does not exist"
+msgstr "ààààà àààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:85
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "àààà ààààà àààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:87
+#: ../addressbook/libedata-book/e-data-book.c:303
+#| msgid "Object not found"
+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"
+msgid "Contact ID already exists"
+msgstr "ààààààà ID ààààààà ààààààà ààà"
+
+#: ../addressbook/libebook/e-book-client.c:91
+#| msgid "No such message"
+msgid "No such source"
+msgstr "àààà ààààà àààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:93
+#: ../addressbook/libedata-book/e-data-book.c:320
+#| msgid "Namespace:"
+msgid "No space"
+msgstr "ààààà ààààà ààààà"
+
+#: ../addressbook/libebook/e-book-client.c:449
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "àààà ààààààààààà ààààààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:459
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:565
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "àààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:560
+#: ../calendar/libecal/e-cal-client.c:678
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ààà uri '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:598
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "àààààà àààààà àààààààà àààà"
+
+#: ../addressbook/libebook/e-book-client.c:705
+#: ../calendar/libecal/e-cal-client.c:826
+#, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "àààà àààààààà àààààààà UID '%s' àààà ààààà àààà àààààà"
+
+#: ../addressbook/libebook/e-book-client.c:2094
+#: ../calendar/libecal/e-cal-client.c:4132
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get connection to view"
+msgstr "àààààà àààà ààààà àààààà ààààààààà ààààà"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "ààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. 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
 msgid "File Under"
 msgstr "ààà àààààà àààà àààààà"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "àààààà àà.àà.àà."
 
@@ -114,1040 +276,1236 @@ msgstr "àààààà àà.àà.àà."
 #. 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:124
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Full Name"
 msgstr "àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "ààà ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "ààà ààà"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "à-ààà à"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "à-ààà à"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "à-ààà à"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "à-ààà à"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "àààààà"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "àààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "ààààààà ààààà àààà"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "àààààààà ààààà àààà"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "ààààààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "ààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "àà-ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "ààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "ààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "àà ààà"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "àà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "àà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "àààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "àààààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "àààà"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "àààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "ààààà"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ààààààà"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "àààààà àààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "àààààà"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "àààààààà ààààààààà àà.àà.àà."
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "ààààà àà.àà.àà."
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ààààà"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "àààààààààà àà.àà.àà."
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ààààà/àààààà àà.àà.àà."
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "ICS àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "ààààà àààààààà àà.àà.àà."
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "ààààààààà ààà"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "ààààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "àààà ààààààà ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "àààà ààààààà ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "àààà ààààààà ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "àààà ààààààà àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "àààà ààààààà àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "àààà ààààààà àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:203
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:206
 #| msgid "Jabber Home Id 1"
 msgid "Jabber Home ID 1"
-msgstr "Jabber ààààààààà ààààà à"
+msgstr "Jabber ààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:204
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:207
 #| msgid "Jabber Home Id 2"
 msgid "Jabber Home ID 2"
-msgstr "Jabber ààààààààà ààààà à"
+msgstr "Jabber ààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:205
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:208
 #| msgid "Jabber Home Id 3"
 msgid "Jabber Home ID 3"
-msgstr "Jabber ààààààààà ààààà à"
+msgstr "Jabber ààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:206
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:209
 #| msgid "Jabber Work Id 1"
 msgid "Jabber Work ID 1"
-msgstr "Jabber àààààààààààà ààààà à"
+msgstr "Jabber ààààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:210
 #| msgid "Jabber Work Id 2"
 msgid "Jabber Work ID 2"
-msgstr "Jabber àààààààààààà ààààà à"
+msgstr "Jabber ààààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:211
 #| msgid "Jabber Work Id 3"
 msgid "Jabber Work ID 3"
-msgstr "Jabber àààààààààààà ààààà à"
+msgstr "Jabber ààààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
-msgstr "Yahoo! ààààààààà àààà ààà à"
+msgstr "Yahoo! ààààààààà àààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
-msgstr "Yahoo! ààààààààà àààà ààà à"
+msgstr "Yahoo! ààààààààà àààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
-msgstr "Yahoo! ààààààààà àààà ààà à"
+msgstr "Yahoo! ààààààààà àààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
-msgstr "Yahoo! àààààààààààà àààà ààà à"
+msgstr "Yahoo! ààààààààààà àààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN àààààààààààà àààà ààà à"
 
-#: ../addressbook/libebook/e-contact.c:221
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:224
 #| msgid "ICQ Home Id 1"
 msgid "ICQ Home ID 1"
-msgstr "ICQ ààààààààà ààààà à"
+msgstr "ICQ ààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:222
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:225
 #| msgid "ICQ Home Id 2"
 msgid "ICQ Home ID 2"
-msgstr "ICQ ààààààààà ààààà à"
+msgstr "ICQ ààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:223
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:226
 #| msgid "ICQ Home Id 3"
 msgid "ICQ Home ID 3"
-msgstr "ICQ ààààààààà ààààà à"
+msgstr "ICQ ààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:224
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:227
 #| msgid "ICQ Work Id 1"
 msgid "ICQ Work ID 1"
-msgstr "ICQ àààààààààààà ààààà à"
+msgstr "ICQ ààààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:228
 #| msgid "ICQ Work Id 2"
 msgid "ICQ Work ID 2"
-msgstr "ICQ àààààààààààà ààààà à"
+msgstr "ICQ ààààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:229
 #| msgid "ICQ Work Id 3"
 msgid "ICQ Work ID 3"
-msgstr "ICQ àààààààààààà ààààà à"
+msgstr "ICQ ààààààààààà ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "àààààà ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ààà àààààà àààààà"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "ààààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "àààààààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "àààààààà ààààà"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "ààààà àààààà"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "ààà"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "à-ààà àààààà"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "AIM àààà ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:250
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:253
 #| msgid "GroupWise Id List"
 msgid "GroupWise ID List"
-msgstr "GroupWise ààààà àààààà"
+msgstr "GroupWise ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:251
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:254
 #| msgid "Jabber Id List"
 msgid "Jabber ID List"
-msgstr "Jabber ààààà àààààà"
+msgstr "Jabber ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! àààà ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "MSN àààà ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:254
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:257
 #| msgid "ICQ Id List"
 msgid "ICQ ID List"
-msgstr "ICQ ààààà àààààà"
+msgstr "ICQ ID àààààà"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
-msgstr "HTML ààà ààà àààààà"
+msgstr "HTML ààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "àààààà"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "àààààà àààààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "àààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
 msgid "Anniversary"
 msgstr "àààààààà"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "X.509 àààààààààà"
 
-#: ../addressbook/libebook/e-contact.c:267
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:270
 #| msgid "Gadu-Gadu Home Id 1"
 msgid "Gadu-Gadu Home ID 1"
-msgstr "Gadu-Gadu ààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:268
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:271
 #| msgid "Gadu-Gadu Home Id 2"
 msgid "Gadu-Gadu Home ID 2"
-msgstr "Gadu-Gadu ààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:269
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:272
 #| msgid "Gadu-Gadu Home Id 3"
 msgid "Gadu-Gadu Home ID 3"
-msgstr "Gadu-Gadu ààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:270
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:273
 #| msgid "Gadu-Gadu Work Id 1"
 msgid "Gadu-Gadu Work ID 1"
-msgstr "Gadu-Gadu àààààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààààà ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:274
 #| msgid "Gadu-Gadu Work Id 2"
 msgid "Gadu-Gadu Work ID 2"
-msgstr "Gadu-Gadu àààààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààààà ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:275
 #| msgid "Gadu-Gadu Work Id 3"
 msgid "Gadu-Gadu Work ID 3"
-msgstr "Gadu-Gadu àààààààààààà ààààà à"
+msgstr "Gadu-Gadu ààààààààààà ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:276
 #| msgid "Gadu-Gadu Id List"
 msgid "Gadu-Gadu ID List"
-msgstr "Gadu-Gadu ààààà àààààà"
+msgstr "Gadu-Gadu ID àààààà"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "àààààà ààààà"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "ààààààà"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "Skype ààààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "Skype ààààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "Skype ààààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "Skype ààààààààààà ààà 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "Skype ààààààààààà ààà 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "Skype ààààààààààà ààà 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Skype ààà àààààà"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "SIP ààààà"
 
-#: ../addressbook/libebook/e-contact.c:1515
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:293
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google ààààààààààà ààààààààà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google ààààààààààà ààààààààà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google ààààààààààà ààààààààà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google ààààààààààà ààààààààààà ààà 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google ààààààààààà ààààààààààà ààà 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google ààààààààààà ààààààààààà ààà 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Google ààààààààààà ààà àààààà"
+
+#: ../addressbook/libebook/e-contact.c:1550
+#: ../addressbook/libebook/e-destination.c:868
 msgid "Unnamed List"
 msgstr "ààààààà àààààà"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr "ààààààààààà ààààààààà ààààà, ààààààà ààààààààà ààààààà"
+
+#: ../addressbook/libedata-book/e-book-backend.c:92
 #, c-format
-msgid "Empty URI"
-msgstr ""
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "àààà àààààà ààààààà '%s'"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
-#, fuzzy, c-format
-#| msgid "%s: Invalid source."
-msgid "Invalid source"
-msgstr "%s: àààà ààààà"
+#: ../addressbook/libedata-book/e-book-backend.c:104
+#, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "àààààà ààààààà '%s' à ààààà àààààààààà ààààààààà ààààà"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
+#, c-format
+msgid "Insufficient memory"
+msgstr "àààààà ààààààààààà ààààà"
+
+#. 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"
+msgid "Invalid query: "
+msgstr "àààà àààààà: "
+
+#: ../addressbook/libedata-book/e-data-book.c:299
+#: ../calendar/libedata-cal/e-data-cal.c:414
+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
+msgid "Backend is busy"
+msgstr "àààààààààà àààààà ààà"
 
 #: ../addressbook/libedata-book/e-data-book.c:301
-#, fuzzy
-#| msgid "Cannot open message"
-msgid "Cannot open book"
-msgstr "àààààààà àààà ààààààààà"
+#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
+#| msgid "Repository is offline"
+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
+msgid "Permission denied"
+msgstr "àààààà ààààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:422
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
+msgstr "ààààààà àààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:423
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "ààààààà àààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libedata-cal/e-data-cal.c:424
+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
+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
+msgid "TLS not available"
+msgstr "TLS àààààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:311
+msgid "Book removed"
+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."
+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
+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
+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
+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
+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 "Could not cancel operation"
+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
-msgid "Cannot remove book"
-msgstr ""
+#: ../calendar/libedata-cal/e-data-cal.c:437
+msgid "Invalid server version"
+msgstr "àààà àààà ààààààà"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-#, fuzzy
+#: ../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
+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"
+msgid "Not supported"
+msgstr "ààààààà àààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "àààààààààà àààààààààà àààà ààààà"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../calendar/libecal/e-cal-client.c:573
+#: ../calendar/libedata-cal/e-data-cal.c:449 ../libedataserver/e-client.c:147
+#| msgid "Other Phone"
+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"
-msgid "Cannot get contact"
-msgstr "ààààà àààà ààààà %s ààààà ààààà"
+msgid "Cannot get contact: "
+msgstr "ààààààà ààà àààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:580
+msgid "Empty query: "
+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"
+msgid "Cannot add contact: "
+msgstr "ààààààà ààààààààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr ""
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:624
+#: ../addressbook/libedata-book/e-data-book.c:951
+#| msgid "Cannot create encoder context"
+msgid "Cannot modify contact: "
+msgstr "ààààààààà àààààààààà ààààààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, fuzzy
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
 #| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate user"
-msgstr "ààààààà ààààààà àààààà ààààà: %s"
+msgid "Cannot authenticate user: "
+msgstr "àààààà ààààààà àààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-#, fuzzy
-#| msgid "Cannot add encryption certificate"
-msgid "Cannot add contact"
-msgstr "ààààààà àààààààààà àààààààààààà ààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:779
+#| msgid "Cannot open message"
+msgid "Cannot open book: "
+msgstr "àààààààà àààà àààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-#, fuzzy
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:793
+#| msgid "Cannot open message"
+msgid "Cannot remove book: "
+msgstr "àààààààà ààààà àààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:818
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh address book: "
+msgstr "ààààà àààààààà àààà ààààààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:834
 #| msgid "Cannot create encoder context"
-msgid "Cannot modify contact"
-msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
+msgid "Cannot get backend property: "
+msgstr "ààààààààà ààààààà ààà àààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-#, fuzzy
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
+#| msgid "Cannot save calendar data"
+msgid "Cannot set backend property: "
+msgstr "ààààààààà ààààààà ààà ààààààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:881
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: "
+msgstr "ààààààà àààààà ààà àààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:905
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list uids: "
+msgstr "ààààààà àààààà uid ààààààà ààà àààààà ààààà: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:969
 #| msgid "Cannot create encoder context"
-msgid "Cannot remove contacts"
-msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
+msgid "Cannot remove contacts: "
+msgstr "ààààààààààààà ààààà ààààààààà ààààà: "
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Invalid query"
-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
+#, c-format
+msgid "Empty URI"
+msgstr "àààà URI"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-#, fuzzy
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes"
-msgstr "àààààà %s ààààà ààààà: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-#, fuzzy
-#| msgid "Could not cancel operation"
-msgid "Cannot complete operation"
-msgstr "ààààààà ààààà ààààààààà ààààà"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"ààààààààààà GnuPG àààààà ààààààà àààààààà àààà:\n"
+"\n"
+"%s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "ààààààà"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "ààààààà: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "àààààààà: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "àààààààààà àààààà àààààààà àààààààà ààààà: ààààààà ààààà àààààààà àà.àà.àà.à"
+msgstr ""
+"àààààààààà àààààà àààààààà àààààààà ààààà: ààààààà ààààà àààààààà àà.àà.àà.à"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:321
-msgid "Could not create thread for getting deltas"
-msgstr "delta ààààààà ààààà àààà ààààà àààààààà ààààààààà ààààà"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:353
-#: ../calendar/backends/google/e-cal-backend-google.c:1120
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1088
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "àààààà ààààà àààààà àààààààà ààààààààà ààààà"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:366
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1101
-msgid "Could not create thread for populating cache"
-msgstr "àààààà ààààààà àààààààà ààààà àààà ààààà àààààààà ààààààààà ààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2160
-msgid "Reply Requested: by "
-msgstr "àààààà ààààà àààààà àààààààà:"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
-msgid "Reply Requested: When convenient"
-msgstr "ààààà àààà àààààà: àààààààà àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:293
-#, c-format
-msgid "Loading %s items"
-msgstr "%s ààààààà àààà àààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
-msgid "Calendar"
-msgstr "àààààààààà"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:985
-msgid "Invalid server URI"
-msgstr "àààà àààà àà.àà.àà."
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1013
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1106
-#: ../calendar/libecal/e-cal.c:4019
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1398
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1413
-#: ../camel/providers/groupwise/camel-groupwise-store.c:603
-#: ../camel/providers/groupwise/camel-groupwise-store.c:780
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:84
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:115
-msgid "Authentication failed"
-msgstr "ààààààà àààà"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "àààà àà.àà.àà. ààààààààààà àààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "àààà àààà ààààà"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "ààààà àààààààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../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
+msgid "Could not create cache file"
+msgstr "àààààà ààààà àààààà àààààààà ààààààààà ààààà"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:183
 msgid "Could not retrieve weather data"
 msgstr "ààààààà ààààààà àààààààààà ààààààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "ààààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "ààààààà: ààààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "ààààààà: ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "ààààààà: ààààà àà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "ààààààà: àààààààà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "ààààààà: ààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "ààààààà: ààà àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "ààààààà: àààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "ààààààà: ààààà àà ààààà"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ààààààààààà"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal.c:867 ../libedataserverui/e-book-auth-util.c:198
+#: ../libedataserverui/e-book-auth-util.c:417
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
+
+#.
+#. This password prompt will be prompted rarely. Since the key that is passed to
+#. the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:881
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr ""
+"%s àààà àààààà àààààààà ààà àààààà àààààà %s àààà àààà àààààààààà àààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4409
+msgid "Repository is offline"
+msgstr "àààààà àààààà ààà"
+
+#: ../calendar/libecal/e-cal.c:4411 ../calendar/libecal/e-cal-client.c:127
+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
+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
+msgid "Invalid object"
+msgstr "àààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4417
+msgid "URI not loaded"
+msgstr "à.àà.àà. àààà àààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4419
+msgid "URI already loaded"
+msgstr "à.àà.àà. ààààààà àààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4423
+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
+msgid "Object ID already exists"
+msgstr "ààààà ààààà ààààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4427
+msgid "Protocol not supported"
+msgstr "àààààààà ààààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4429
+msgid "Operation has been canceled"
+msgstr "ààààààà ààààà àààààààà"
+
+#: ../calendar/libecal/e-cal.c:4431
+msgid "Could not cancel operation"
+msgstr "ààààààà ààààà ààààààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4433 ../libedataserver/e-client.c:117
+msgid "Authentication failed"
+msgstr "ààààààà àààà"
+
+#: ../calendar/libecal/e-cal.c:4435
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../libedataserver/e-client.c:119
+msgid "Authentication required"
+msgstr "ààààààà àààààà"
+
+#: ../calendar/libecal/e-cal.c:4437
+#, fuzzy
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "ààààà àààààà ààààààààà ààààà"
+
+#: ../calendar/libecal/e-cal.c:4441
+msgid "No error"
+msgstr "ààààà àààààà ààààà"
+
+#: ../calendar/libecal/e-cal-client.c:133
+#: ../calendar/libedata-cal/e-data-cal.c:429
+#, fuzzy
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "àààà àààààà"
+
+#: ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:418
+msgid "Invalid range"
+msgstr "àààà ààààààà"
+
+#: ../calendar/libecal/e-cal-client.c:555
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "àààà ààààààààààà ààààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:717
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "àààà ààààààààààà ààààààà àààà"
+
+#: ../calendar/libecal/e-cal-client.c:755
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#, fuzzy
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "ààààà '%s' ààààààà àààààà"
+
+#: ../calendar/libecal/e-cal-client.c:865
+#, fuzzy
+#| msgid "%s: Invalid source."
+msgid "Invalid source type"
+msgstr "%s: àààà ààààà"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "àààààà ààààà àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "ààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "ààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "ààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "àààààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "àààà"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#, fuzzy
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+#, fuzzy
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "àààààà"
 
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+#, fuzzy
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "ààà"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:702
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ààààààààà"
 
-#: ../calendar/libecal/e-cal.c:1172 ../libedataserverui/e-book-auth-util.c:199
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
-
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1186
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s àààà àààààà àààààààà ààà àààààà àààààà %s àààà àààà àààààààààà àààààà àààà"
-
-#: ../calendar/libecal/e-cal.c:3991
-msgid "Invalid argument"
-msgstr "àààà ààààààààààà"
-
-#: ../calendar/libecal/e-cal.c:3993
-msgid "Backend is busy"
-msgstr "àààààààààà àààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:3995
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Repository is offline"
-msgstr "àààààà àààààà ààà"
-
-#: ../calendar/libecal/e-cal.c:3997
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-msgid "No such calendar"
-msgstr "àààà ààààà àààààààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:3999
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ààààà àààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4001
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "àààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4003
-msgid "URI not loaded"
-msgstr "à.àà.àà. àààà àààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4005
-msgid "URI already loaded"
-msgstr "à.àà.àà. ààààààà àààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:4007
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "àààààà ààààààà"
-
-#: ../calendar/libecal/e-cal.c:4009
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "àààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:4011
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-msgid "Object ID already exists"
-msgstr "ààààà ààààà ààààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4013
-msgid "Protocol not supported"
-msgstr "àààààààà ààààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4015
-msgid "Operation has been canceled"
-msgstr "ààààààà ààààà àààààààà"
-
-#: ../calendar/libecal/e-cal.c:4017
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
-msgid "Could not cancel operation"
-msgstr "ààààààà ààààà ààààààààà ààààà"
-
-#: ../calendar/libecal/e-cal.c:4021
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Authentication required"
-msgstr "ààààààà àààààà"
-
-#: ../calendar/libecal/e-cal.c:4023
-msgid "A CORBA exception has occurred"
-msgstr "ààààà àààààà ààààààààà ààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot process, calendar backend is opening"
+msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:4025
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:534
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:153
-#: ../camel/providers/imap/camel-imap-command.c:451
-#: ../camel/providers/imap/camel-imap-store.c:725
-#: ../camel/providers/pop3/camel-pop3-store.c:593
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "àààà àààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:207
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "àààà àààààà: %s"
 
-#: ../calendar/libecal/e-cal.c:4027
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "No error"
-msgstr "ààààà àààààà ààààà"
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ààààà ààààààààààà ààà àààààààà"
@@ -1156,7 +1514,7 @@ msgstr "\"%s\" ààààà ààààààààààà ààà à
 #: ../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:1090
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ààààà ààààààààààà ààà àààààà"
@@ -1164,7 +1522,7 @@ 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:737
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ààààà ààààààààààààà ààààà ààààààààà àààà àààààààààà àààààà"
@@ -1172,13 +1530,14 @@ msgstr "\"%s\" ààààà ààààààààààààà ààà
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" ààààà ààààààààààààà ààààà ààààà/ààà ààààààààà àààà àààààààààà àààààà"
+msgstr ""
+"\"%s\" ààààà ààààààààààààà ààààà ààààà/ààà ààààààààà àààà àààààààààà àààààà"
 
 #: ../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:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ààààà ààààààààààààà ààààààààà"
@@ -1187,9 +1546,9 @@ msgstr "\"%s\" ààààà ààààààààààààà ààà
 #: ../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:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../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
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ààààà ààààààààààààà ààààà ààà àààààà ààààààààà (_t)"
@@ -1200,290 +1559,244 @@ 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:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ààààààà ààààààààààààà ààààà ààà àààààà ààààààààà (_t)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ààààààà ààààààààààààà ààààà ààààààààà àààààà ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, 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\", àààààà \"description\", àààààà "
-"\"location\", àààààà \"attendee\", àààààà \"organizer\", àààààà \"classification\" "
+"\"%s\" ààààà ààààààààààààà ààààà \"any\", \"summary\", àààààà "
+"\"description\", àààààà "
+"\"location\", àààààà \"attendee\", àààààà \"organizer\", àààààà "
+"\"classification\" "
 "àààààà ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ààààààà ààààà ààààààààààà ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" ààààà àààààààààààààààààà ààààààààà àààààà ààààà ààà àààà ààààà ààààààààààààà àààààà false "
+"\"%s\" ààààà àààààààààààààààààà ààààààààà àààààà ààààà ààà àààà ààààà "
+"ààààààààààààà àààààà false "
 "(#f) ààààà ààààààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-msgid "Invalid range"
-msgstr "àààà ààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "àààààààà ààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "àààààààà àààààà"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "àààààààà ààààààààà àààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "TLS àààààà ààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "àààààà àààààà àààààà ààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "àààààà àààà àààà ààààààà àààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "àààààà ààà àààà ààààààà àààààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "àààààà àààà ààààà"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "àààà àààà ààààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:501
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar address"
-msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:519
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "àààààààààà àààààà àààààààà àààààààà ààààà: ààààààà ààààà àààààààà àà.àà.àà.à"
-
-#: ../calendar/libedata-cal/e-data-cal.c:537
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's ldap attribute"
+msgid "Cannot open calendar: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:555
-#, fuzzy, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "CMS àààààà ààààà àààààà ààààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:572
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:930
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot open calendar"
+msgid "Cannot remove calendar: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:591
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:955
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot refresh calendar"
+msgid "Cannot refresh calendar: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:608
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar"
+msgid "Cannot retrieve backend property: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:627
-#, fuzzy, c-format
-#| msgid "Cannot create encoder context"
-msgid "Cannot create calendar object"
-msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:649
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1025
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot modify calendar object"
+msgid "Cannot retrieve calendar object path: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:673
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1050
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar object"
+msgid "Cannot retrieve calendar object list: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:692
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1075
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot receive calendar objects"
+msgid "Cannot retrieve calendar free/busy list: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot discard calendar alarm"
-msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1101
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object: "
+msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:728
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot send calendar objects"
+msgid "Cannot modify calendar object: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:763
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1156
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot retrieve default calendar object path"
+msgid "Cannot remove calendar object: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:781
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1179
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object path"
+msgid "Cannot receive calendar objects: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:799
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1204
+#, fuzzy
 #| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object list"
+msgid "Cannot send calendar objects: "
 msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:837
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1231
+#, fuzzy
 #| msgid "Could not retrieve weather data"
-msgid "Could not retrieve attachment list"
+msgid "Could not retrieve attachment uris: "
 msgstr "ààààààà ààààààà àààààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:859
-#, fuzzy, c-format
-#| msgid "Could not create cache file"
-msgid "Could not complete calendar query"
-msgstr "àààààà ààààà àààààà àààààààà ààààààààà ààààà"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+#, fuzzy
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ààààààà ààààààà àààààà ààààà: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:877
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+#, fuzzy
 #| msgid "Could not retrieve weather data"
-msgid "Could not retrieve calendar time zone"
+msgid "Could not get calendar view path: "
 msgstr "ààààààà ààààààà àààààààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:895
-#, fuzzy, c-format
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone: "
+msgstr "ààààààà ààààààà àààààààààà ààààààààà ààààà"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1326
+#, fuzzy
 #| msgid "Could not cancel operation"
-msgid "Could not add calendar time zone"
+msgid "Could not add calendar time zone: "
 msgstr "ààààààà ààààà ààààààààà ààààà"
 
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-msgid "Could not set default calendar time zone"
-msgstr ""
-
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
 #, fuzzy, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar changes"
-msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
-
-#: ../calendar/libedata-cal/e-data-cal.c:983
-#, fuzzy, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "àààà ààààààà"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, fuzzy, c-format
 #| msgid "Invalid server URI"
 msgid "Invalid URI"
 msgstr "àààà àààà àà.àà.àà."
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../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:390
+#: ../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:74
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ààààààààà ààà àààààààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:109
-msgid "Signing message"
-msgstr "ààààààààà àààààà"
-
-#: ../camel/camel-cipher-context.c:129
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ààààà àààààà ààà àààààààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:162
-msgid "Verifying message"
-msgstr "àààààààààààà àààààà"
-
-#: ../camel/camel-cipher-context.c:185
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ààà àààààààààà àààààà àààààààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:220
-msgid "Encrypting message"
-msgstr "àààààààà ààààààà àààààà"
-
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ààà àààààààààà àààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-cipher-context.c:272
-msgid "Decrypting message"
-msgstr "àààààààà àààààà àààààà"
-
-#: ../camel/camel-cipher-context.c:292
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ààà ààà àààààààààà àààààà àà àààààà ààààààààààà"
 
-#: ../camel/camel-cipher-context.c:332
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ààà ààà àààààààààà àààààà àà ààààààà ààààààààààà"
 
-#: ../camel/camel-data-cache.c:184
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "ààààààààà àààààà"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "àààààààà ààààààà àààààà"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "àààààààà àààààà àààààà"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "àààààà àà ààààààà ààààààà àààààà"
 
-#: ../camel/camel-data-cache.c:475
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "àààààà ààààà àààààààààààà ààààà: %s: %s"
 
-#: ../camel/camel-db.c:458
-msgid "Insufficient memory"
-msgstr "àààààà ààààààààààà ààààà"
-
-#: ../camel/camel-disco-diary.c:188
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1494,8 +1807,8 @@ msgstr ""
 "ààà ààààààà ààààààààà ààààààà àààà ààà ààààààààà ààààààààààààà\n"
 "ààààààààààà àààààà àààààà"
 
-#: ../camel/camel-disco-diary.c:252
-#: ../camel/providers/imap/camel-imap-journal.c:297
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1506,123 +1819,179 @@ msgstr ""
 "%s\n"
 "ààà ààààààà àààààààààà ààààààààààààààààà àààà ààààààà ààààààà"
 
-#: ../camel/camel-disco-diary.c:292
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "ààààà àààà àààà ààààààà àààààà"
 
-#: ../camel/camel-disco-folder.c:38 ../camel/camel-offline-folder.c:37
-msgid "Copy folder content locally for offline operation"
-msgstr "àààààà àààààà àààà ààààà ààààààààààà ààà àààààà"
-
-#: ../camel/camel-disco-folder.c:59 ../camel/camel-offline-folder.c:56
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "àààààà àààààà àààà àààà ààààààààààààà àààà àààààà"
 
-#: ../camel/camel-disco-folder.c:360
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "àààààà àààà ààààà '%s' àà àààààààà àààààà"
 
-#: ../camel/camel-disco-store.c:373
-#: ../camel/providers/groupwise/camel-groupwise-store.c:227
-#: ../camel/providers/imap/camel-imap-store.c:988
-#: ../camel/providers/imap/camel-imap-store.c:1845
-#: ../camel/providers/imap/camel-imap-store.c:2303
-#: ../camel/providers/imap/camel-imap-store.c:3134
-#: ../camel/providers/imapx/camel-imapx-store.c:172
-#: ../camel/providers/imapx/camel-imapx-store.c:649
-#: ../camel/providers/imapx/camel-imapx-store.c:713
-#: ../camel/providers/imapx/camel-imapx-store.c:764
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
+msgid "Copy folder content locally for offline operation"
+msgstr "àààààà àààààà àààà ààààà ààààààààààà ààà àààààà"
+
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1153
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imap/camel-imap-store.c:3171
+#: ../camel/providers/imapx/camel-imapx-folder.c:311
+#: ../camel/providers/imapx/camel-imapx-folder.c:344
+#: ../camel/providers/imapx/camel-imapx-folder.c:398
+#: ../camel/providers/imapx/camel-imapx-folder.c:444
+#: ../camel/providers/imapx/camel-imapx-folder.c:478
+#: ../camel/providers/imapx/camel-imapx-folder.c:518
+#: ../camel/providers/imapx/camel-imapx-folder.c:554
+#: ../camel/providers/imapx/camel-imapx-store.c:238
+#: ../camel/providers/imapx/camel-imapx-store.c:1278
+#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imapx/camel-imapx-store.c:1412
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ààà àààààààà àààààààààà ààààà àààà ààààààà àààààà ààààààà ààààààà ààà"
 
-#: ../camel/camel-exception.c:259
-msgid "No description available"
-msgstr "ààààà àààààààà àààààà ààààà"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "ààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:803 ../camel/camel-filter-search.c:583
+#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "àààààààààà àààààà '%s'àà ààààààà ààààààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:846
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%sàà àààààààà àààà àààààà àààà: %s"
 
-#: ../camel/camel-filter-driver.c:1035 ../camel/camel-filter-driver.c:1044
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "àààààààààààà ààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1132 ../camel/camel-filter-driver.c:1559
+#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "àààààà àààààààà ààààà ààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "àààààà àààààààà ààààààà àààààà: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1234
+#: ../camel/camel-filter-driver.c:1258
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ààààà ààààààà àààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1269
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ààààà ààààààà ààààààààààà ààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1262
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "àààààà %dàà ààààà àààààà (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1268
-msgid "Cannot open message"
-msgstr "àààààààà àààà ààààààààà"
-
-#: ../camel/camel-filter-driver.c:1269 ../camel/camel-filter-driver.c:1290
+#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
 #, c-format
 msgid "Failed on message %d"
 msgstr "àààààà %d àààà àààà"
 
-#: ../camel/camel-filter-driver.c:1304 ../camel/camel-filter-driver.c:1401
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "ààààààà ààààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1308 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "àààààà"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d à %d àààààààà ààààà àààààà"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1414
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d à %d àààààààà àààà"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "àààààà ààààààààà àààà"
 
-#: ../camel/camel-filter-search.c:402
+#: ../camel/camel-filter-search.c:403
 msgid "Invalid arguments to (system-flag)"
 msgstr "àààà ààààààààààà (system-flag)"
 
-#: ../camel/camel-filter-search.c:417
+#: ../camel/camel-filter-search.c:418
 msgid "Invalid arguments to (user-tag)"
 msgstr "àààà ààààààààààà (user-tag)"
 
-#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "àààà àààààààà àààààààà ààààààà àààààà: %s: %s"
 
-#: ../camel/camel-folder-search.c:346 ../camel/camel-folder-search.c:458
-#: ../camel/camel-folder-search.c:622
+#: ../camel/camel-folder.c:243
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+msgstr[1] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+
+#: ../camel/camel-folder.c:283
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+msgstr[1] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+
+#: ../camel/camel-folder.c:331
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "àààà àààààà(ààààààà) ààààààà"
+msgstr[1] "àààà àààààà(ààààààà) ààààààà"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ààààààààààààà ààààààààà"
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ààààààààààààà ààà àààààà"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3265
+#, fuzzy, c-format
+#| msgid "Retrieving POP message %d"
+msgid "Retrieving message '%s' in %s"
+msgstr "POP àààààà %dàà àààààààà"
+
+#: ../camel/camel-folder.c:3390
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "%s àà àààà àààààààààààà àààà ààààà àààààààà àààà àààààà"
+
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1631,8 +2000,8 @@ msgstr ""
 "àààààà àààààààààààà àààààààà ààààààààà ààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:359 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:635
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1641,68 +2010,48 @@ msgstr ""
 "àààààà àààààààààààà àààààààà ààààààà àààààà: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:829 ../camel/camel-folder-search.c:871
+#. 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
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ààààà ààà ààààà àààààà ààà"
 
-#: ../camel/camel-folder-search.c:924
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) %s ààààà àààààààà àààà"
 
-#: ../camel/camel-folder-search.c:930 ../camel/camel-folder-search.c:937
+#. 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
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ààààà àààààààààà ààààààààà àààààà ààà"
 
-#: ../camel/camel-folder-search.c:964
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ààààà ààà ààààà ààààààààà"
 
-#: ../camel/camel-folder-search.c:973
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ààààà ààà àààààà àààààà"
 
-#: ../camel/camel-folder.c:624
-#: ../camel/providers/local/camel-maildir-folder.c:393
-msgid "Moving messages"
-msgstr "ààààààààààààà ààààààààà"
-
-#: ../camel/camel-folder.c:626
-msgid "Copying messages"
-msgstr "ààààààààààààà ààà àààààà"
-
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2126
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
-msgstr[1] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
-
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2145
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
-msgstr[1] "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "gpg àààààààà ààààààà àààà: %s"
 
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2166
-#, fuzzy, c-format
-#| msgid "Filtering new message(s)"
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "àààà àààààà(ààààààà) ààààààà"
-msgstr[1] "àààà àààààà(ààààààà) ààààààà"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+msgid "Unknown"
+msgstr "àààà"
 
-#: ../camel/camel-gpg-context.c:740
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1713,15 +2062,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:757
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid àààààà àààààààà ààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:782 ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg àààààà ààààà àààààààà àààààààà ààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:817
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1730,7 +2081,7 @@ msgstr ""
 "ààààààà ààààààààààààà àà àà àààààà àààà ààààà PIN àààààà\n"
 ": \"%s\""
 
-#: ../camel/camel-gpg-context.c:821
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1739,142 +2090,147 @@ msgstr ""
 "àààà àààà àààà àààààààààààà ààààà àààà ààààààà ààààà\n"
 "àààààà àààààà àààààà: \"%s\""
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' àààà GnuPG àà ààààààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:1107
-msgid "Canceled."
-msgstr "ààààà àààààà"
+#: ../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
+#, fuzzy, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "ààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:870
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ààààà àà àà àààààààà àààà: 3 àà ààà àààààà ààààà àààààààààà"
 
-#: ../camel/camel-gpg-context.c:882
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG àà ààààààààààà ààààà: %s"
 
-#: ../camel/camel-gpg-context.c:982
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ààààààà ààààààà àààà: ààààà ààà àààààààààààà àààààà àààààààààààà"
 
-#: ../camel/camel-gpg-context.c:1261 ../camel/camel-gpg-context.c:1400
-#: ../camel/camel-gpg-context.c:2022 ../camel/camel-gpg-context.c:2074
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "gpg àààààààà ààààààà àààà: %s"
-
-#: ../camel/camel-gpg-context.c:1366 ../camel/camel-smime-context.c:752
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#, fuzzy
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
 msgstr "ààààààààà àààà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-gpg-context.c:1419 ../camel/camel-gpg-context.c:1665
-#: ../camel/camel-gpg-context.c:1684 ../camel/camel-gpg-context.c:1777
-#: ../camel/camel-gpg-context.c:1796 ../camel/camel-gpg-context.c:1920
-#: ../camel/camel-gpg-context.c:1938 ../camel/camel-gpg-context.c:2041
-#: ../camel/camel-gpg-context.c:2093
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "gpg àààààààà ààààààà ààààà"
 
-#: ../camel/camel-gpg-context.c:1559 ../camel/camel-gpg-context.c:1567
-#: ../camel/camel-gpg-context.c:1575 ../camel/camel-gpg-context.c:1592
-#: ../camel/camel-smime-context.c:874 ../camel/camel-smime-context.c:887
-#: ../camel/camel-smime-context.c:895
+#: ../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
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "àààààà ààààààààààà àààààààààààààà ààààà: ààà àààààà àààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:1633
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "àààààà ààààààààààà àààààààààààààà ààààà: ààààààà àààà ààààààààààààààà ààààà: %s"
+#: ../camel/camel-gpg-context.c:1741
+#, fuzzy
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "àààààà ààààààààààà àààààààààààààà ààààà: ààà àààààà àààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:1758
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1864
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
 msgstr "ààààààà àààà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
 msgstr "ààà ààààààà ààààà ààààààààà ààààààà àààààà ààà"
 
-#: ../camel/camel-gpg-context.c:1870 ../camel/camel-gpg-context.c:1879
-#: ../camel/camel-gpg-context.c:1901
+#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
+#: ../camel/camel-gpg-context.c:2007
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "àààààààà àààààà ààààààààà ààààà: ààà àààààà àààààààà àààà"
 
-#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1995
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ààààà àààààà ààààààà àààà: àààààààà àààààà"
 
-#: ../camel/camel-gpg-context.c:1974 ../camel/camel-smime-context.c:1168
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "ààààààà ààààààààà"
 
-#: ../camel/camel-gpg-context.c:1996
-msgid "Unable to parse message content"
-msgstr "àààààà ààààààààààà àààààààà ààààààà àààààà"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-gpg-context.c:2075
-#: ../camel/providers/smtp/camel-smtp-transport.c:115
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
-msgid "Unknown"
-msgstr "àààà"
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s àààà àààààààààààà àààà ààààààà ààààààààà ààààà: %s"
+
+#: ../camel/camel-lock.c:145
+#, fuzzy, c-format
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"%sàà àààààààààààà àààà ààààààà ààààààààààààà àààààààààà ààààààà ààààààààààààà"
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2)àà ààààààà ààà àààà ààààààà àààà: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2)àà ààààààà ààà àààà ààààààà àààà: %s"
 
-#: ../camel/camel-lock-client.c:105
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "àààààààààààà àààààà àààà ààààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-lock-client.c:128
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "àààààààààààà ààààààà àààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s'àà ààààààààààààà ààààààààà ààààà: àààààààààààà ààààà àààà àààààààà àààààà"
+msgstr ""
+"'%s'àà ààààààààààààà ààààààààà ààààà: àààààààààààà ààààà àààà àààààààà àààààà"
 
-#: ../camel/camel-lock-client.c:223
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' àà ààààààààààààà ààààààààà ààààà"
 
-#: ../camel/camel-lock.c:104
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s àààà àààààààààààà àààà ààààààà ààààààààà ààààà: %s"
-
-#: ../camel/camel-lock.c:147
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%sàà àààààààààààà àààà ààààààà ààààààààààààà àààààààààà ààààààà ààààààààààààà"
-
-#: ../camel/camel-lock.c:206
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2)àà ààààààà ààà àààà ààààààà àààà: %s"
-
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2)àà ààààààà ààà àààà ààààààà àààà: %s"
-
-#: ../camel/camel-movemail.c:108
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "ààà àààà %sàà ààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "ààà àààà %sàà àààà àààààà ààààà: %s"
 
-#: ../camel/camel-movemail.c:130
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "ààààààà ààà àààà %sàà àààààààààà ààààà: %s"
@@ -1884,61 +2240,78 @@ msgstr "ààààààà ààà àààà %sàà àààààà
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "ààààààà àààà %sàà ààààààà ààààààà àààà: %s"
 
-#: ../camel/camel-movemail.c:192
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "àààà ààààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-movemail.c:205
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "àààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-movemail.c:243
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail àààààààà àààà ààààà: %s"
 
-#: ../camel/camel-movemail.c:244
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(àààà àààààà)"
 
-#: ../camel/camel-movemail.c:270
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "ààà àààà àààààààà àààààà: %s"
 
-#: ../camel/camel-movemail.c:282
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "ààà ààààààà àààà àààààààà àààààà: %s"
 
-#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ààà ààààààà àààà ààà ààààààà àààààà: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:297
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "ààààà àààààààà àààààà ààààà"
+
+#: ../camel/camel-multipart-signed.c:305
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "ààààà àààààààà àààààà ààààà"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
 msgid "parse error"
 msgstr "àààààà àààààààà ààààààà àààààà"
 
-#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
-#: ../camel/camel-net-utils.c:842
-#: ../camel/providers/pop3/camel-pop3-store.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:586
-msgid "Canceled"
-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-net-utils.c:533
-msgid "cannot create thread"
-msgstr "ààààà ààààààà àààààààà ààààà"
+#: ../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:698
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "àààààà àààààà: %s"
 
-#: ../camel/camel-net-utils.c:720
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "àààà àààààà àààà ààààà"
 
@@ -1947,7 +2320,7 @@ msgstr "àààà àààààà àààà ààààà"
 msgid "Host lookup failed: %s: %s"
 msgstr "àààà àààààà àààà ààààà: %s: %s"
 
-#: ../camel/camel-net-utils.c:846
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "ààààà àààààà àààààà"
 
@@ -1955,45 +2328,46 @@ msgstr "ààààà àààààà àààààà"
 msgid "Name lookup failed"
 msgstr "ààà àààààà àààà ààààà"
 
-#: ../camel/camel-net-utils.c:871
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ààà àààààà àààà ààààà: %s"
 
-#: ../camel/camel-offline-folder.c:191
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ààààà '%s'àà ààààààà àààààà ààààààà àààààà"
 
-#: ../camel/camel-offline-journal.c:143 ../camel/camel-offline-journal.c:167
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ààààà '%s' àààà àààààà ààààààà àààà àààààà ààààà: %s"
 
-#: ../camel/camel-provider.c:59
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "ààààà ààààà àààà àààààààà"
 
-#: ../camel/camel-provider.c:61
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ààààà àààààà ààààà àààààà àààà àààà àà ààààà ààà"
 
-#: ../camel/camel-provider.c:189
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%sàà àààà ààààààààà ààààà: ààà àààààààà àààààà àààà ààààààà ààààà"
 
-#: ../camel/camel-provider.c:198
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%sàà àààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-provider.c:207
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "%sàà àààà ààààààààà ààààà: àààààààà ààààà ààààà ààààà àààà ààààà àààààà"
+msgstr ""
+"%sàà àààà ààààààààà ààààà: àààààààà ààààà ààààà ààààà àààà ààààà àààààà"
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:133
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "àààààààà '%s' àààà ààààà ààààààà àààààà ààààà"
@@ -2006,11 +2380,12 @@ msgstr "àààààà"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ààà àààààààà ààààà àààààà àààà ààààààà ààà ààààà àààà ààààà ààààààà"
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "ààààààà ààààà"
 
-#: ../camel/camel-sasl-anonymous.c:78
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2019,7 +2394,7 @@ msgstr ""
 "àààà àààà ààààà ààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:91
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2028,7 +2403,7 @@ msgstr ""
 "àààà ààààààà ààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:104
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2037,432 +2412,579 @@ msgstr ""
 "àààà ààààà ààààà:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"ààà àààààààà ààààà àààààààà CRAM-MD5 àààààà ààààà ààààààà ààà ààààà àààà àààààà ààà, ààà "
+"ààà àààààààà ààààà àààààààà CRAM-MD5 àààààà ààààà ààààààà ààà ààààà àààà "
+"àààààà ààà, ààà "
 "ààààà ààààà àààààà àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"ààà àààààààà ààààà àààààààà DIGEST-MD5 àààààà ààààà ààààààà ààà ààààà àààà àààààà ààà, ààà "
+"ààà àààààààà ààààà àààààààà DIGEST-MD5 àààààà ààààà ààààààà ààà ààààà àààà "
+"àààààà ààà, ààà "
 "ààààà ààààà àààààà àààà"
 
-#: ../camel/camel-sasl-digest-md5.c:817
+#: ../camel/camel-sasl-digest-md5.c:820
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ààààà ààààààà ààà àààààà àààààà (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:827
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ààààà àààààà àààà ààà\n"
 
-#: ../camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:839
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ààààà àààààà àààà \"Quality of Protection\" àààà àààà àààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:873
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ààààà ààààà ààààààààà àààà àààà àààààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:885
+#: ../camel/camel-sasl-digest-md5.c:894
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ààààà ààààà ààààààààààà ààààààààà àààà àààà àààààà"
 
-#: ../camel/camel-sasl-digest-md5.c:897
+#: ../camel/camel-sasl-digest-md5.c:907
+#, c-format
 msgid "Server response does not match"
 msgstr "ààààà ààààà ààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:84
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ààà àààààààà Kerberos 5 ààààààààà ààààààà ààà ààààà àààà ààààà àààà"
 
-#: ../camel/camel-sasl-gssapi.c:121
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
-"àààààààà àààààààààà àààààààààà àààààààààà àààààà ààààààà àààà, àààààà ààààààààààààà àààààà "
+"àààààààà àààààààààà àààààààààà àààààààààà àààààà ààààààà àààà, àààààà "
+"ààààààààààààà àààààà "
 "àààààààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:126
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ààààààà àààààà ààà àààààààà ààà ààààà àààààààà (_n)"
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr "ààààààà àààààà ààà àààààààà ààààà àààà àààààà àààà àààààààà àààààà àààà (_n)"
+msgstr ""
+"ààààààà àààààà ààà àààààààà ààààà àààà àààààà àààà àààààààà àààààà àààà (_n)"
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
-"input_chan_bindings àààààà àààààààà àààààààà input_token ààààààà àààààà ààààààà ààààààà "
+"input_chan_bindings àààààà àààààààà àààààààà input_token ààààààà àààààà "
+"ààààààà ààààààà "
 "àààà ààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr "input_token ààààà àààà ààààààààà, àààààà ààààà àààààààà ààààààààààà àààà ààààààà"
+msgstr ""
+"input_token ààààà àààà ààààààààà, àààààà ààààà àààààààà ààààààààààà àààà "
+"ààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"àààààààààà àààààààààààààààà ààààààà àààààààà àààà ààà ààààà, àààààà àààààààààà ààààààààà ààààà "
+"àààààààààà àààààààààààààààà ààààààà àààààààà àààà ààà ààààà, àààààà "
+"àààààààààà ààààààààà ààààà "
 "àààààààààààà àààààà ààààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "àààààààààà ààààààà ààààààààà ààààà ààà ààààààààà àààààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_tokenàà àààààààààà ààààààààà ààààà àààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:153
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "àààààààààààà àààààààààà ààààààààà ààààà àààà àààààààà"
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ààààààà ààààààààààà ààà àààààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:339 ../camel/camel-sasl-gssapi.c:355
-#: ../camel/providers/imap/camel-imap-store.c:1263
+#: ../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
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ààààààà àààà ààààààà àààààà"
 
-#: ../camel/camel-sasl-gssapi.c:366
+#: ../camel/camel-sasl-gssapi.c:385
+#, c-format
 msgid "Unsupported security layer."
 msgstr "àààààààà ààààààà àààà"
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "àààà"
 
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
-msgstr "ààààà ààà àààààà ààààà ààààààà ààà ààà àààààààà ààààà àààà ààààààà àààà"
+msgstr ""
+"ààààà ààà àààààà ààààà ààààààà ààà ààà àààààààà ààààà àààà ààààààà àààà"
 
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:92
+#, c-format
 msgid "Unknown authentication state."
 msgstr "àààà ààààààààà ààààààà"
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"NTLM / àààààààà àààààà ààààà ààààààà ààààààà ààà ààà àààààààà Windows àààààà ààààà àààà "
+"NTLM / àààààààà àààààà ààààà ààààààà ààààààà ààà ààà àààààààà Windows àààààà "
+"ààààà àààà "
 "ààààààà àààà"
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "SMTP ààààààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "SMTP àààààààà ààààààààààà ààààààà ààà àààààààà POP ààààààà ààààààà ààà"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "POP àààà URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:88
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ààààà àààà àààààà ààààààà ààà SMTP ààààààà ààààààà POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:95
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "ààààà non-pop àààà ààààààà ààà SMTP ààààààà ààààààà POP"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, c-format
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr ""
 
-#: ../camel/camel-search-private.c:113
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààà àààààààààà ààààà àààà ààààà: %s: %s"
 
-#: ../camel/camel-service.c:215
-#, c-format
-msgid "URL '%s' needs a username component"
+#: ../camel/camel-service.c:526
+#, fuzzy, c-format
+#| msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
 msgstr "URL '%s' ààààà àààà ààà àààààà àààààà"
 
-#: ../camel/camel-service.c:219
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' àààà àààààà àààààà ààà"
 
-#: ../camel/camel-service.c:223
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' àà àààààà àààààà ààà"
 
-#: ../camel/camel-session.c:188
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"àààààààààà %s àààààà àààààààà ààààà:\n"
-"%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:645
+#: ../camel/camel-session.c:938
 #, 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:969
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' àààà àààààààààà àààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:350
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS àààààà ààààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:355
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS ààààààààà ààààààà àààààà ààààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:361
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ààààààààà ààààààà àààààà àààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:368
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS àààààà àààààààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:374
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ààààààààà ààààà ààààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "àààààà àààà ààààààà àààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ààààààààà ààààà ààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:410 ../camel/camel-smime-context.c:425
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' àààà ààààààà àààààà àààà ààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:432
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ààààààà ààà àààààà ààààà"
 
-#: ../camel/camel-smime-context.c:437
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ààààààà ààà àààààà ààààà"
 
-#: ../camel/camel-smime-context.c:442
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "ààààààà àààààààààà àààààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:448
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ààààààààà ààààààà ààààààà ààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:480
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "ààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "àà ààààààààà"
 
-#: ../camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "àààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "ààààààààà àààà àààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "ààààààààà àààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ààààààààà àààààààààààà ààààààà àààààà ààààà"
 
-#: ../camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ààààààààà àààààààà àààà ààà"
 
-#: ../camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ààààààààà àààààààà ààààààà àààà"
 
-#: ../camel/camel-smime-context.c:496
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ààààààààààà ààààààààà"
 
-#: ../camel/camel-smime-context.c:498
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ààààààààààà ààààààà àààààà"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ààààààààààà ààààà ààààààààà ààààààà àààà ààààà"
 
-#: ../camel/camel-smime-context.c:545
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "àààà àààà àààààà àààààààà ààààààààà ààà"
 
-#: ../camel/camel-smime-context.c:558 ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "àààààààà àààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:576 ../camel/camel-smime-context.c:580
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "àààààà àààààààààà ààààààà ààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:590 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "àààààààààà àààààà àààà"
 
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "àààààààààààà àààà ààààà àààààà, àààààààààààà ààààààààààà ààààà"
 
-#: ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "àààààààààààà àààà ààààà àààààà, àààààààààààà àààààà àààààààà ààà ààààààààààààà"
+msgstr ""
+"àààààààààààà àààà ààààà àààààà, àààààààààààà àààààà àààààààà ààà ààààààààààààà"
 
-#: ../camel/camel-smime-context.c:612
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ààààààààà àààààààààà"
 
-#: ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ààààààààà àààà: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:763 ../camel/camel-smime-context.c:1041
-msgid "Cannot create encoder context"
-msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+msgid "Cannot create encoder context"
+msgstr "ààààààààààà ààààààà ààààààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS ààààààààààààà àààà ààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+msgid "Failed to encode data"
+msgstr "àààà ààààààààààà ààààààà àààà"
+
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
+msgid "Decoder failed"
+msgstr "ààààààààààà àààà"
+
+#: ../camel/camel-smime-context.c:1058
+msgid "Cannot find common bulk encryption algorithm"
+msgstr "àààààà ààààààà àààààààà ààà àààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1066
+msgid "Cannot allocate slot for encryption bulk key"
+msgstr "ààààààà àà àààà àààà ààààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1077
+msgid "Cannot create CMS Message"
+msgstr "CMS àààààà àààààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1083
+msgid "Cannot create CMS Enveloped data"
+msgstr "CMS àààà àààà àààààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1089
+msgid "Cannot attach CMS Enveloped data"
+msgstr "CMS àààà àààà àààà àààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1095
+msgid "Cannot attach CMS data object"
+msgstr "CMS àààà ààààà àààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1104
+msgid "Cannot create CMS Recipient information"
+msgstr "CMS àààààà ààààà àààààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1109
+msgid "Cannot add CMS Recipient information"
+msgstr "CMS àààààà ààààà ààà ààààààààà ààààà"
+
+#: ../camel/camel-smime-context.c:1134
+msgid "Failed to add data to encoder"
+msgstr "ààààààààààà àààà àààà àààààààààà àààà"
+
+#: ../camel/camel-smime-context.c:1243
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr "S/MIME àààààààà: ààààà ààààààà ààààààààà àààààà ààààà"
+
+#: ../camel/camel-store.c:1814
+#, c-format
+msgid "Cannot create folder '%s': folder exists"
+msgstr "ààààà '%s'àà ààààààà ààààààààà ààààà: ààààà ààààààà"
+
+#: ../camel/camel-store.c:1857
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "àààààààààààà ààààààà àààààà"
+
+#: ../camel/camel-store.c:2044
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning folders in '%s'"
+msgstr "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2056 ../camel/camel-store.c:2066
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "ààààààà ààààà"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "àààà"
+
+#: ../camel/camel-store.c:2521
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "ààààà àààààà ààààààààà ààààà: %s: ààààà ààààààà"
+
+#: ../camel/camel-store.c:2535
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "ààààà '%s' àà ààààà ààààà: %s"
+
+#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "ààààà àààààà ààààààààà ààààà: %s: àààà àààààà"
+
+#: ../camel/camel-store.c:2796 ../camel/camel-vee-store.c:400
+#: ../camel/providers/local/camel-maildir-store.c:704
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "ààààààà àààààààààà ààààààààà ààààà: %s: àààà àààààà"
+
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "ààààà ààààà ààààà"
 
-#: ../camel/camel-smime-context.c:769
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS ààààààààààààà àààà ààà ààààààààà ààààà"
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ààààààààà \"%s\" àààà ààààà ààààààààà ààààà: %s"
 
-#: ../camel/camel-smime-context.c:774 ../camel/camel-smime-context.c:1059
-msgid "Failed to encode data"
-msgstr "àààà ààààààààààà ààààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:909 ../camel/camel-smime-context.c:1147
-msgid "Decoder failed"
-msgstr "ààààààààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:976
-msgid "Cannot find common bulk encryption algorithm"
-msgstr "àààààà ààààààà àààààààà ààà àààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:984
-msgid "Cannot allocate slot for encryption bulk key"
-msgstr "ààààààà àà àààà àààà ààààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ààààààààà àààààà %s àààà ààààà àààààà ààààà"
 
-#: ../camel/camel-smime-context.c:995
-msgid "Cannot create CMS Message"
-msgstr "CMS àààààà àààààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:1001
-msgid "Cannot create CMS Enveloped data"
-msgstr "CMS àààà àààà àààààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:1007
-msgid "Cannot attach CMS Enveloped data"
-msgstr "CMS àààà àààà àààà àààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:1013
-msgid "Cannot attach CMS data object"
-msgstr "CMS àààà ààààà àààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:1022
-msgid "Cannot create CMS Recipient information"
-msgstr "CMS àààààà ààààà àààààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:895
+#, fuzzy
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "ààààààà ààààà àààààààà"
 
-#: ../camel/camel-smime-context.c:1027
-msgid "Cannot add CMS Recipient information"
-msgstr "CMS àààààà ààààà ààà ààààààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-smime-context.c:1053
-msgid "Failed to add data to encoder"
-msgstr "ààààààààààà àààà àààà àààààààààà àààà"
+#: ../camel/camel-tcp-stream-raw.c:897
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "STLS ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-smime-context.c:1154
-msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME àààààààà: ààààà ààààààà ààààààààà àààààà ààààà"
+#: ../camel/camel-tcp-stream-raw.c:898
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "STLS ààààà àààààà ààààààà àààà"
 
-#: ../camel/camel-store.c:361
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "ààààà '%s'àà ààààààà ààààààààà ààààà: ààààà ààààààà"
+#: ../camel/camel-tcp-stream-raw.c:899
+#, fuzzy
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "àààà àààààà: %s"
 
-#: ../camel/camel-store.c:455
+#: ../camel/camel-tcp-stream-raw.c:932
 #, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "ààààà àààààà ààààààààà ààààà: %s: ààààà ààààààà"
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-store.c:526 ../camel/camel-vee-store.c:245
-#: ../camel/providers/local/camel-maildir-store.c:218
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ààààà àààààà ààààààààà ààààà: %s: àààà àààààà"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "ààààààà àààà ààààà"
 
-#: ../camel/camel-store.c:590 ../camel/camel-vee-store.c:197
-#: ../camel/providers/local/camel-maildir-store.c:305
+#: ../camel/camel-tcp-stream-raw.c:970
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "ààààààà àààààààààà ààààààààà ààààà: %s: àààà àààààà"
-
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:909 ../camel/camel-vtrash-folder.c:49
-msgid "Trash"
-msgstr "ààààààà ààààà"
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr ""
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:912 ../camel/camel-vtrash-folder.c:51
-msgid "Junk"
-msgstr "àààà"
+#. 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"
+msgid "Invalid reply from proxy server"
+msgstr "ààààààà àààà ààààà"
 
-#: ../camel/camel-tcp-stream-ssl.c:729
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2475,16 +2997,16 @@ msgstr ""
 "ààààààà ààààà:       %s\n"
 "ààààààààà:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:735
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:735
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:739
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2499,7 +3021,7 @@ msgstr ""
 "\n"
 "ààà ààààà ààààà ààààààà àààààààààà àà?"
 
-#: ../camel/camel-tcp-stream-ssl.c:783
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2508,7 +3030,7 @@ msgstr ""
 "àààààààààà àààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:835
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2517,7 +3039,7 @@ msgstr ""
 "àààà àààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:853
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2526,7 +3048,7 @@ msgstr ""
 "ààààààààààà ààà àààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2535,323 +3057,69 @@ msgstr ""
 "àààààààààà ààààààà ààà àààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../camel/camel-url.c:315
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL '%s'àà àààààààà ààààààààà ààààà"
 
-#: ../camel/camel-vee-folder.c:1089
+#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "'%s'àà ààààààà ààààààà àààààà: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ààààààààààààà ààààà ààààà àààààà ààà àààààà ààà ààààààà ààààà"
 
-#: ../camel/camel-vee-folder.c:1174
+#: ../camel/camel-vee-folder.c:1330
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%sàà %s ààà ààààà àààààà ààààà"
 
-#: ../camel/camel-vee-folder.c:1190 ../camel/camel-vee-folder.c:1205
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ààààààààààààà ààààà ààààà àààààà ààà àààààà ààà ààààààà ààààà"
+#: ../camel/camel-vee-folder.c:1398
+#, fuzzy, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "'%s'àà ààààààà ààààààà àààààà: %s"
 
-#: ../camel/camel-vee-store.c:131 ../camel/camel-vee-store.c:132
-#: ../camel/camel-vee-store.c:394
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "àààà"
 
-#: ../camel/camel-vee-store.c:206
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ààààààà àààààààààà àààààà ààààà: %s: àààà ààààà ààààà ààààà"
-
-#: ../camel/camel-vee-store.c:270
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ààààààà àààààà ààààààààà ààààà: %s: àààà ààààà ààààà ààààà"
 
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-vee-store.c:410
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ààààààà àààààààààà àààààà ààààà: %s: àààà ààààà ààààà ààààà"
+
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ààààààà ààààà ààààààà àààààààà ààà àààààà ààààà"
 
-#: ../camel/camel-vtrash-folder.c:52
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààààà àààà ààààààà ààà àààààà ààààà"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:132
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"àààààà ààààà ààààà: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:132
-#: ../camel/providers/local/camel-maildir-folder.c:257
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:407
-#: ../camel/providers/local/camel-mbox-folder.c:328
-#: ../camel/providers/local/camel-mbox-folder.c:379
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "àààà ààààà àààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:146
-#: ../camel/providers/pop3/camel-pop3-folder.c:252
-#: ../camel/providers/pop3/camel-pop3-folder.c:584
-#: ../camel/providers/pop3/camel-pop3-folder.c:647
-#: ../camel/providers/pop3/camel-pop3-folder.c:669
-msgid "User canceled"
-msgstr "àààà ààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/nntp/camel-nntp-folder.c:186
-#: ../camel/providers/nntp/camel-nntp-folder.c:190
-#: ../camel/providers/nntp/camel-nntp-folder.c:203
-#: ../camel/providers/nntp/camel-nntp-folder.c:294
-#: ../camel/providers/pop3/camel-pop3-folder.c:379
-#: ../camel/providers/pop3/camel-pop3-folder.c:588
-#: ../camel/providers/pop3/camel-pop3-folder.c:651
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-#: ../camel/providers/pop3/camel-pop3-folder.c:673
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "àààààà %s ààààà ààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:182
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2554
-msgid "This message is not available in offline mode."
-msgstr "ààà àààààààà àààààà àààààà àààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:198
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:207
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2099
-msgid "Could not get message"
-msgstr "àààààà ààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1009
-#: ../camel/providers/imap/camel-imap-folder.c:309
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s àààà àààààà àààà ààààààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1080
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "àààààà àààààààààà àààààà %s àààà ààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1356
-msgid "Trash Folder Full. Please Empty."
-msgstr "ààààààà ààààà ààààà àààààààààààààààà àààààà ààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1590
-#: ../camel/providers/groupwise/camel-groupwise-store.c:638
-#: ../camel/providers/groupwise/camel-groupwise-store.c:768
-#: ../camel/providers/imap/camel-imap-folder.c:3519
-#: ../camel/providers/imap/camel-imap-folder.c:3595
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-#: ../camel/providers/imapx/camel-imapx-server.c:3054
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s àà àààà àààààààààààà àààà ààààà àààààààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2402
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2448
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ààààà '%s'àà àààààààà àààààààààà ààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2434
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "àààààà àààààà ààààààààà ààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:238
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ààààà àààà ààààà %s ààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:301
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "àààààà àààààà àààààààà ààààààà ààààà: àààààà àààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "àààààà àààààà ààààààààààààà ààààààààààà ààààà: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "àààà ààà ààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
-msgid "C_heck for new messages in all folders"
-msgstr "ààààà ààààààà àààà àààààààààààà àààà ààààààààààà (_h)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:71
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "àààààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "ààà àààààà àààààààà àààà àààààààààààà àààà àààà àààààà àààààà (_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "Junk àààà àààà àààà ààààààààààààà ààààà àààààà (_u)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "INBOX ààààààà àààà Junk àààààààààààà àààà ààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "àààààà ààààààà ààààà àààààààààà ààààààà àààààà (_z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "SOAP ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "ààà àà ààààààààààà SOAP àààààààà (_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell àààà ààààààà ààààààà ààààààà ààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imapx/camel-imapx-provider.c:103
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
-msgid "Password"
-msgstr "àààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "ààà ààààà àààààà ààààààà ààààààà ààà ààà àààààààà àààààà ààààààà ààààà àààà ààààààà ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:106
-msgid "Host or user not available in url"
-msgstr "urlàà àààà àààààà àààà àààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1350
-#: ../camel/providers/imapx/camel-imapx-server.c:2298
-msgid "You did not enter a password."
-msgstr "ààà àààààà ààààà ààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:322
-msgid "Some features may not work correctly with your current server version"
-msgstr "ààààààà ààààààà ààààà ààààààà àààà àààà àààààààà àààà ààààà ààààààà ààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:543
-#: ../camel/providers/imap/camel-imap-store.c:1882
-#: ../camel/providers/imap/camel-imap-store.c:2078
-#: ../camel/providers/imapx/camel-imapx-store.c:352
-#, c-format
-msgid "No such folder %s"
-msgstr "%s ààà ààààà ààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "àààààà àààààà àààààà ààààààà àààààààààààà ààààààà ààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1237
-#: ../camel/providers/imap/camel-imap-store.c:1959
-#: ../camel/providers/imap/camel-imap-store.c:2378
-#: ../camel/providers/imapx/camel-imapx-store.c:801
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "àààààà ààààààà àààààààààààààà àààà ààààà àààà àààààà ààààààà àààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1320
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1345
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "àààààà ààààààà ààààà '%s' àà '%s' ààààà àààà àààààà àààààà ààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1379
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ààààà %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1381
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s àààà %s àààà ààààààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s àààààààà ààààààà ààà ààààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:94
-msgid "Sending Message"
-msgstr "àààààà àààààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:103
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ààààà ààààà ààààà: ààà ààààààààààà àààà àààààà"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:148
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ààà ààà ààààà àààààà àààààà ààààààà àààààààààà ààààààà àààààààààààà ààààààà àààààààààà ààà "
-"ààààààà ààààààà àààà àààààà/ààààààà ààà àààààà ààà ààààààà/ààààààààààà àà ààààààà àààà ààààà "
-"àààà àààààà àààààà\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:193
-#, c-format
-msgid "Could not send message: %s"
-msgstr "àààààà àààààààààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:185
-#: ../camel/providers/imap/camel-imap-command.c:278
 msgid "No output stream"
 msgstr "ààààà ààààà àààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:192
-#: ../camel/providers/imap/camel-imap-command.c:285
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No input stream"
 msgstr "ààààà ààààà àààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:237
-#: ../camel/providers/imap/camel-imap-command.c:294
-#: ../camel/providers/imap/camel-imap-command.c:516
-#: ../camel/providers/imap/camel-imap-store.c:3173
-msgid "Operation cancelled"
-msgstr "ààààà ààààà àààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:349
-#: ../camel/providers/imap/camel-imap-store.c:3181
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ààààà ààààààààààà ààààà ààààà ààààààààà ààààààà: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:369
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2860,131 +3128,144 @@ msgstr ""
 "IMAP ààààààà àààààààààà %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:439
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ààààààà ààààààààààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:450
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:563
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ààààà ààààà ààà ààààà àààààà àààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:739
+#: ../camel/providers/imap/camel-imap-command.c:774
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ààààà ààààà %s ààààà àààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:776
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ààààààà ààààààààààà OK ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:68
+#: ../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:289
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "àààààààààà %s ààààààà ààààààààà ààààà: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:912
-#: ../camel/providers/imapx/camel-imapx-server.c:2997
+#: ../camel/providers/imap/camel-imap-folder.c:393
 #, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
+msgid "Could not load summary for %s"
+msgstr "%s àààà àààààà àààà ààààààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2011
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4018
 #, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND ààààààààà ààà ààààààààààà ààààà àààààà '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2029
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND ààààààààà ààà àààààà àààà ààààà ààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2078
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND ààààààààà ààààà àààà àààààà ààààà!"
+msgid "Scanning for changed messages in %s"
+msgstr "%s àà ààààààààààà ààààààààààààà àààààààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2955
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3462
+#, fuzzy
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
 msgstr "àààààà ààààààààà àààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2990
-#: ../camel/providers/imapx/camel-imapx-server.c:3980
+#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imapx/camel-imapx-server.c:5291
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "àààààà ID %s ààààààà àààààà ààà àààààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2991
-#: ../camel/providers/imapx/camel-imapx-server.c:3981
+#: ../camel/providers/imap/camel-imap-folder.c:3498
+#: ../camel/providers/imapx/camel-imapx-server.c:5292
 msgid "No such message available."
 msgstr "àààà ààààà àààààà àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3055
-#: ../camel/providers/imap/camel-imap-folder.c:3919
-#: ../camel/providers/nntp/camel-nntp-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:3573
+#: ../camel/providers/imap/camel-imap-folder.c:4491
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#, c-format
 msgid "This message is not currently available"
 msgstr "ààà àààààààà ààààààààà àààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3723
+#: ../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
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s àà àààà àààààààààààà àààà ààààà àààààààà àààà àààààà"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4292
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ààààààààààà ààààà ààààà: àààààà %d àààà ààààà ààààà àààààà ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3733
+#: ../camel/providers/imap/camel-imap-folder.c:4302
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ààààààààààà ààààà ààààà: àààààà %d àààà ààààà UID àààààà àààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3959
+#: ../camel/providers/imap/camel-imap-folder.c:4531
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ààààààà àààààà àààà ààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:247
-#, c-format
-msgid "Could not open cache directory: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../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"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:334
-#: ../camel/providers/imap/camel-imap-message-cache.c:398
-#: ../camel/providers/imap/camel-imap-message-cache.c:432
-#: ../camel/providers/imap/camel-imap-message-cache.c:467
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "àààààà %sàà àààààà ààààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:548
-#, c-format
-msgid "Failed to cache %s: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#, fuzzy, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "àààààà %sàà àààààà ààààààà àààà: %s"
+
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
+#, fuzzy, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
 msgstr "%sàà àààààà ààààààà àààà: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "àààà ààà àààà ààààà àààààà"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+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:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "àààà àààààààààà ààààààà àààà ààààààààààààà ààààààà (_e)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "ààààà ààààà ààààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ààààà àààà ààààà ààààà àààà ààààààààààà ààààààààà ààààààà àààààà (_U)"
 
@@ -2995,18 +3276,18 @@ msgid "Co_mmand:"
 msgstr "ààààààààà (_m):"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "ààààà"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "àààà ààààààààààà àààààààààààà ààààààààà (_S)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "ààààà ààààààà ààààà ààà ààààààà àààààà àààààà (_v)"
 
@@ -3016,130 +3297,135 @@ msgstr "ààààà ààààààà ààààà ààà àà
 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
+msgid "Options"
+msgstr "àààààààààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ààà ààààà àààà INBOXàà àààà àààààà àààà àààà ààààààà àààààà (_A)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "ààà àààààà àààààààà àààà àààààààààààà àààà àààà àààààà àààààà (_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "Junk àààà àààà àààà ààààààààààààà ààààà àààààà (_k)"
 
+#: ../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 "INBOX ààààààà àààà Junk àààààààààààà àààà ààààà àààààà"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààààààà ààààà ààààà ààààà ààààààà ààààà ààààààà àààààà (_z)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr ""
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP ààààà %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ààààààààààààà ààà ààààààà ààààà ààà àààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "ààà ààààà àààààà ààààà ààààààà ààà ààà àààààààà IMAP ààààà àààà ààààààà ààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:415
-#: ../camel/providers/imapx/camel-imapx-store.c:206
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ààààà %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:417
-#: ../camel/providers/imapx/camel-imapx-store.c:208
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s àààà %s àààà IMAP àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:547
-#: ../camel/providers/imap/camel-imap-store.c:564
-#: ../camel/providers/nntp/camel-nntp-store.c:230
-#: ../camel/providers/nntp/camel-nntp-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:227
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s àààà ààààààà ààààààààà ààààà: %s"
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:548
-#: ../camel/providers/nntp/camel-nntp-store.c:231
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-msgid "SSL unavailable"
-msgstr "SSL àààààà ààààà"
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"ààà ààààà àààààà ààààà ààààààà ààà ààà àààààààà IMAP ààààà àààà ààààààà "
+"ààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:560
-#: ../camel/providers/imap/camel-imap-store.c:845
-#: ../camel/providers/imapx/camel-imapx-server.c:2160
-msgid "Connection cancelled"
-msgstr "ààààà ààààà ààààà"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:222
+#: ../camel/providers/imap/camel-imap-store.c:2587
+#: ../camel/providers/imapx/camel-imapx-store.c:333
+#: ../camel/providers/imapx/camel-imapx-store.c:771
+#: ../camel/providers/local/camel-maildir-folder.c:458
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:670
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:697
-#: ../camel/providers/imap/camel-imap-store.c:724
-#: ../camel/providers/imapx/camel-imapx-server.c:2205
-#: ../camel/providers/imapx/camel-imapx-server.c:2227
+#: ../camel/providers/imap/camel-imap-store.c:354
+#: ../camel/providers/imap/camel-imap-store.c:381
+#: ../camel/providers/imap/camel-imap-store.c:408
+#: ../camel/providers/imapx/camel-imapx-server.c:3007
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ààààà %s àààà àààààààà àààààà ààààààà àààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:671
-#: ../camel/providers/imapx/camel-imapx-server.c:2206
-#: ../camel/providers/smtp/camel-smtp-transport.c:286
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imapx/camel-imapx-server.c:2228
-msgid "SSL negotiations failed"
-msgstr "SSL àààà àààààà àààà ààààà"
+#: ../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 "IMAP ààààà %s àààà àààààààà àààààà ààààààà àààààà àààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:698
-#: ../camel/providers/smtp/camel-smtp-transport.c:327
+#: ../camel/providers/imap/camel-imap-store.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "SSL ààà ààààààààà àààààà ààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:849
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ààààààààà \"%s\" àààà ààààà ààààààààà ààààà: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1038
-#: ../camel/providers/imap/camel-imap-store.c:2471
-#: ../camel/providers/imapx/camel-imapx-store.c:404
-#: ../camel/providers/imapx/camel-imapx-store.c:970
-#: ../camel/providers/local/camel-maildir-folder.c:72
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:306
-#: ../camel/providers/local/camel-maildir-store.c:552
-#: ../camel/providers/local/camel-maildir-store.c:565
-#: ../camel/providers/local/camel-spool-store.c:500
-msgid "Inbox"
-msgstr "àààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:1295
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3141
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ààààà %s àààààà àààààààààà ààààààà àààààà %sàà àààààà ààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:1306
-#: ../camel/providers/smtp/camel-smtp-transport.c:465
+#: ../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:1381
-#: ../camel/providers/imapx/camel-imapx-server.c:2326
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "SASL ààààààà ààààà ààààààà ààààààà ààààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3199
+#, c-format
+msgid "You did not enter a password."
+msgstr "ààà àààààà ààààà ààà ààààààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3244
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3150,104 +3436,168 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1895
-#: ../camel/providers/imap/camel-imap-store.c:2317
-#: ../camel/providers/imapx/camel-imapx-store.c:786
+#: ../camel/providers/imap/camel-imap-store.c:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ààààà %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s àààà %s àààà IMAP àààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:1962
+#: ../camel/providers/imap/camel-imap-store.c:2164
+#: ../camel/providers/imapx/camel-imapx-store.c:309
+#, c-format
+msgid "No such folder %s"
+msgstr "%s ààà ààààà ààààà ààààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ààààà ààà \"%s\" àà àààà àààà ààà àààààà \"%c\"àà àààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2014
-#: ../camel/providers/local/camel-maildir-store.c:184
-#: ../camel/providers/local/camel-mbox-store.c:189
-#: ../camel/providers/local/camel-mh-store.c:250
+#: ../camel/providers/imap/camel-imap-store.c:2040
+#: ../camel/providers/imap/camel-imap-store.c:2495
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "àààààà ààààààà àààààààààààààà àààà ààààà àààà àààààà ààààààà àààà"
+
+#: ../camel/providers/imap/camel-imap-store.c:2093
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ààààà '%s'àà ààààààà ààààààààà ààààà: ààààà ààààààà àààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2328
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imap/camel-imap-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "àààààà àààààà ààààà: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3177
+#: ../camel/providers/imap/camel-imap-store.c:3214
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ààààà ààààààààààà ààààà ààààà ààààààààà ààààà"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:71
+#: ../camel/providers/imap/camel-imap-store.c:3217
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "ààààà ààààààààààà ààààà ààààà ààààààààà ààààààà: %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, fuzzy, c-format
 #| msgid "Could not load summary for %s"
 msgid "Could not create folder summary for %s"
 msgstr "%s àààà àààààà àààà ààààààààà ààààà"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:79
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, fuzzy, c-format
 #| msgid "Could not create cache file"
-msgid "Could not create cache for %s"
+msgid "Could not create cache for %s: "
 msgstr "àààààà ààààà àààààà àààààààà ààààààààà ààààà"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
+
+#: ../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:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
 msgstr "ààààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
 msgstr ""
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "àààààààà:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2163
+#: ../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:2186
+#, fuzzy, c-format
+#| msgid "Cannot authenticate to server: %s"
+msgid "Not authenticated"
+msgstr "ààààààà ààààààà àààààà ààààà: %s"
+
+#: ../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:5437
+#: ../camel/providers/imapx/camel-imapx-server.c:5452
+#, fuzzy
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "àààààà àààààà ààààààààà ààààà: %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s àààà ààààà ààààààààà ààààà (àààààààà %s): %s"
+msgid "No such folder: %s"
+msgstr "àààà ààààà ààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-local-folder.c:81
-msgid "Index message body data"
-msgstr "ààààààààààà àààààà àààà àààà"
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
+#, c-format
+msgid "Source stream returned no data"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+#| msgid "SSL unavailable"
+msgid "Source stream unavailable"
+msgstr "SSL àààààà ààààà"
 
-#. Translators: This is used for a folder description, for folders being under $HOME.
-#. The first %s is replaced with a relative path under $HOME,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:391
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
-#. The first %s is replaced with a relative path under /var/spool/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#. Translators: This is used for a folder description, for folders being under /var/mail.
-#. The first %s is replaced with a relative path under /var/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:397
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ààààààààà:%s (%s)"
 
-#. Translators: This is used for a folder description.
-#. The first %s is replaced with a folder's full path,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:409
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. Translators: The first %s is replaced with a message ID,
-#. the second %s is replaced with the folder path,
-#. the third %s is replaced with a detailed error string
-#: ../camel/providers/local/camel-local-folder.c:668
+#: ../camel/providers/local/camel-local-folder.c:473
+msgid "Index message body data"
+msgstr "ààààààààààà àààààà àààà àààà"
+
+#: ../camel/providers/local/camel-local-folder.c:700
 #, fuzzy, c-format
 #| msgid ""
 #| "Cannot get message: %s from folder %s\n"
@@ -3271,235 +3621,284 @@ msgstr "MH-àààààààà àààà ààà ààààààà
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH-àààà ààà àààààààààààà ààààààà ààààà ààààààà ààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ààààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"Evolution àààààà àààààààà ààààààà ààààààà ààààà àààà mbox-àààààààà ààààààààààààà ààààààà "
+"Evolution àààààà àààààààà ààààààà ààààààà ààààà àààà mbox-àààààààà "
+"ààààààààààààà ààààààà "
 "(ààààààààà) ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../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 ààààà àààà àààààààààààààà àààà àààààà àààààà (_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir-àààààààà àààà ààà àààààààààààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "maildir àààààààààààààààààà ààààààà ààààà ààààààà ààààà ààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "Elm/Pine/Mutt àààààààà àààààà àààààà ààààààààààààà ààààààà àààààà (_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "àààà Unix mbox spool àààà"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"ààààààà ààààà ààààà àààà mbox ààààà àààààààààààà àààààà ààà ààààààà ààààà ààààà\n"
+"ààààààà ààààà ààààà àààà mbox ààààà àààààààààààà àààààà ààà ààààààà ààààà "
+"ààààà\n"
 "Elm, Pine, àààààà Mutt àààà ààààààààààààà àààààà àààà àààà ààààààà ààààààà"
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "àààà Unix mbox spool àààààààààà"
 
-#: ../camel/providers/local/camel-local-store.c:148
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:356
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-local-store.c:92
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "ààààà %s àà %sàà àààààààààà ààààààààà ààààà: %s"
+
+#: ../camel/providers/local/camel-local-store.c:204
+#, 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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ààààà àààà %s àà ààààà ààà àà"
 
-#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "àààààà ààààà àààà %s àà ààààà àààààà àààààààààà àààà"
 
-#: ../camel/providers/local/camel-local-store.c:166
-#: ../camel/providers/local/camel-local-store.c:175
-#: ../camel/providers/local/camel-local-store.c:288
+#: ../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
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ààààà ààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:188
+#: ../camel/providers/local/camel-local-store.c:297
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ààààààà àààààààà ààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-local-store.c:243
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
-msgid "Local mail file %s"
-msgstr "ààààààà ààà àààà %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "ààààà ààààààààààà àààà '%s' àà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:352
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ààààà %s àà %sàà àààààààààà ààààààààà ààààà: %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "ààààà ààà àààà '%s'àà àààààà àààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:424
+#: ../camel/providers/local/camel-local-store.c:549
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' àà àààà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-local-store.c:454
-#: ../camel/providers/local/camel-mbox-store.c:293
-#, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "ààààà ààààààààààà àààà '%s' àà àààààà ààààààààà ààààà: %s"
-
-#: ../camel/providers/local/camel-local-store.c:478
-#: ../camel/providers/local/camel-mbox-store.c:318
+#: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "ààààà ààà àààà '%s'àà àààààà àààààà ààààà: %s"
-
-#: ../camel/providers/local/camel-local-summary.c:537
 msgid "Unable to add message to summary: unknown reason"
 msgstr "àààààààà àààààà ààà ààààààààààà ààààà: àààà àààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:216
-msgid "Maildir append message canceled"
-msgstr "Maildir àààààà ààààà àààà ààààààààààà"
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "àààà ààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-folder.c:220
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:223
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ààààà àààà àààààààà ààààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:311
-msgid "Invalid message contents"
-msgstr "àààà àààààà àààà"
+#: ../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"
+msgid "Cannot get message %s from folder %s: "
+msgstr ""
+"àààààà àààààààà ààààà: %s ààààà %sàà\n"
+"  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:425
-#, fuzzy
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, fuzzy, c-format
 #| msgid "Cannot copy messages to the Junk folder"
-msgid "Cannot transfer message to destination folder"
+msgid "Cannot transfer message to destination folder: %s"
 msgstr "àààààààà àààà ààààààà ààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:134
-#: ../camel/providers/local/camel-maildir-store.c:162
-#: ../camel/providers/local/camel-mbox-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:171
+#: ../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: ààààà ààààààà"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:722
+#, fuzzy, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "ààààà ààààààà ààààà"
+
+#: ../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
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ààààà àààààà àààààààààààà '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-mbox-store.c:126
-#: ../camel/providers/local/camel-mh-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:502
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ààààà '%s' àà ààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:135
-#: ../camel/providers/local/camel-mh-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ààààà '%s' àà ààààà ààààà: ààààà ààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:179
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ààààà '%s' àà ààààà ààààà: ààààà maildir àààààààààà ààààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:235
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mh-store.c:281
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ààààà '%s' àà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:237
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "ààààà maildir àààààààààà àààà"
 
-#: ../camel/providers/local/camel-maildir-store.c:472
-#: ../camel/providers/local/camel-spool-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:372
+#: ../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
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ààààà '%s'àà àààààààààà ààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:430
-#: ../camel/providers/local/camel-maildir-summary.c:552
+#: ../camel/providers/local/camel-maildir-store.c:713
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "ààààà àààààà ààààààààà ààààà: %s: ààààà ààààààà"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir àààààààààà àààà àààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "ààààà àààààààààà ààààà àààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:638
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "àààà ààààààààààààà ààààà àààààà"
 
-#: ../camel/providers/local/camel-maildir-summary.c:729
-#: ../camel/providers/local/camel-mbox-summary.c:489
-#: ../camel/providers/local/camel-mbox-summary.c:689
-#: ../camel/providers/local/camel-mbox-summary.c:814
-#: ../camel/providers/local/camel-spool-summary.c:126
+#: ../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
 msgid "Storing folder"
 msgstr "ààààà ààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-spool-folder.c:116
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "ààààà ààààààààààààààààà %sàà ààààààà ààààààààà ààààà: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:188
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
+#: ../camel/providers/local/camel-mbox-folder.c:183
+#, fuzzy, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
 msgstr "àààààààààà àààààààààà ààààà: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:255
-msgid "Mail append canceled"
-msgstr "ààà ààààààà ààààà ààààà"
-
-#: ../camel/providers/local/camel-mbox-folder.c:259
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:249
+#, fuzzy, c-format
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox àààààà  ààààààààààààà ààààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:432
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ààà ààààààà àààààààààà àààààààààààà ààààààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-folder.c:442
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "àààààà ààààà àààà àààààà"
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:71
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "ààààà ààààààààààààààààà %sàà ààààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mbox-store.c:364
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ààà ààààà ààààà ààààà ààààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:182
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ààààà '%s'àà ààààà ààààà: ààààà àààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:214
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:558
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "àààààààààà '%s'àà ààààààà ààààààààà ààààà: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:574
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ààààà ààààààà ààààààààà ààààà: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:576
+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
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3508,164 +3907,156 @@ msgstr ""
 "ààààà '%s'àà àààààà ààààààààà ààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:235
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' àà ààààà àààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:243
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ààààà '%s' àà àààà àààààà ààààààà ààààààààà Not deleted."
 
-#: ../camel/providers/local/camel-mbox-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:280
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ààààà àààààà àààà '%s'àà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:379
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "àààààààààà '%s'àà ààààààà ààààààààà ààààà: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ààààà ààààààà ààààààààà ààààà: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:396
-msgid "Folder already exists"
-msgstr "ààààà ààààààà ààààà"
-
-#: ../camel/providers/local/camel-mbox-store.c:490
 msgid "The new folder name is illegal."
 msgstr "àààà ààààà ààààà àààà àààà"
 
-#: ../camel/providers/local/camel-mbox-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s'àà àààààààààà ààààààààà ààààà: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:586
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' àà %s ààààà àààààààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:496
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ààààààà àààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:548
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:539
+#, fuzzy, c-format
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ààààààà %ld àààààà ààààà %s ààààà àààààààà ààà àààààààà àààààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:626
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ààààààà ààààà ààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:820
-#: ../camel/providers/local/camel-spool-summary.c:132
+#: ../camel/providers/local/camel-mbox-summary.c:713
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "àààààà àààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ààààààà àààààààààà àààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:934
+#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:969
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "àààà ààààà %s àà àààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:755
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ààààààà ààààààà àààà àààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ààààààà àààà àààààà ààààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:832
-#: ../camel/providers/local/camel-mbox-summary.c:1063
+#: ../camel/providers/local/camel-mbox-summary.c:867
+#: ../camel/providers/local/camel-mbox-summary.c:1134
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ààààààà ààààààà àààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-mbox-summary.c:881
-#: ../camel/providers/local/camel-mbox-summary.c:1094
-#: ../camel/providers/local/camel-mbox-summary.c:1103
+#: ../camel/providers/local/camel-mbox-summary.c:906
+#: ../camel/providers/local/camel-mbox-summary.c:1165
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+
+#: ../camel/providers/local/camel-mbox-summary.c:915
+#: ../camel/providers/local/camel-mbox-summary.c:1174
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "àààààà ààà ààààà ààààà, ààààààà ààà àààà"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1025
-#: ../camel/providers/local/camel-spool-summary.c:322
+#: ../camel/providers/local/camel-mbox-summary.c:1080
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "àààà àààààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1172
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1244
+#: ../camel/providers/local/camel-mbox-summary.c:1274
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ààààààà àààààààààà àààààààà àààà: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ààààààà àààààààààà àààààààà àààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:159
-msgid "MH append message canceled"
-msgstr "MH àà àààààààààààà àààààààà ààààà àààààààà"
-
-#: ../camel/providers/local/camel-mh-folder.c:163
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ààààààà àààààààà ààààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:230
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ààààà '%s'àà ààààààà àààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:243
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ààààà '%s' àà ààààà ààààà: ààààà àààààààààà ààààà"
 
-#: ../camel/providers/local/camel-mh-summary.c:224
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH àààààààààà àààà àààààààààà ààààà: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:119
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ààààà '%s' àà àààà àààààààà ààààà: %s"
+msgid "Spool mail file %s"
+msgstr "ààààà ààà àààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ààààà '%s' àà ààààà àààààà àààà àààààà àààààààààà àààà"
+msgid "Spool folder tree %s"
+msgstr "ààààà ààààà ààààà %s"
 
-#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ààààà '%s/%s' ààààààà àààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:168
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3674,12 +4065,12 @@ msgstr ""
 "ààààà '%s'àà àààààààààà ààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ààààà '%s' ààààààà àààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3688,136 +4079,175 @@ msgstr ""
 "ààààà '%s'àà ààààààà àààààà ààààà:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:188
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' àà ààààà àààààààà àààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:478
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "àààààà INBOXàà àààààà àààààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ààààà ààà àààà %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ààààà àààààààààààà àààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:220
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "ààààà ààààà ààààà %s"
-
-#: ../camel/providers/local/camel-spool-store.c:232
 msgid "Spool folders cannot be renamed"
 msgstr "ààààà àààààààààààà àààààààààà àààààà ààààà"
 
-#: ../camel/providers/local/camel-spool-store.c:245
-msgid "Spool folders cannot be deleted"
-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-summary.c:159
-#: ../camel/providers/local/camel-spool-summary.c:170
-#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+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:198
-#, c-format
-msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:211
+#, fuzzy, c-format
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "ààààà ààààà %sàà ààààààà ààààààà ààààà: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:229
-#: ../camel/providers/local/camel-spool-summary.c:247
-#: ../camel/providers/local/camel-spool-summary.c:259
-#, c-format
+#: ../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'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "ààààà ààààà %sàà ààààààà ààààààà ààààà: %s\n"
 "ààààààà ààààààààààà àààààààààà, ààààààààààà '%s'àà ààààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:225
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
+#: ../camel/providers/nntp/camel-nntp-folder.c:207
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "àààààààààà àààààà: UID àààà àààààà ààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:199
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:464
-#: ../camel/providers/nntp/camel-nntp-store.c:1334
-#: ../camel/providers/nntp/camel-nntp-summary.c:395
-#, fuzzy
-#| msgid "User canceled"
-msgid "User cancelled the operation"
-msgstr "àààà ààààà ààààà"
+#: ../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
+#, 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"
+msgid "Cannot get message %s: "
+msgstr "àààààà %s ààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
-#: ../camel/providers/nntp/camel-nntp-folder.c:419
-#: ../camel/providers/nntp/camel-nntp-folder.c:468
-#: ../camel/providers/nntp/camel-nntp-folder.c:473
+#: ../camel/providers/nntp/camel-nntp-folder.c:494
+#: ../camel/providers/nntp/camel-nntp-folder.c:500
+#: ../camel/providers/nntp/camel-nntp-folder.c:547
 #, c-format
 msgid "Posting failed: %s"
 msgstr "àààà àààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:495
+#: ../camel/providers/nntp/camel-nntp-folder.c:542
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "àààà àààà ààààà: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:571
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "àààààààà àààààààààààààà ààààà ààà NNTP àààààààà àààààààààà ààààà!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ààààààà ààà ààààààààààààà ààà ààààààààà ààààà!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
-"àààààààà àààààààà àààààààààààà ààààààààà (àààààà àààààà, comp.os.linux ààààà c.o.linux) "
+"àààààààà àààààààà àààààààààààà ààààààààà (àààààà àààààà, comp.os.linux ààààà "
+"c.o.linux) "
 "(_S)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "àààà ààààààà, àààààààà ààààà ààààààààà (_d)"
 
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr ""
+
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET ààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ààà USENET ààà ààààààà ààààààààà àààààà àààà ààààà àààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "ààà àààààààà NNTP ààààà àààà ààààà ààà ààààà àààààà ààààà ààààààà ààà ààààààà ààààà"
+msgstr ""
+"ààà àààààààà NNTP ààààà àààà ààààà ààà ààààà àààààà ààààà ààààààà ààà ààààààà "
+"ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:242
-#: ../camel/providers/nntp/camel-nntp-store.c:260
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
-msgid "Connection canceled"
-msgstr "ààààààà ààààà àààààààà"
+#: ../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:263
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
-msgid "Could not read greeting from %s: %s"
+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"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:275
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ààààà %s àààààà ààààà %d àààààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s àààààààà USENET ààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:873
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3828,248 +4258,262 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:969
-msgid ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
-msgstr ""
-"ààà ààà ààà àààààààà àààà àààààà ààààà:\n"
-"\n"
-"àààà ààààà ààà àààààà àààààà àààààà ààààààà ààààààà ààààà àààààà àààààà"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1008
-msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-"ààà ààà ààà àààààààà ààààààà ààààà ààààààààà ààààà:\n"
-"\n"
-"ààà àààààà ààààààà ààààà!"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1037
+#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
-"ààà ààà ààààààààààà ààààà ààààà ààààààà ààààààààà ààààà: ààà àààààààààà ààààààà ààààà "
+"ààà ààà ààààààààààà ààààà ààààà ààààààà ààààààààà ààààà: ààà àààààààààà "
+"ààààààà ààààà "
 "ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1048
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ààà ààà ààààààààààà ààààààà àààà àààààà ààààààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1060
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "ààà ààà ààààààààààà ààààà ààààààààààà ààààà: ààà ààààà ààààààà ààààà ààààààà"
+msgstr ""
+"ààà ààà ààààààààààà ààààà ààààààààààà ààààà: ààà ààààà ààààààà ààààà ààààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1197
-msgid "Authentication requested but no username provided"
-msgstr "ààààààà àààà àààààà àààààààà àààààà ààààà àààà ààà ààààààààààà"
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
+#, c-format
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+"ààà ààà ààà àààààààà àààà àààààà ààààà:\n"
+"\n"
+"àààà ààààà ààà àààààà àààààà àààààà ààààààà ààààààà ààààà àààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1209
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ààààààà ààààààà àààààà ààààà: %s"
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+"ààà ààà ààà àààààààà ààààààà ààààà ààààààààà ààààà:\n"
+"\n"
+"ààà àààààà ààààààà ààààà!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1338
-#, c-format
-msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
+#, fuzzy
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
 msgstr "NNTP ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1393
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#, c-format
 msgid "Not connected."
 msgstr "ààààà ààà ààààà"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1447
-#, c-format
-msgid "No such folder: %s"
-msgstr "àààà ààààà ààààà ààààà: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:235
+#: ../camel/providers/nntp/camel-nntp-summary.c:353
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: àààà ààààààààààààà àààààààààà àààààà"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:251
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xoveràà ààààààààààà ààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "àààààààà ààààààààààà ààààà ààààà: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:399
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "àààààà àààà ààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:235
-msgid "Retrieving POP summary"
-msgstr "POP àààààà àààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:256
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP àààààà ààààààààà ààààà: %s"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:303
-msgid "Expunging old messages"
-msgstr "àààààà ààààààààààààà ààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:311
-msgid "Expunging deleted messages"
-msgstr "ààààààà ààààààààààààà àààààààà"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
-#: ../camel/providers/pop3/camel-pop3-folder.c:556
+#: ../camel/providers/pop3/camel-pop3-folder.c:283
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ààààààà ààààà ààààà ààààà"
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:350
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP àààààà %dàà àààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "àààààà àààà"
 
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
+msgid "Retrieving POP summary"
+msgstr "POP àààààà àààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+#, fuzzy
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
+msgstr "POP àààààà ààààààààà ààààà: %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
+msgid "Expunging old messages"
+msgstr "àààààà ààààààààààààà ààààààà"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
+msgid "Expunging deleted messages"
+msgstr "ààààààà ààààààààààààà àààààààà"
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#, fuzzy
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "àààààà àààààà"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "ààààààà ààààààààààààà àààààà (_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ààà ààà àààààà àààààà (_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "ààààà POP3 ààààààààààààà àààà àààààààà ààààààààà àààààà (_s)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP ààààà àààà ààààà àààà ààà ààà àààà ààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"ààà ààààà àààààà ààààà ààààààà ààà ààà àààààààà POP ààààà àààà ààààà ààààààà ààà ààà àààà "
+"ààà ààààà àààààà ààààà ààààààà ààà ààà àààààààà POP ààààà àààà ààààà ààààààà "
+"ààà ààà àààà "
 "ààààà àààààà àààààà POP ààààà àààààà àààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"ààà àààààààà APOP àààààààà àààààààà ààààààà àààààà ààààà ààààààà ààà POP ààààà àààà ààààà "
-"ààààààà ààà àààààà ààààààà ààààà àààà àààà ààààà àààààààààà àààà ààààààà ààà ààààà"
+"ààà àààààààà APOP àààààààà àààààààà ààààààà àààààà ààààà ààààààà ààà POP "
+"ààààà àààà ààààà "
+"ààààààà ààà àààààà ààààààà ààààà àààà àààà ààààà àààààààààà àààà ààààààà ààà "
+"ààààà"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:140
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ààààà %s àà ààà àààààààà àààààààà àààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
-#: ../camel/providers/pop3/camel-pop3-store.c:258
-#: ../camel/providers/pop3/camel-pop3-store.c:264
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, 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:228
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "STLS ààààà àààààà ààààààà àààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, fuzzy, c-format
 #| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "POP ààààà %s àààà àààààààà àààààà ààààà àààààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:259
-msgid "TLS negotiations failed"
-msgstr "TLS àààààààààà àààà ààààà"
+#: ../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"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:265
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "TLS ààà ààààààààà àààààà ààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP ààààà %s àààà ààààà ààààààààà ààààà"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:422
-#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
-"POP ààààà %s àààà ààààà àààààà àààààà: àààààà àààààààààà ààààààà àààààààà àààà ààààà "
+"POP ààààà %s àààà ààààà àààààà àààààà: àààààà àààààààààà ààààààà àààààààà "
+"àààà ààààà "
 "àààààà àààààà"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:444
+#: ../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"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ààààà %s àààà àààà àààààààà ààààà: SASL àààààààà àààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#, fuzzy, c-format
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ààààà %sàà ààààààà ààààààà àààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:544
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ààààà %s àààà ààààà ààààààà àààà:\tàààà APOP ID ààààà àààààà àààààààà àààààààà "
+"POP ààààà %s àààà ààààà ààààààà àààà:\tàààà APOP ID ààààà àààààà àààààààà "
+"àààààààà "
 "àààààà ààààààààà àààààà ààààààà àààààààààà àààà ààààààà ààààààà"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:590
-#, c-format
+#: ../camel/providers/pop3/camel-pop3-store.c:427
+#, 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"
+"Error sending password: "
 msgstr ""
 "POP ààààà %s àààà ààààà ààààààà ààààààà\n"
 "àààààà ààààà àààààààà àààààà: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:601
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, fuzzy, c-format
 #| msgid ""
 #| "Unable to connect to POP server %s.\n"
@@ -4082,7 +4526,7 @@ msgstr ""
 "àààà ààà àààààààà àààààà: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, fuzzy, c-format
 #| msgid ""
 #| "Unable to connect to POP server %s.\n"
@@ -4094,11 +4538,33 @@ msgstr ""
 "POP ààààà %s àààà ààààà ààààààà ààààààà\n"
 "àààààà ààààà àààààààà àààààà: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:733
+#: ../camel/providers/pop3/camel-pop3-store.c:492
+#, fuzzy, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "IMAP ààààà %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 àààààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:626
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP ààààà %s àààà ààààà ààààààààà ààààà"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ààà ààààà ààààà àààààà"
 
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "àààààààààà ààà"
@@ -4109,384 +4575,510 @@ msgid ""
 "system."
 msgstr "ààààààà àààààààà \"sendmail\" àààààààààà àààà ààà àààààà ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "àààààààààà ààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "àààààààààà ààà àààààààà àààààààà ààà àààààà"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "ààààààààà àààààààà àààààààà ààààààààà ààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:130
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "àààààààààà ààààà ààààààà ààààààààà ààààà: %s: ààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:151
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "àààààààààà ààààà ààà àààà àààààà ààààà: %s: ààà ààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "àààààà àààààààààà ààààà: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "àààààà %s àààà àààààààààà ààààà àààààààà àààààààà: ààà àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%sàà àààààààà ààààààà ààààà: ààà àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "àààààààààà ààààà àààààà %d àààà àààààààà ààààààààààà: ààà àààààààààààà"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "àààààààààà ààà"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "àààààààààà ààà àààààààà àààààààà ààà àààààà"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SMTP ààààà %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ààààààà ààà ààààà ààà àà àààà ààààà ààà ààà àààààà ààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:117
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#, fuzzy
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "àààààà ààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "SMTP ààààà %s àà àààààààà àààààà ààààà ààààààà àààà: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS ààààààààà àààà ààààà: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, fuzzy, c-format
+#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "SMTP ààààà %s àà àààààààà àààààà ààààà ààààààà àààà: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP ààààà %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s àààààààà SMTP ààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr ""
+"SMTP ààààà %s àààààà àààààààààà ààààààà àààààà %sàà àààààà àààààà àààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP ààààà àà ààààààà ààààààà ààààààà\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "àààààà àààààààààà ààààà: àààààà ààààààà ààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:561
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "àààààà àààààààààà ààààà: ààààààà ààààà ààà ààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
+msgid "Sending message"
+msgstr "àààààà ààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:590
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "àààààà àààà àààààà ààààà: ààààà ààààààààààààà àààààààà àààààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:603
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "àààààà àààà àààààà ààààà: ààààà àààààà àààà àààà ààààààààà"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ààààà ààààààà àààààà, ààààààààààà ààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:119
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "àààààà àààààà ààààààààààààààààààà àààààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ààààààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:123
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ààààààààà àààààààà ààààààààààà ààààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:125
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ààààà ààààààà àààààà, àààààà àààààà àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:127
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:129
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "àààààà àààààààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:131
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "àààààà àààà àààààààààà ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "àààààà àààààà ààààà, àààààà ààààààààà àààà ààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "àààààà àààààààààà ààà ààààààà ààà ààà, àààààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:137
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
 msgstr "àààà ààààààà àààà; <forward-path>àà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:139
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "àààààà àààààààààà ààà ààààààààà ààààà ààààààààààà: àààààààà àààààà ààààà"
+msgstr ""
+"àààààà àààààààààà ààà ààààààààà ààààà ààààààààààà: àààààààà àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:141
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "àààààà àààààààààà ààààààààà ààààà ààààààààààà: àààààààà àààààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:143
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr "àààààà àààààààààà ààààààààà ààààà àààààààà: ààààààààààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:145
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "User not local; please try <forward-path>"
 msgstr "àààà ààààààà àààà; àààààà àààààààààààà <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
-msgstr "àààààà àààààààààà ààààààààà ààààà ààààààààààà: àààààà àààààà àààààà àààà"
+msgstr ""
+"àààààà àààààààààà ààààààààà ààààà ààààààààààà: àààààà àààààà àààààà àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "àààààà àààààààààà ààààààààà àààààààà àààààààà:  àààààà àààààà àààààà ààààààà àààààààà"
+msgstr ""
+"àààààà àààààààààà ààààààààà àààààààà àààààààà:  àààààà àààààà àààààà ààààààà "
+"àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "àààààà àààààààààà ààààààààà ààààà ààààààààààà: àààààààà ààààà àààààà ààààààà àààà"
+msgstr ""
+"àààààà àààààààààà ààààààààà ààààà ààààààààààà: àààààààà ààààà àààààà ààààààà "
+"àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:153
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ààà ààààà ààààà àààààà; <CRLF>.<CRLF> àà àààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "àààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:159
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ààààà àààààà ààààà àààààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:161
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ààààààà ààààààààààààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:163
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "àààààà àààààààààà ààààààà ààààààààààà àààà ààààààà àààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ààààààà ààààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:249
-msgid "Welcome response error"
-msgstr "àààààà ààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
-#: ../camel/providers/smtp/camel-smtp-transport.c:319
-#: ../camel/providers/smtp/camel-smtp-transport.c:326
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "SMTP ààààà %s àà àààààààà àààààà ààààà ààààààà àààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS ààààààààà àààà ààààà: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:309
-msgid "STARTTLS command failed"
-msgstr "STARTTLS ààààààààà àààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:454
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP ààààà %s àààààà àààààààààà ààààààà àààààà %sàà àààààà àààààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:527
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ààààà àà ààààààà ààààààà ààààààà\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:665
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ààààà %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:667
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "%s àààààààà SMTP ààà àààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:686
-msgid "Cannot send message: service not connected."
-msgstr "àààààà àààààààààà ààààà: àààààà ààààààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:693
-msgid "Cannot send message: sender address not valid."
-msgstr "àààààà àààààààààà ààààà: ààààààà ààààà ààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
-msgid "Sending message"
-msgstr "àààààà ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
-msgid "Cannot send message: no recipients defined."
-msgstr "àààààà àààà àààààà ààààà: ààààà ààààààààààààà àààààààà àààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "àààààà àààà àààààà ààààà: ààààà àààààà àààà àààà ààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:962
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "SMTP àààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:987
-#, c-format
-msgid "HELO command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
+#, fuzzy
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
 msgstr "HELO ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1004
-msgid "HELO command failed"
-msgstr "HELO ààààààààà àààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1071
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "SMTP ààààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1078
-msgid "Error creating SASL authentication object."
-msgstr "SASL ààààààà ààààà ààààààà ààààààà ààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
-#: ../camel/providers/smtp/camel-smtp-transport.c:1106
-#, c-format
-msgid "AUTH command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
+#, fuzzy
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
 msgstr "AUTH ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
-msgid "AUTH command failed"
-msgstr "AUTH ààààààààà àààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1185
-msgid "Bad authentication response from server.\n"
-msgstr "ààààààà àààà ààààààà àààààà\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1212
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM ààààààààà àààà ààààà: %s: ààà ààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
-msgid "MAIL FROM command failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
+#, fuzzy
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ààààààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1251
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO ààààààààà àààà ààààà: %s: ààà ààààààààààà"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
+#, fuzzy
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "RSET ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1270
-#, c-format
-msgid "RCPT TO <%s> failed"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
+#, fuzzy, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> àààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1310
-#: ../camel/providers/smtp/camel-smtp-transport.c:1385
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
 #: ../camel/providers/smtp/camel-smtp-transport.c:1403
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA ààààààààà àààà ààààà: %s: ààà ààààààààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1416
-msgid "DATA command failed"
+#: ../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
+#, fuzzy
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
 msgstr "DATA ààààààààà àààà ààààà"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1439
-#, c-format
-msgid "RSET command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#, fuzzy
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
 msgstr "RSET ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
-msgid "RSET command failed"
-msgstr "RSET ààààààààà àààà ààààà"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#, c-format
-msgid "QUIT command failed: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#, fuzzy
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
 msgstr "QUIT ààààààààà àààà ààààà: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-msgid "QUIT command failed"
-msgstr "QUIT ààààààààà àààà ààààà"
-
 #: ../libedataserver/e-categories.c:47
+#, fuzzy
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "àààààààà"
+
+#: ../libedataserver/e-categories.c:48
+#, fuzzy
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ààààààà"
+
+#: ../libedataserver/e-categories.c:49
+#, fuzzy
+#| msgid "Business"
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
+#, fuzzy
+#| msgid "Competition"
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "àààààààààààà"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
+#, fuzzy
+#| msgid "Favorites"
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
+#, fuzzy
+#| msgid "Gifts"
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Gifts"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
+#, fuzzy
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "àààààà/àààààààààààààà"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
+#, fuzzy
+#| msgid "Holiday"
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
+#, fuzzy
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ààààààà ààààààààààà"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
+#, fuzzy
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ààààà ààààààààààààà"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
+#, fuzzy
+#| msgid "Ideas"
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "àààààààààà"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
+#, fuzzy
+#| msgid "International"
+msgctxt "CategoryName"
 msgid "International"
 msgstr "ààààààààààà"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
+#, fuzzy
+#| msgid "Key Customer"
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "àà àààààà"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
+#, fuzzy
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ààààààà"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
+#, fuzzy
+#| msgid "Personal"
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ààààààààà"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
+#, fuzzy
+#| 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:63
+#: ../libedataserver/e-categories.c:65
+#, fuzzy
+#| msgid "Status"
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "àààààààà"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
+#, fuzzy
+#| msgid "Strategies"
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "àààà"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
+#, fuzzy
+#| msgid "Suppliers"
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "àààààààààààààà"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
+#, fuzzy
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ààà ààà àààà"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
+#, fuzzy
+#| msgid "VIP"
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
+#, fuzzy
+#| msgid "Waiting"
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "àààààààààààà"
 
+#: ../libedataserver/e-client.c:113
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "à.àà.àà. àààà àààààà ààààà"
+
+#: ../libedataserver/e-client.c:115
+#, fuzzy
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "à.àà.àà. ààààààà àààà àààààààà"
+
+#: ../libedataserver/e-client.c:123
+#, fuzzy
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "àààààà àààààà àààààà ààààà"
+
+#: ../libedataserver/e-client.c:145
+#, fuzzy
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "àààààà àààààààà ààààààà àààààà"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4494,7 +5086,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4502,7 +5094,7 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4510,78 +5102,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1917
 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:1655
+#: ../libedataserver/e-time-utils.c:1654
 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:1660
+#: ../libedataserver/e-time-utils.c:1659
 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:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1782
+#: ../libedataserver/e-time-utils.c:1912
 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:1670
+#: ../libedataserver/e-time-utils.c:1669
 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:1674
+#: ../libedataserver/e-time-utils.c:1673
 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:1679
+#: ../libedataserver/e-time-utils.c:1678
 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:1684
+#: ../libedataserver/e-time-utils.c:1683
 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:1689
+#: ../libedataserver/e-time-utils.c:1688
 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:1694
+#: ../libedataserver/e-time-utils.c:1693
 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:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1696 ../libedataserver/e-time-utils.c:1785
 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:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1854 ../libedataserver/e-time-utils.c:1974
 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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1858 ../libedataserver/e-time-utils.c:1966
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4589,224 +5181,567 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
 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:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
 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:1842
+#: ../libedataserver/e-time-utils.c:1870
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1874
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:94
+#: ../libedataserverui/e-book-auth-util.c:651
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP àààààà àààààà ààààà ààààà àààààà"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:412
 msgid "Failed to authenticate.\n"
 msgstr "ààààààààà ààààààà ààààà\n"
 
-#: ../libedataserverui/e-categories-dialog.c:145
-msgid "Category Icon"
-msgstr "ààààà àààààààààà"
-
-#: ../libedataserverui/e-categories-dialog.c:151
-msgid "_No Image"
+#: ../libedataserverui/e-categories-editor.c:221
+msgid "Currently _used categories:"
 msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.c:372
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "ààààààààà ààààààà ààààà '%s' ààààààà àààà àààààà àààà àà ààà ààààààà àààààà"
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "àààààà ààààà (_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "ààààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
 msgstr "ààààà"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "ààààà ààààààà"
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "ààààà \"%s\" àààààààààààà"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "ààààà àààààààààà (_I)"
+#: ../libedataserverui/e-category-editor.c:132
+msgid "Category Icon"
+msgstr "ààààà àààààààààà"
+
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr ""
 
-#: ../libedataserverui/e-categories-dialog.ui.h:3
+#: ../libedataserverui/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "ààààà ààà (_N)"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Currently _used categories:"
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "ààààà àààààààààà (_I)"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "ààààà ààààààà"
+
+#: ../libedataserverui/e-category-editor.c:282
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
 msgstr ""
+"ààààààààà ààààààà ààààà '%s' ààààààà àààà àààààà àààà àà ààà ààààààà àààààà"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:5
-msgid "_Available Categories:"
-msgstr "àààààà ààààà (_A):"
+#: ../libedataserverui/e-client-utils.c:799
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
-msgid "_Edit"
-msgstr "ààààààà àààààà (_E)"
+#: ../libedataserverui/e-client-utils.c:801
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for calendar %s (user %s)"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "ààààà"
+#: ../libedataserverui/e-client-utils.c:805
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-category-completion.c:292
-#, c-format
-msgid "Create category \"%s\""
-msgstr "ààààà \"%s\" àààààààààààà"
+#: ../libedataserverui/e-client-utils.c:807
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Select Contacts from Address Book"
-msgstr "ààààà àààààààà àààààààààààààà ààààààà"
+#: ../libedataserverui/e-client-utils.c:811
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:605
-msgid "_Add"
-msgstr "ààà àààààà (_A)"
+#: ../libedataserverui/e-client-utils.c:813
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "%s (%s àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:632
-msgid "_Remove"
-msgstr "àààààà àààààà (_R)"
+#: ../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 àààà) àààà àààààà àààààà ààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.c:816
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
-msgid "Any Category"
-msgstr "àà ààààà ààààà"
+#: ../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-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-client-utils.c:917
+msgid "Enter Passphrase"
+msgstr ""
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>ààààààà (_n)</b>"
+#: ../libedataserverui/e-client-utils.c:919
+#, fuzzy
+#| msgid "Password"
+msgid "Enter Password"
+msgstr "àààààà àààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>àààààààààààààà ààààààààà</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:184
+#, fuzzy
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "ààààà ààààààààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ààààà àààààààà (o):"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
-msgid "Address Book"
-msgstr "ààààà àààààààà"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "ààààà (_g):"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
-msgid "Contacts"
+#: ../libedataserverui/e-name-selector-dialog.c:232
+msgid "_Search:"
+msgstr "ààààààà: (_S)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
+msgid "Any Category"
+msgstr "àà ààààà ààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:252
+#, fuzzy
+#| msgid "Contacts"
+msgid "Co_ntacts"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "ààààààà"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "ààààààà: (_S)"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Address Book"
+msgstr "ààààà àààààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:313
+msgid "Contacts"
+msgstr "ààààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:430
+msgid "Select Contacts from Address Book"
+msgstr "ààààà àààààààà àààààààààààààà ààààààà"
+
+#: ../libedataserverui/e-name-selector-dialog.c:766
+msgid "_Add"
+msgstr "ààà àààààà (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:770
+msgid "_Remove"
+msgstr "àààààà àààààà (_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:930
+#, fuzzy, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "ààà àààà àààààààà àààààà: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2741
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s àà àààààààà àààààààà àààààà (_x)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2513
+#: ../libedataserverui/e-name-selector-entry.c:2756
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s àà ààà àààààà (_y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2766
 #, c-format
 msgid "C_ut %s"
 msgstr "%s àà ààààààà (_u)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2540
+#: ../libedataserverui/e-name-selector-entry.c:2783
 #, c-format
 msgid "_Edit %s"
 msgstr "%sàà ààààààà àààààà (_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:517
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "%s àà àààààà àààààà (_D)"
 
-#: ../libedataserverui/e-passwords.c:257
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
 msgstr "àà ààààà àààà ààààààà àààààà àààà: ààààà àààà àààààà àààà ààà ààààà"
 
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "ààààààà ààààààà àà àà ààà àààà"
 
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "ààà àààààà ààààààà ààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:820
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ààà àààààààà àààà ààà àààà ààà àààààà ààààààà ààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "ààà àààààà ààààààà ààààààààà (_R)"
 
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:826
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "ààà àààààààà àààà ààà àààà ààà àààààà ààààààà ààààààààà (_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "àààààààààà ààààààà"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "àààààààààà (_D)"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "àààà ààààà"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "(%d) ààààààà ààààààà ààààààà àààààà... "
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ààààààà àààà ààààà"
+#, fuzzy
+#~| msgid "Cannot get message %s: %s"
+#~ msgid "Cannot get changes"
+#~ msgstr "àààààà %s ààààà ààààà: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ààààààà ààààà ààààà ààààà"
+#, fuzzy
+#~| msgid "Could not cancel operation"
+#~ msgid "Cannot complete operation"
+#~ msgstr "ààààààà ààààà ààààààààà ààààà"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "àààà àààààà"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "delta ààààààà ààààà àààà ààààà àààààààà ààààààààà ààààà"
 
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "àààààà ààààààà àààààààà ààààà àààà ààààà àààààààà ààààààààà ààààà"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ààà ààààààààà"
+#~ msgid "Reply Requested: by "
+#~ msgstr "àààààà ààààà àààààà àààààààà:"
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "ààààà àààà àààààà: àààààààà àààààà"
+
+#~ msgid "Loading %s items"
+#~ msgstr "%s ààààààà àààà àààààà"
+
+#~ msgid "Calendar"
+#~ msgstr "àààààààààà"
+
+#~ msgid "Invalid server URI"
+#~ msgstr "àààà àààà àà.àà.àà."
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar address"
+#~ msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data: Malformed URI."
+#~ msgid "Cannot retrieve calendar alarm e-mail address"
+#~ msgstr "àààààààààà àààààà àààààààà àààààààà ààààà: ààààààà ààààà àààààààà àà.àà.àà.à"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar's ldap attribute"
+#~ msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot create CMS Recipient information"
+#~ msgid "Cannot retrieve calendar scheduling information"
+#~ msgstr "CMS àààààà ààààà àààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot discard calendar alarm"
+#~ msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve default calendar object path"
+#~ msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Could not create cache file"
+#~ msgid "Could not complete calendar query"
+#~ msgstr "àààààà ààààà àààààà àààààààà ààààààààà ààààà"
+
+#, fuzzy
+#~| msgid "Cannot save calendar data"
+#~ msgid "Cannot retrieve calendar changes"
+#~ msgstr "àààààààààà àààààà àààààààà ààààààààà ààààà"
+
+#~ msgid "Verifying message"
+#~ msgstr "àààààààààààà àààààà"
+
+#~ msgid "Cannot open message"
+#~ msgstr "àààààààà àààà ààààààààà"
+
+#~ msgid "Canceled."
+#~ msgstr "ààààà àààààà"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "àààààà ààààààààààà àààààààààààààà ààààà: ààààààà àààà ààààààààààààààà ààààà: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "àààààà ààààààààààà àààààààà ààààààà àààààà"
+
+#~ msgid "cannot create thread"
+#~ msgstr "ààààà ààààààà àààààààà ààààà"
+
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "ààààà non-pop àààà ààààààà ààà SMTP ààààààà ààààààà POP"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "àààààààààà %s àààààà àààààààà ààààà:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "àààààà ààààà ààààà: %s\n"
+#~ "  %s"
+
+#~ msgid "User canceled"
+#~ msgstr "àààà ààààà ààààà"
+
+#~ msgid "Could not get message"
+#~ msgstr "àààààà ààààà ààààà"
+
+#~ msgid "Checking for deleted messages %s"
+#~ msgstr "àààààà àààààààààà àààààà %s àààà ààààà àààààà"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ààààààà ààààà ààààà àààààààààààààààà àààààà ààààààààààà"
+
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "ààààà '%s'àà àààààààà àààààààààà ààààà: %s"
+
+#~ msgid "Cannot get folder container %s"
+#~ msgstr "ààààà àààà ààààà %s ààààà ààààà"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr "àààààà àààààà àààààààà ààààààà ààààà: àààààà àààààà ààààà"
+
+#~ msgid "Cannot append message in offline mode: %s"
+#~ msgstr "àààààà àààààà ààààààààààààà ààààààààààà ààààà: %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "àààà ààà ààààà àààààà"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "Junk àààà àààà àààà ààààààààààààà ààààà àààààà (_u)"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "àààààà ààààààà ààààà àààààààààà ààààààà àààààà (_z)"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP ààààààà"
+
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "ààà àà ààààààààààà SOAP àààààààà (_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell àààààà"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell àààà ààààààà ààààààà ààààààà ààààà àààà"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ààà ààààà àààààà ààààààà ààààààà ààà ààà àààààààà àààààà ààààààà ààààà àààà ààààààà "
+#~ "ààààààà"
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "urlàà àààà àààààà àààà àààààà ààààà"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr "ààààààà ààààààà ààààà ààààààà àààà àààà àààààààà àààà ààààà ààààààà ààààààà"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "àààààà àààààà àààààà ààààààà àààààààààààà ààààààà ààà àààà àààààà"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "àààààà ààààààà ààààà '%s' àà '%s' ààààà àààà àààààà àààààà ààààà"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ààààà %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s àààà %s àààà ààààààà àààààà"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s àààààààà ààààààà ààà ààààààààà"
+
+#~ msgid "Sending Message"
+#~ msgstr "àààààà àààààààà"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ààààà ààààà ààààà: ààà ààààààààààà àààà àààààà"
+
+#~ msgid ""
+#~ "You have exceeded this account's storage limit. Your messages are queued "
+#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
+#~ "some of your mail.\n"
+#~ msgstr ""
+#~ "ààà ààà ààààà àààààà àààààà ààààààà àààààààààà ààààààà àààààààààààà ààààààà àààààààààà "
+#~ "ààà ààààààà ààààààà àààà àààààà/ààààààà ààà àààààà ààà ààààààà/ààààààààààà àà ààààààà "
+#~ "àààà ààààà àààà àààààà àààààà\n"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "ààààà ààààà àààààààà"
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "APPEND ààààààààà ààà ààààààààààà ààààà àààààà '%s'"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "APPEND ààààààààà ààà àààààà àààà ààààà ààààà ààààà"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "APPEND ààààààààà ààààà àààà àààààà ààààà!"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "ààà ààààà àààà INBOXàà àààà àààààà àààà àààà ààààààà àààààà (_A)"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL àààà àààààà àààà ààààà"
+
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "%s àààà ààààà ààààààààà ààààà (àààààààà %s): %s"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir àààààà ààààà àààà ààààààààààà"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "àààà àààààà àààà"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "ààà ààààààà ààààà ààààà"
+
+#~ msgid "Message construction failed."
+#~ msgstr "àààààà ààààà àààà àààààà"
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH àà àààààààààààà àààààààà ààààà àààààààà"
+
+#, fuzzy
+#~| msgid "User canceled"
+#~ msgid "User cancelled the operation"
+#~ msgstr "àààà ààààà ààààà"
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS àààààààààà àààà ààààà"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS ààààààààà àààà ààààà"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO ààààààààà àààà ààààà"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH ààààààààà àààà ààààà"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ààààààà àààà ààààààà àààààà\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM ààààààààà àààà ààààà: %s: ààà ààààààààààà"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO ààààààààà àààà ààààà: %s: ààà ààààààààààà"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA ààààààààà àààà ààààà: %s: ààà ààààààààààà"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET ààààààààà àààà ààààà"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT ààààààààà àààà ààààà"
+
+#~ msgid "_Edit"
+#~ msgstr "ààààààà àààààà (_E)"
+
+#~ msgid "categories"
+#~ msgstr "ààààà"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>ààààààà (_n)</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>àààààààààààààà ààààààààà</b>"
+
+#~ msgid "Invalid connection"
+#~ msgstr "àààà ààààà"
+
+#~ msgid "No response from the server"
+#~ msgstr "ààààààà ààààà ààààà ààààà"
+
+#~ msgid "Bad parameter"
+#~ msgstr "àààà àààààà"



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