[evolution-data-server] Updated Korean translation



commit 292b77ebab7684cd6de48c86b9fd9986e7d55a0a
Author: Changwoo Ryu <cwryu debian org>
Date:   Tue Sep 13 09:30:24 2011 +0900

    Updated Korean translation

 po/ko.po | 3582 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1769 insertions(+), 1813 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index 9fb9dfe..8212d2b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,149 +7,143 @@
 #
 # ìê:
 # - "Evolution"ì "ìëëì"ìë ìì.
+# - "Google Talk"ë "êê íí"ë ëì.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc\n";
-"POT-Creation-Date: 2011-02-13 03:29+0900\n"
-"PO-Revision-Date: 2011-03-19 23:03+0900\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-13 09:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
-"Language: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Korean\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../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:573
-#: ../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:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../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 "ìë ììëë..."
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:589
+#: ../addressbook/backends/google/e-book-backend-google.c:788
 msgid "Querying for updated contactsâ"
 msgstr "ìëìíë ìëìë ëë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../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:626
+#: ../addressbook/backends/google/e-book-backend-google.c:841
 msgid "Friends"
 msgstr "ìê"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Family"
 msgstr "êì"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:845
 msgid "Coworkers"
 msgstr "ìì ëë"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:924
 msgid "Querying for updated groupsâ"
 msgstr "ìëìíë êëì ëë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1329
 msgid "Creating new contactâ"
 msgstr "ì ìëìë ëëë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
 msgid "Deleting contactâ"
 msgstr "ìëìë ììíë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1699
 msgid "Modifying contactâ"
 msgstr "ìëìë ììíë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
 msgid "Loadingâ"
 msgstr "ììëìë ììëëâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
 msgid "Authenticating with the serverâ"
 msgstr "ìëì ììíë ììëëâ"
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "ìëì(%d)ë ëìëëíë ììëë..."
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "ìëì ìì(%d)ë ìëìííë ììëë..."
-
 #. 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"
 msgstr "ìêëì ìììëë"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
 msgid "Using Distinguished Name (DN)"
 msgstr "êëëë ìë(DN) ìì"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
 msgid "Using Email Address"
 msgstr "ììëì ìì ìì"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ìëì ëì ìêíë ììëë..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
 msgid "Invalid DN syntax"
 msgstr "DN ëëì ìëëììëë"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../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:1807
+#: ../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:2243
+#: ../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:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
 msgid "Receiving LDAP search results..."
 msgstr "LDAP êì êêë ëë ììëë..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
 msgid "Error performing search"
 msgstr "êìì ìííë ì ìëê ëìíìëë"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4177
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../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 "ì ì ìë ìëê ëìíìëë"
 
@@ -158,27 +152,92 @@ msgstr "ì ì ìë ìëê ëìíìëë"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "'%s' ëìì ëëê ìí, HTTP ìí: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3064
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: gconfì ììë UID '%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:3420
-#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:635
+#: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ììë íëê ììëë"
 
+#: ../addressbook/libebook/e-book-client.c:85
+msgid "No such book"
+msgstr "êë ììëì ìì"
+
+#: ../addressbook/libebook/e-book-client.c:87
+#: ../addressbook/libedata-book/e-data-book.c:303
+msgid "Contact not found"
+msgstr "ìëìë ìì ì ììëë"
+
+#: ../addressbook/libebook/e-book-client.c:89
+#: ../addressbook/libedata-book/e-data-book.c:304
+msgid "Contact ID already exists"
+msgstr "ìëìí IDê ìë ììëë"
+
+#: ../addressbook/libebook/e-book-client.c:91
+msgid "No such source"
+msgstr "êë ìëì ìì"
+
+#: ../addressbook/libebook/e-book-client.c:93
+#: ../addressbook/libedata-book/e-data-book.c:320
+msgid "No space"
+msgstr "êêì ììëë"
+
+#: ../addressbook/libebook/e-book-client.c:449
+msgid "Failed to run book factory"
+msgstr "ììë ííë ìíì ìííìëë"
+
+#: ../addressbook/libebook/e-book-client.c:459
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:565
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#, c-format
+msgid "Invalid source"
+msgstr "ìëì ìëëììëë"
+
+#: ../addressbook/libebook/e-book-client.c:560
+#: ../calendar/libecal/e-cal-client.c:678
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr "ìëë URI '%s'"
+
+#: ../addressbook/libebook/e-book-client.c:598
+msgid "Failed to find system book"
+msgstr "ììí ììë ìêì ìí"
+
+#: ../addressbook/libebook/e-book-client.c:705
+#: ../calendar/libecal/e-cal-client.c:826
+#, c-format
+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 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 "êì ID"
 
-#: ../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 "ììë URI"
 
@@ -186,750 +245,779 @@ msgstr "ììë URI"
 #. 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 "ììëì 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "ììëì 2"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "ììëì 3"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "ììëì 4"
 
-#: ../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 "êëì ìí 2"
 
-#: ../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 "ì ìí 2"
 
-#: ../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 "ííìì URL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "ìëê URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:756
+#: ../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 "ëë URI"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "ìì ìì/ìì URL"
 
-#: ../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 "íì íì URL"
 
 #. 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 ì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ìì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ìì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ìì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "êëììì ì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "êëììì ì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "êëììì ì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "êëììì ìì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "êëììì ìì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "êëììì ìì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "ìë ì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "ìë ì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "ìë ì ID 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "ìë ìì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "ìë ìì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "ìë ìì ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "ìí! ì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "ìí! ì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "ìí! ì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "ìí! ìì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "ìí! ìì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "ìí! ìì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ìì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ìì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ìì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "ICQ ì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "ICQ ì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "ICQ ì ID 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "ICQ ìì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "ICQ ìì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 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
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "êëììì ID ëë"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "ìë ID ëë"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "ìí! ëíë ëë"
 
-#: ../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
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ICQ ID ëë"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 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:723
+#: ../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
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "êëêë ì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "êëêë ì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "êëêë ì ID 3"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "êëêë ìì ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "êëêë ìì ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "êëêë ìì ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "êëêë 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 "ìììí ì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "ìììí ì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "ììì ì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "ìììí ìì ëíë 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "ìììí ìì ëíë 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "ìììí ìì ëíë 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "ìììí ëíë ëë"
 
-#: ../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 "Google Talk Home Name 1"
+msgstr "êê íí ì ëíë 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+msgid "Google Talk Home Name 2"
+msgstr "êê íí ì ëíë 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+msgid "Google Talk Home Name 3"
+msgstr "êê íí ì ëíë 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+msgid "Google Talk Work Name 1"
+msgstr "êê íí ìì ëíë 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+msgid "Google Talk Work Name 2"
+msgstr "êê íí ìì ëíë 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+msgid "Google Talk Work Name 3"
+msgstr "êê íí ìì ëíë 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+msgid "Google Talk Name List"
+msgstr "êê íí ëíë ëë"
+
+#: ../addressbook/libebook/e-contact.c:1550
+#: ../addressbook/libebook/e-destination.c:868
 msgid "Unnamed List"
 msgstr "ìë ìë ëë"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:304
+#: ../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 "URI ìì"
+msgid "Unknown book property '%s'"
+msgstr "ì ì ìë ììë ìì '%s'"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:323
-#: ../addressbook/libedata-book/e-data-book-factory.c:361
-#: ../calendar/libedata-cal/e-data-cal-factory.c:352
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, c-format
-msgid "Invalid source"
-msgstr "ìëì ìëëììëë"
+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: "
+msgstr "ììê ìëëììëë: "
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../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:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
+#: ../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
+#: ../calendar/libedata-cal/e-data-cal.c:416 ../libedataserver/e-client.c:121
 msgid "Repository offline"
 msgstr "ììêê ìê ìì ìíìëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../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:176
-msgid "Contact not found"
-msgstr "ìëìë ìì ì ììëë"
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libedata-cal/e-data-cal.c:422
+msgid "Authentication Failed"
+msgstr "ììì ìííìëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-msgid "Contact ID already exists"
-msgstr "ìëìí IDê ìë ììëë"
-
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
-msgid "Authentication Failed"
-msgstr "ììì ìííìëë"
-
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Required"
 msgstr "ììì íìíëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../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:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../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:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../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:184
+#: ../addressbook/libedata-book/e-data-book.c:311
 msgid "Book removed"
 msgstr "ììë ìê"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Not available in offline mode"
 msgstr "ìê ìì ëëììë ììí ì ììëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../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:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../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:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../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:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../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:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../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"
 msgstr "ììí ì ììëë"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "ìë ëìì ìëëììëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:193
-msgid "No space"
-msgstr "êêì ììëë"
-
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../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:196
-#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:135
+#: ../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 "Not supported"
 msgstr "ììëì ììëë"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441 ../libedataserver/e-client.c:149
+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 error"
 msgstr "êí ìë"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
-#, c-format
-msgid "Cannot open book: %s"
-msgstr "ììëì ì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
-#, c-format
-msgid "Cannot remove book: %s"
-msgstr "ììëì ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
-#, c-format
-msgid "Cannot get contact: %s"
-msgstr "ìëìë ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
-msgstr "ìì ìì: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-msgid "Cannot get contact list: %s"
-msgstr "ìëìë ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-msgid "Cannot authenticate user: %s"
-msgstr "ììì ììí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-msgid "Cannot add contact: %s"
-msgstr "ìëìë ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-msgid "Cannot modify contact: %s"
-msgstr "ìëìë ëê ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-msgid "Cannot remove contacts: %s"
-msgstr "ìëìë ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-msgid "Cannot get supported fields: %s"
-msgstr "ììíë íëë ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-msgid "Cannot get required fields: %s"
-msgstr "íìí íëë ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-msgid "Cannot get supported authentication methods: %s"
-msgstr "ììíë ìì ëëì ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-msgid "Invalid query: %s"
-msgstr "ììê ìëëììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-msgid "Cannot get changes: %s"
-msgstr "ëë ìíì ìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:536
+#: ../addressbook/libedata-book/e-data-book.c:866
+msgid "Cannot get contact: "
+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 contact: "
+msgstr "ìëìë ìêí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:624
+#: ../addressbook/libedata-book/e-data-book.c:951
+msgid "Cannot modify contact: "
+msgstr "ìëìë ëê ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
+msgid "Cannot authenticate user: "
+msgstr "ììì ììí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:779
+msgid "Cannot open book: "
+msgstr "ììëì ì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:793
+msgid "Cannot remove book: "
+msgstr "ììëì ìêí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:818
+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 get backend property: "
+msgstr "ëìë ììì êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
+msgid "Cannot set backend property: "
+msgstr "ëìë ììì ììí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:881
+msgid "Cannot get contact list: "
+msgstr "ìëì ëëì ìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:905
+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 remove contacts: "
+msgstr "ìëìë ìêí ì ììëë: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../addressbook/libedata-book/e-data-book-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:410
 #, c-format
-msgid "Cancel operation failed: %s"
-msgstr "ìì ììê ìííìëë: %s"
+msgid "Empty URI"
+msgstr "URI ìì"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ìëì ìêí ì ììëë (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ìêì ìì HTTP ìí ìë %dëì ëííìëë (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2490
+#: ../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"
@@ -938,375 +1026,372 @@ msgstr ""
 "ìëì ìêí ì ììëë. ëëì ìê ìì ëëë ìëë.\n"
 "ìë ëìì: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4241
+#: ../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:725
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Birthday"
 msgstr "ìì"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
 #, c-format
 msgid "Birthday: %s"
 msgstr "ìì: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
 #, c-format
 msgid "Anniversary: %s"
 msgstr "êëì: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ëë ëìíë ììí ì ììëë. URI íìì íëìëë."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../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/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2105
-msgid "Reply Requested: by "
-msgstr "ëì ììí ìë: "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
-msgid "Reply Requested: When convenient"
-msgstr "ëì ìì: íëí ë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-msgid "Loading Appointment items"
-msgstr "ìì íëì ììëìë ììëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-msgid "Loading Task items"
-msgstr "ìì íëì ììëìë ììëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-msgid "Loading Note items"
-msgstr "ëë íëì ììëìë ììëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-msgid "Loading items"
-msgstr "íëì ììëìë ììëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "ëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "ìë URIê íëìëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "ìì íìì ëë ì ììëë"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-msgid "Could not create thread for populating cache"
-msgstr "ììì ììí ìëëë ëë ì ììëë"
-
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Redirected to Invalid URI"
 msgstr "ìëë URIë ëëìëííìëë"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:443
 msgid "Bad file format."
 msgstr "íì íìì íëìëë."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:450
 msgid "Not a calendar."
 msgstr "ëëì ìëëë."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../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:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Fog"
 msgstr "ëì: ìê"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Cloudy Night"
 msgstr "ëì: ëíë êë"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy"
 msgstr "ëì: êë"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Overcast"
 msgstr "ëì: íë"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Showers"
 msgstr "ëì: ìëê"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Snow"
 msgstr "ëì: ë"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Clear Night"
 msgstr "ëì: ëíë ëì"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Sunny"
 msgstr "ëì: í"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Thunderstorms"
 msgstr "ëì: ëì"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:439
 msgid "Forecast"
 msgstr "ìë"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../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 "%2$s ìììì íëìë ììíëë %1$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 "URIë ììëìì ëíìëë"
+
+#: ../calendar/libecal/e-cal.c:4419
+msgid "URI already loaded"
+msgstr "URIë ìë ììëììëë"
+
+#: ../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 "ìëìí IDê ìë ììëë"
+
+#: ../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
+msgid "A D-Bus exception has occurred"
+msgstr "D-BUS ììê ëìíìëë"
+
+#: ../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
+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
+msgid "Failed to run calendar factory"
+msgstr "ëë ííëë ìííëë ìííìëë"
+
+#: ../calendar/libecal/e-cal-client.c:717
+msgid "Failed to find system calendar"
+msgstr "ììí ëëì ìëë ìííìëë"
+
+#: ../calendar/libecal/e-cal-client.c:755
+#: ../calendar/libedata-cal/e-data-cal.c:428
+msgid "Calendar does not exist"
+msgstr "ëëì ììëë"
+
+#: ../calendar/libecal/e-cal-client.c:865
+msgid "Invalid source type"
+msgstr "ìë ìëê ìëëììëë"
+
+#: ../calendar/libecal/e-cal-component.c:1298
 msgid "Untitled appointment"
 msgstr "ìëìë ìì"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20ì"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30ì"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31ì"
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "ëì"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ëí"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "ëì"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ìììë"
 
-#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s(ììì %s)ì ìíë ìëíììì"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "ìëí ì ììëë. ëë ëìëë ìë ììëë"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1250
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%2$s ìììì íëìë ììíëë %1$sì ìíë ìëíììì"
-
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "ëìëê ììììëë"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "ììêê ìê ìì ìíìëë"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "êë ëëì ììëë"
-
-#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:114
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ìëìíë ìì ì ììëë"
+msgid "Unknown calendar property '%s'"
+msgstr "ì ì ìë ëë ìì '%s'"
 
-#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:115
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "ìëìíê ìëëììëë"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "URIë ììëìì ëíìëë"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "URIë ìë ììëììëë"
-
-#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ì ì ìë ììì"
-
-#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:116
-msgid "Object ID already exists"
-msgstr "ìëìí IDê ìë ììëë"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "íëíìì ììëì ììëë"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "ììì ììíìëë"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "ììì ììí ì ììëë"
-
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1310
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:632
-#: ../camel/providers/groupwise/camel-groupwise-store.c:814
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../calendar/libedata-cal/e-cal-backend.c:219
 #, c-format
-msgid "Authentication failed"
-msgstr "ììì ìííìëë"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "ììì íìíëë"
-
-#: ../calendar/libecal/e-cal.c:4175
-msgid "A D-Bus exception has occurred"
-msgstr "D-BUS ììê ëìíìëë"
-
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "ìë ìì"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "'%s' ëë ììì êì ëê ì ììëë"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c: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\"ìë ììê íì ììëë"
@@ -1315,7 +1400,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\"ìë í êì ììê íìíëë"
@@ -1323,7 +1408,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\"ì ìëì ììê ëììììì íëë"
@@ -1335,9 +1420,9 @@ msgstr "\"%s\"ì ìëì ììê ISO 8601 ëì/ìê ëììììì
 
 #: ../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\"ìë ë êì ììê íìíëë"
@@ -1346,9 +1431,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\"ì ìëì ììê time_t êììì íëë"
@@ -1359,18 +1444,18 @@ 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\"ì ëëì ììê time_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 "
@@ -1380,12 +1465,12 @@ msgstr ""
 "\"%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 "
@@ -1394,237 +1479,167 @@ msgstr ""
 "\"%s\"ì ëë ììê ëìììêë, ìëë ììê í êìê ëëì êì (#f) "
 "êììì íëë"
 
-#: ../calendar/libedata-cal/e-data-cal.c:113
-msgid "Invalid range"
-msgstr "ëìê ìëëììëë"
-
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "ììíì ìë ëë"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
-msgid "Calendar does not exist"
-msgstr "ëëì ììëë"
-
-#: ../calendar/libedata-cal/e-data-cal.c:124
-msgid "Unknown user"
-msgstr "ì ì ìë ììì"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
-#, c-format
-msgid "Cannot retrieve calendar address: %s"
-msgstr "ëë ììë êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
-#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "ëë ìë ììëì ììë êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
-#, c-format
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "ëë LDAP ììì êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
-#, c-format
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "ëë ìì ìëë êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
-#, c-format
-msgid "Cannot open calendar: %s"
-msgstr "ëëì ì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
-#, c-format
-msgid "Cannot refresh calendar: %s"
-msgstr "ëëì ìë êì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
-#, c-format
-msgid "Cannot remove calendar: %s"
-msgstr "ëëì ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
-#, c-format
-msgid "Cannot create calendar object: %s"
-msgstr "ëë êìë ëë ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
-#, c-format
-msgid "Cannot modify calendar object: %s"
-msgstr "ëë êìë ëê ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
-#, c-format
-msgid "Cannot remove calendar object: %s"
-msgstr "ëë êìë ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
-#, c-format
-msgid "Cannot receive calendar objects: %s"
-msgstr "ëë êìë ëì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
-#, c-format
-msgid "Cannot discard calendar alarm: %s"
-msgstr "ëë ìëì ëë ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
-#, c-format
-msgid "Cannot send calendar objects: %s"
-msgstr "ëë êìë ëë ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "ëë êì êë êëêì êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
-#, c-format
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "ëë êì êëë êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
-#, c-format
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "ëë êì ëëì êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-#, c-format
-msgid "Could not retrieve attachment list: %s"
-msgstr "ìë ëëì êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-#, c-format
-msgid "Could not complete calendar query: %s"
-msgstr "ëë ììë ëëì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
-#, c-format
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "ëë íì ìêëë êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
-#, c-format
-msgid "Could not add calendar time zone: %s"
-msgstr "ëë íì ìêëë ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
-#, c-format
-msgid "Could not set default calendar time zone: %s"
-msgstr "ëë íì ìêë êëêì ìêí ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
-#, c-format
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "ëë ëë ìíì êìì ì ììëë: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
-#, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ëë ìì ìì/ììì êìì ì ììëë: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:374
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:909
+msgid "Cannot open calendar: "
+msgstr "ëëì ì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:930
+msgid "Cannot remove calendar: "
+msgstr "ëëì ìêí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:955
+msgid "Cannot refresh calendar: "
+msgstr "ëëì ìë êì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
+msgid "Cannot retrieve backend property: "
+msgstr "ëìë ììì êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1025
+msgid "Cannot retrieve calendar object path: "
+msgstr "ëë êì êëë êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1050
+msgid "Cannot retrieve calendar object list: "
+msgstr "ëë êì ëëì êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1075
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "ëë ìì ìì/ììì êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1101
+msgid "Cannot create calendar object: "
+msgstr "ëë êìë ëë ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1128
+msgid "Cannot modify calendar object: "
+msgstr "ëë êìë ëê ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1156
+msgid "Cannot remove calendar object: "
+msgstr "ëë êìë ìêí ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1179
+msgid "Cannot receive calendar objects: "
+msgstr "ëë êìë ëì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1204
+msgid "Cannot send calendar objects: "
+msgstr "ëë êìë ëë ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1231
+msgid "Could not retrieve attachment uris: "
+msgstr "ìë URIë êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+msgid "Could not discard reminder: "
+msgstr "ìëì ëë ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1279
+msgid "Could not get calendar view path: "
+msgstr "ëë ëê êëë êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1304
+msgid "Could not retrieve calendar time zone: "
+msgstr "ëë íì ìêëë êìì ì ììëë: "
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1326
+msgid "Could not add calendar time zone: "
+msgstr "ëë íì ìêëë ìêí ì ììëë: "
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#, c-format
+msgid "Invalid call"
+msgstr "ìëë íì"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
 msgid "Invalid URI"
 msgstr "URIê ìëëìëë"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s'ì '%1$s'ì ëí ëìë ííëê ììëë"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ëìëë ìêíí ì ììëë"
 
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ì ìí ëìì ìëì ììíì ììëë"
 
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ì ìí ëìì ìë íìì ììíì ììëë"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ì ìí ëìì ìííë ììíì ììëë"
 
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ì ìí ëìì ìíí íëì ììíì ììëë"
 
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ì ìí ëìììë íë êìì ì ììëë"
 
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ì ìí ëìììë íë ëëë ì ììëë"
 
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "ëìì ìë"
 
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "ëìì ìíí"
 
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "ëìì ìíí íì"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ìì êëë ëë ì ììëë"
 
-#: ../camel/camel-data-cache.c:499
+#: ../camel/camel-data-cache.c:495
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ìì íëì ìì ì ììëë: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:147
-#, c-format
-msgid "No stream available"
-msgstr "ìíëì ììëë"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "ëëë ëì"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1652,123 +1667,164 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ìëì ëì ëêííë ììëë"
 
-#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
+#: ../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:402
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ìê ìì ëëë ìí '%s' íëë ìëíë ììëë"
 
-#: ../camel/camel-disco-folder.c:468 ../camel/camel-offline-folder.c:316
+#: ../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:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
-#: ../camel/providers/imapx/camel-imapx-folder.c:298
-#: ../camel/providers/imapx/camel-imapx-folder.c:331
-#: ../camel/providers/imapx/camel-imapx-folder.c:385
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../camel/providers/imapx/camel-imapx-folder.c:465
-#: ../camel/providers/imapx/camel-imapx-folder.c:505
-#: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../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-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "ììí"
 
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../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"
+msgstr "íì íëìì '%s' íëììë ëëëë ìííìëë: %s"
 
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:866
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%sìì ìëë ëìì ìíëì ëììëë: %s"
 
-#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
 msgid "Syncing folders"
 msgstr "íë ëêì"
 
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../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:1181 ../camel/camel-filter-driver.c:1631
+#: ../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:1278
+#: ../camel/camel-filter-driver.c:1258
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ëì ëì íëë ì ì ììëë"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ëì ëì íëë ìíí ì ììëë"
 
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ëìì %dê(%d%%)ë êììë ì"
 
-#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
+#: ../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:1351 ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
 msgid "Syncing folder"
 msgstr "íë ëêí"
 
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
 msgid "Complete"
 msgstr "ìë"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1396
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "%2$dê ììì ëìì %1$d êììë ì"
+
+#: ../camel/camel-filter-driver.c:1414
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "%2$dê ììì ëìì %1$dìì ìí"
+
+#: ../camel/camel-filter-search.c:137
+msgid "Failed to retrieve message"
+msgstr "ëììë êììëë ìííìëë"
+
+#: ../camel/camel-filter-search.c:403
+msgid "Invalid arguments to (system-flag)"
+msgstr "(system-flag)ì ìëë ìì"
+
+#: ../camel/camel-filter-search.c:418
+msgid "Invalid arguments to (user-tag)"
+msgstr "(user-flag)ì ìëë ìì"
+
+#: ../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.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "'%s'ì ìë ìí ëììë êìíë ììëë"
+
+#: ../camel/camel-folder.c:283
 #, c-format
-msgid "Getting message %d of %d"
-msgstr "%2$dê ììì ëìì %1$d êììë ì"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "'%s'ì ìë ìì ëììë êìíë ììëë"
 
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-folder.c:331
 #, c-format
-msgid "Failed at message %d of %d"
-msgstr "%2$dê ììì ëìì %1$dìì ìí"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s'ì ìë ì ëììë ííëíë ììëë"
 
-#: ../camel/camel-filter-search.c:135
-msgid "Failed to retrieve message"
-msgstr "ëììë êììë ë ìííìëë"
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ëìì ìêë ììëë"
 
-#: ../camel/camel-filter-search.c:401
-msgid "Invalid arguments to (system-flag)"
-msgstr "(system-flag)ì ìëë ìì"
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ëìì ëìíë ììëë"
 
-#: ../camel/camel-filter-search.c:416
-msgid "Invalid arguments to (user-tag)"
-msgstr "(user-flag)ì ìëë ìì"
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "'%s' íëì ëí ìë ìí ìëë ììíì ììëë"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-folder.c:3265
 #, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "íí êì ìí ì ìë: %s: %s"
+msgid "Retrieving message '%s' in %s"
+msgstr "%2$s ìì '%1$s' ëììë êììë ììëë"
+
+#: ../camel/camel-folder.c:3390
+#, c-format
+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
@@ -1790,76 +1846,48 @@ msgstr ""
 "êìì ìííë ì ìë: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#. 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:938
+#. 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:944 ../camel/camel-folder-search.c:951
+#. 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)ì(ë) match íìì ëììì íìíëë."
 
-#: ../camel/camel-folder-search.c:978
+#. 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:987
+#. 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:220
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "'%s'ì ìë ìí ëììë êìíë ììëë"
-
-#: ../camel/camel-folder.c:244
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "'%s'ì ìë ìì ëììë êìíë ììëë"
-
-#: ../camel/camel-folder.c:270
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "'%s'ì ìë ì ëììë ííëíë ììëë"
-
-#: ../camel/camel-folder.c:879
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ëìì ìêë ììëë"
-
-#: ../camel/camel-folder.c:882
-msgid "Copying messages"
-msgstr "ëìì ëìíë ììëë"
-
-#: ../camel/camel-folder.c:3251
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "'%s' ëììë êììë ììëë"
-
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../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"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "ì ì ìì"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1870,17 +1898,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "gpg userid ííë íìíë ë ìííìëë."
+msgstr "gpg userid ííë íìíëë ìííìëë."
 
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "gpg ìí ììì íìíë ë ìííìëë."
+msgstr "gpg ìí ììì íìíëë ìííìëë."
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1889,7 +1917,7 @@ msgstr ""
 "ìëíìëìì íë ìëë PINì íìíëë:\n"
 "\"%s\""
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1898,55 +1926,51 @@ msgstr ""
 "ëì ìììì ëí íë ìëë ìíê íìíëë:\n"
 "\"%s\""
 
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s'ì ëí GnuPGëëí ììì ëí ìì"
 
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../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:4894
-#: ../camel/providers/imapx/camel-imapx-server.c:4911
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../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
 #, c-format
 msgid "Cancelled"
 msgstr "ììí"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "ëë íë ìë ë ìííìëë: ìíê 3ë íëìëë."
+msgstr "ëë íë ìëë ìííìëë: ìíê 3ë íëìëë."
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPGëëí ìììëí ëë: %s"
 
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ìíííë ë ìííìëë: ëë ìëì ìëëê ììëì ìììëë."
+msgstr "ìíííëë ìííìëë: ëë ìëì ìëëê ììëì ìììëë."
 
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:828
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ìë ëìíë ëë ì ììëë: "
 
-#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
+#: ../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:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
-#: ../camel/camel-smime-context.c:952 ../camel/camel-smime-context.c:966
-#: ../camel/camel-smime-context.c:975
+#: ../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 "ëìì ìëì íìí ì ììëë: ëìì íìì íëìëë"
@@ -1955,29 +1979,53 @@ msgstr "ëìì ìëì íìí ì ììëë: ëìì íìì í
 msgid "Cannot verify message signature: "
 msgstr "ëìì ìëì íìí ì ììëë: "
 
-#: ../camel/camel-gpg-context.c:1862
+#: ../camel/camel-gpg-context.c:1864
 msgid "Could not generate encrypting data: "
 msgstr "ìíí ëìíë ëë ì ììëë: "
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1917
 msgid "This is a digitally encrypted message part"
 msgstr "ëìí ìííë ëìì ëëìëë"
 
-#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
+#: ../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:1993
+#: ../camel/camel-gpg-context.c:1995
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "MIME ëëì ìíí íëíë ë ìííìëë: íëíì ìë"
+msgstr "MIME ëëì ìíí íëíëë ìííìëë: íëíì ìë"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1259
+#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
 msgid "Encrypted content"
 msgstr "ìííë ëì"
 
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStreamììë ìììë ìêííë êëë ììíëë"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%sì ìêíìì ëë ì ììëë: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+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:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -1999,27 +2047,6 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "'%s'ì(ë) ìê ì ììëë"
 
-#: ../camel/camel-lock.c:102
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%sì ìêíìì ëë ì ììëë: %s"
-
-#: ../camel/camel-lock.c:145
-#, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
-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-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2038,7 +2065,7 @@ msgstr "ìì ëì íì %sì(ë) ì ì ììëë: %s"
 #: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "ìì íì %sì ëìì ììíë ë ìííìëë: %s"
+msgstr "ìì íì %sì ëìì ììíëë ìííìëë: %s"
 
 #: ../camel/camel-movemail.c:193
 #, c-format
@@ -2074,21 +2101,35 @@ msgstr "ëì ììíìì ìë ì ìëëì: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "ëì ììíìì ëìíë ì ìëëì: %s"
 
-#: ../camel/camel-multipart-signed.c:322
+#: ../camel/camel-multipart-signed.c:297
 #, c-format
 msgid "No content available"
 msgstr "ëìì ììëë"
 
-#: ../camel/camel-multipart-signed.c:330
+#: ../camel/camel-multipart-signed.c:305
 #, c-format
 msgid "No signature available"
 msgstr "ìëì ììëë"
 
-#: ../camel/camel-multipart-signed.c:658
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "íì ìë"
 
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%sì ìêí ì ììëë: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "SSLì ììí ì ììëë"
+
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%sì ìêí ì ììëë: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2116,7 +2157,7 @@ msgstr "ìë ìê ìí"
 msgid "Name lookup failed: %s"
 msgstr "ìë ìê ìí: %s"
 
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "'%s' íëì ëììë ëìíì ëêííë ììëë"
@@ -2134,23 +2175,23 @@ msgstr "êì íë ììëì ìê íëêë"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ëë ìë ëì íëì ìì êêëì ìê"
 
-#: ../camel/camel-provider.c:188
+#: ../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:197
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%sì(ë) ììëì ì ììëë: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%sì(ë) ììëì ì ììëë: ëëì ìêí ìëê ììëë."
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' íëíìì ìê íëêëì ììëë"
@@ -2196,11 +2237,11 @@ 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."
@@ -2208,11 +2249,11 @@ msgstr ""
 "ì ììì ìë ëìì CRAM-MD5 ìíë ììí ìëì ìêíëë (ììíë ê"
 "ì)."
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../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."
@@ -2220,45 +2261,45 @@ msgstr ""
 "ì ììì ìë ëìì DIGEST-MD5 ìíë ììí ìëì ìêíëë (ììíë ê"
 "ì)."
 
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ìë ìëìê ëë êëë (2048 ëìíëë í)"
 
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ìë ìëìê ìëëììëë\n"
 
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ìë ìëìì ìëë \"ëí íì\" ííì ëì ììëë"
 
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ìë ìëì ìì ëìíê ëì ìì ììëë"
 
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:894
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ìë ìëì ëììí ìì ëìíê ëì ììëë"
 
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response does not match"
 msgstr "ìë ìëì ììíì ììëë"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../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:128
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2266,11 +2307,11 @@ msgstr ""
 "ììí ëìì ìêí ìëìê ììíì ììëë. íì íì êíí ëì êì"
 "ì ììí ì ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ìêë target_name ëêëìì íìì íëìëë."
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2278,7 +2319,7 @@ msgstr ""
 "ìêë target_name ëêëìì ìëëìêë ììíì ìì ìëì ìëì ëì "
 "ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2286,13 +2327,13 @@ msgstr ""
 "input_chan_bindings ììë íí ììë êê ëë ìë ëìëì input_tokenì "
 "ëì ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../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ì ìëë ìë íì íìí ì ìë ìëì ëì ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../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."
@@ -2300,342 +2341,367 @@ msgstr ""
 "ìêë ìëìê ìíìí ìêíì ìëëì ìêë, ìëì íëì ìë ìëì"
 "ë ììíì ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ìêë ìíìí íëì ìëë ìíìíë ììíì ììëë."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_tokenì ìíí ìêì êìê ìííìëë."
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "credentialì ìíí ìêì êìê ìííìëë."
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ììí ìëìê ëëë ìëììëë."
 
-#: ../camel/camel-sasl-gssapi.c:169 ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../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:382
+#: ../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 "ì ììì ìë ëìí ìë ìíë ììí ìëì ìêíëë."
 
-#: ../camel/camel-sasl-login.c:95
+#: ../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 êëì ìëì ìêíëë."
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "ìë íìí"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POPì SMTPëë ëì"
 
-#: ../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:83
-msgid "POP Source URI"
-msgstr "POP ìë URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+msgid "POP Source UID"
+msgstr "POP ìë UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ì ì ìë ìì êëë ììí SMTP ìì ìì POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
-msgid "POP Before SMTP authentication using a non-POP source"
-msgstr "POPì ìë ìëì ììí SMTP ìì ìì POP"
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr "SMTP ìì ìì %s ìëìë POP ìë"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ìêì ìíìì ìííìëë: %s: %s"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:526
 #, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s'ì ììììë ëëì íìíëë"
+msgid "URL '%s' needs a user component"
+msgstr "URL '%s'ì ììì ëëì íìíëë"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s'ì íìí ëëì íìíëë"
 
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s'ì êë ëëì íìíëë"
 
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:361
 #, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"%s ëëíëë ëë ì ììëë:\n"
-"%s"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' íëíìì ëí ìëë GTypeì ëëíìëë"
 
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:938
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ììììë %2$s, íìí %3$sì ëí %1$s ìíë ìëíììì."
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1052
+#: ../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:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS ëììë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS ìëí ëìíë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ìëí ëìíë ìëí ì  ììëë"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS ëìíë ìëí ì  ììëë"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ìëì ìëë ëë ì  ììëë"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "ììì ììì ìì ì ììëë"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ìë ìêì ìêí ì ììëë"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../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:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ììì ìêí ì ììëë"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ììì ìêí ì ììëë"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "ìíí ìììë ìêí ì ììëë"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ìëì ìëë ìêí ì ììëë"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "íì ì ë"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "ìëì ëìëë"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "ìëì íëëë"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "ëì ëìì ìììì ëìëììëë"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "ìë ìììë ìì ì ììëë"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ìë ìììë ìëí ì ììëë"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ìë ìêëìì ì ì ììëë"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ìë ìêëìì ììíì ììëë"
 
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ìë êìë ìë"
 
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ìë ìë"
 
-#: ../camel/camel-smime-context.c:570
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ìëì ìëí ëìíê ììëë"
 
-#: ../camel/camel-smime-context.c:575
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "ììì ëìíì ììëì ììëë"
 
-#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ììëì êìí ì ììëë"
 
-#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ëìì ììëì ììí ì ììëë"
 
-#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "ììì êììêê ìííìëë"
 
-#: ../camel/camel-smime-context.c:635
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ëììê ìììëì ììëë. ìììë íìí ì ììëë"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ëììê ìììëì ììëë. ìììë êììê íìíìëë"
 
-#: ../camel/camel-smime-context.c:642
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "ìë ëìììíë ìì ì ììëë"
 
-#: ../camel/camel-smime-context.c:658
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ìëì: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:839 ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
 msgid "Cannot create encoder context"
 msgstr "ììë ìíìíë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:845
+#: ../camel/camel-smime-context.c:841
 msgid "Failed to add data to CMS encoder"
-msgstr "CMS ììëì ëìíë ìêíë ë ìííìëë"
+msgstr "CMS ììëì ëìíë ìêíëë ìííìëë"
 
-#: ../camel/camel-smime-context.c:850 ../camel/camel-smime-context.c:1142
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
 msgid "Failed to encode data"
-msgstr "ëìíë ììëíë ë ìííìëë"
+msgstr "ëìíë ììëíëë ìííìëë"
 
-#: ../camel/camel-smime-context.c:991 ../camel/camel-smime-context.c:1237
+#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
 msgid "Decoder failed"
 msgstr "ëìëê ìííìëë"
 
-#: ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:1058
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ìë ëí ìíí ìêëìì ìì ì ììëë"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1066
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ìíí ëí íì íìí ìëì íëí ì ììëë"
 
-#: ../camel/camel-smime-context.c:1079
+#: ../camel/camel-smime-context.c:1077
 msgid "Cannot create CMS Message"
 msgstr "CMS ëììë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:1085
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ëìí ëìíë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:1091
+#: ../camel/camel-smime-context.c:1089
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ëìí ëìíë ìëí ì ììëë"
 
-#: ../camel/camel-smime-context.c:1097
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot attach CMS data object"
 msgstr "CMS ëìí ìëìíë ìëí ì ììëë"
 
-#: ../camel/camel-smime-context.c:1106
+#: ../camel/camel-smime-context.c:1104
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ëë ìë ìëë ëë ì ììëë"
 
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ëë ìë ìëë ìêí ì ììëë"
 
-#: ../camel/camel-smime-context.c:1136
+#: ../camel/camel-smime-context.c:1134
 msgid "Failed to add data to encoder"
-msgstr "ëìíë ììëì ìêíë ë ìííìëë"
+msgstr "ëìíë ììëì ìêíëë ìííìëë"
 
-#: ../camel/camel-smime-context.c:1244
+#: ../camel/camel-smime-context.c:1243
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ìíí íì: ìííí ëìì ììëë"
 
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:1814
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' íëë ëë ì ììëë: íëê ìë ììëë"
 
+#: ../camel/camel-store.c:1857
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "íë '%s' ìë ì"
+
+#: ../camel/camel-store.c:2044
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "'%s'ì íë êìíë ì"
+
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2385
+#: ../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:2378 ../camel/camel-store.c:2389
+#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ìíëì"
 
-#: ../camel/camel-store.c:2832
+#: ../camel/camel-store.c:2521
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "íëë ëë ì ììëë: %s: íëê ìë ììëë"
 
-#: ../camel/camel-store.c:2959 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2535
+#, c-format
+msgid "Creating folder '%s'"
+msgstr "'%s' íëë ëëë ì"
+
+#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "íëë ììí ì ììëë: %s: ìëë ëì"
 
-#: ../camel/camel-store.c:3100 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:664
+#: ../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 "CamelStreamFilterììë ìììë ìêííë êëë ììíëë"
+
+#: ../camel/camel-stream-process.c:265
+#, c-format
+msgid "Connection cancelled"
+msgstr "ìêì ììë"
+
+#: ../camel/camel-stream-process.c:270
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "\"%s\" ëëìë ìêí ì ììëë: %s"
+
 #: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
@@ -2714,7 +2780,7 @@ msgstr "íìí ìëì ëë êëë (ìë 255 êì)"
 msgid "Invalid reply from proxy server"
 msgstr "íëì ìëìì ìëì ìëëì ììëë"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2727,16 +2793,16 @@ msgstr ""
 "íêíëí:        %s\n"
 "ìë:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "ëì"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "íë"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2751,7 +2817,7 @@ msgstr ""
 "\n"
 "ëìëììêìëê?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2760,7 +2826,7 @@ msgstr ""
 "ììì ëì: %s\n"
 "ëêì: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2769,7 +2835,7 @@ msgstr ""
 "ìëë ììì ëëì: %s\n"
 "ëêì: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2778,7 +2844,7 @@ msgstr ""
 "ììì ëë: %s\n"
 "ëêì: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2787,37 +2853,38 @@ msgstr ""
 "ììì ìì ëëì ëëëììëë: %s\n"
 "ëêì: %s"
 
-#: ../camel/camel-url.c:316
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' URLì íìí ì ììëë"
 
-#: ../camel/camel-vee-folder.c:1240 ../camel/camel-vee-folder.c:1403
+#: ../camel/camel-vee-folder.c:1297 ../camel/camel-vee-folder.c:1457
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ëììë êì íëì ëìí/ìê ì ììëë"
 
-#: ../camel/camel-vee-folder.c:1276
+#: ../camel/camel-vee-folder.c:1330
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$sì %1$s(ì)ëë ëììë ììëë"
 
-#: ../camel/camel-vee-folder.c:1344
+#: ../camel/camel-vee-folder.c:1398
 #, c-format
 msgid "Error storing '%s': "
-msgstr "'%s' ììíë ë ìë: "
+msgstr "'%s' ììíëë ìë: "
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. 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:393
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "íëë ììí ì ììëë: %s: êë íëê ììëë"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "íë ìëì ëê ì ììëë: %s: êë íëê ììëë"
@@ -2830,275 +2897,24 @@ msgstr "íìí íëë ëììë ëìí ì ììëë"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ìíëì íëë ëììë ëìí ì ììëë"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:958
-#: ../camel/providers/imap/camel-imap-folder.c:395
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%sì ëí ììì ììëì ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1034
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "ììí '%s' ëììë íìíë ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:669
-#: ../camel/providers/groupwise/camel-groupwise-store.c:800
-#: ../camel/providers/imap/camel-imap-folder.c:3965
-#: ../camel/providers/imap/camel-imap-folder.c:4047
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%sì ìë ì ëììì ìì ìëë êììë ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1991
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2044
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2708
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2718
-#, c-format
-msgid "Could not get message"
-msgstr "ëììë êìì ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2428
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2478
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' íëì ëììë ìêí ì ììëë: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2464
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ëììë ëë ì ììëë: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ëììë ìì ì ììëë: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../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/groupwise/camel-groupwise-folder.c:2663
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
-#, c-format
-msgid "Cannot get message %s: "
-msgstr "%s ëììë ìì ì ììëë: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2681
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2691
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2894
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "ì ëììë ìê ìì ëëììë ììí ì ììëë."
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "%s íë ìíìëë ìì ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr ""
-"ìê ìì ëëìì ëììë ëëì ì ììëë: ììë ììí ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-msgid "Cannot append message in offline mode: "
-msgstr "ìê ìì ëëìì ëìíì ëëì ì ììëë: "
-
-#: ../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:46
-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:72
-#: ../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 "ìë ëì ëìì ëìì ìíëììì íì(_U)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ëì íìí íëììë ìíëì íì(_B)"
-
-#: ../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 ìì"
-
-# groupwiseìì "Post Office Agent"ëë ììë êëë ììíë
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Post Office Agent SOAP íí(_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "ëë êëììì"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "ëë êëììì ìëì ìêíë ìë"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-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:107
-#, c-format
-msgid "Host or user not available in url"
-msgstr "URLì íìí íì ìììê ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
-#, c-format
-msgid "You did not enter a password."
-msgstr "ìíë ìëíì ìììëë."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
-msgid "Some features may not work correctly with your current server version"
-msgstr "íì ìë ëììëë ìë êëì ìëë ëìíì ìì ìë ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:560
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "%s(ì)ëë íëê ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1221
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ìê ìì ëëììë êëììì íëë ëë ì ììëë."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1230
-#, c-format
-msgid "Cannot create a special system folder"
-msgstr "íì ììí íëë ëë ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1240
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "íë ìì íëìë íì íëë ííí ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1325
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "êëìììì '%s' íë ìëì '%s'(ì)ë ëê ì ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1384
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "êëììì ìë %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1386
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "êëììì ìëì (ììì: %s, ìì: %s)"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s ìëë íí êëììì ëì ëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "ëììë ëëë ììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "íëë ìì ì ììëë: ì ììêì ìëë ëììëë"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-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:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ëììë ëë ì ìì: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "ìë ìíëì ììëë"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../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:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "ììì ììëììëë"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../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:394
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3107,27 +2923,27 @@ msgstr ""
 "IMAP server %s %sìì êê:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP serverëëí ìììëí ëë: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../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:560
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ìëì ëëì ëë ìì ëëìëë."
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../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:809
+#: ../camel/providers/imap/camel-imap-command.c:812
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ìëëëí ìêìëí OK ëëì ì: %s"
@@ -3136,50 +2952,63 @@ msgstr "IMAP ìëëëí ìêìëí OK ëëì ì: %s"
 msgid "Always check for new mail in this folder"
 msgstr "íì ì íëìì ì ëì íì"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s ëëíëë ëë ì ììëë: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3915
+#: ../camel/providers/imap/camel-imap-folder.c:393
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%sì ëí ììì ììëì ì ììëë"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4018
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%sì ìë ëë ëììë êìíë ììëë"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3372
+#: ../camel/providers/imap/camel-imap-folder.c:3462
 msgid "Unable to retrieve message: "
 msgstr "ëììë êìì ì ììëë: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imapx/camel-imapx-server.c:5195
+#: ../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:3408
-#: ../camel/providers/imapx/camel-imapx-server.c:5196
+#: ../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:3483
-#: ../camel/providers/imap/camel-imap-folder.c:4378
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../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:4179
+#: ../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:4189
+#: ../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:4418
+#: ../camel/providers/imap/camel-imap-folder.c:4531
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ìëìì ëìì ëëì ìì ì ììëë."
@@ -3192,23 +3021,28 @@ msgstr "ìì ëëíëë ì ì ììëë: "
 #: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "ëìì %sì(ë) ììíë ë ìííìëë: %s"
+msgstr "ëìì %sì(ë) ììíëë ìííìëë: %s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
 msgid "Failed to cache message %s: "
-msgstr "ëìì %sì(ë) ììíë ë ìííìëë: "
+msgstr "ëìì %sì(ë) ììíëë ìííìëë: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:531
 #, c-format
 msgid "Failed to cache %s: "
-msgstr "%sì(ë) ììíë ë ìííìëë: "
+msgstr "%sì(ë) ììíëë ìííìëë: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "ì ëì íì"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c: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:48
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3222,7 +3056,7 @@ msgstr "ìëì ìê"
 #: ../camel/providers/imap/camel-imap-provider.c:50
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
-msgstr "ìëì ìêíë ë ììì ìì ëëì ìì(_U)"
+msgstr "ìëì ìêíëë ììì ìì ëëì ìì(_U)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Co_mmand:"
@@ -3250,109 +3084,130 @@ msgstr "ìëìì ìë ìë íëì ìë êêì ëì(_V)"
 msgid "Names_pace:"
 msgstr "ìë êê(_P):"
 
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "ìì"
+
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ì ìëì INBOXì ìë ì ëììì ííë ìì(_A)"
+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:76
 msgid "Check new messages for Jun_k contents"
 msgstr "ìë ëì ëììê ìíëììì íì(_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 "ëì íìí íëììë ìíëì íì(_B)"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../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 "IMAP íí êëê"
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "IMAP, SSL ìì"
+
+#: ../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:90
+#: ../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:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "ìí"
+
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "ì ììì ìë ìë íìí ìíë ììí IMAP ìëì ìêíëë."
 
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%sì ìêí ì ììëë: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "SSLì ììí ì ììëë"
-
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%sì ìêí ì ììëë: "
+#. 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:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../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"
+msgstr "ëì ëëë IMAP ìë %sì ìêíëë ìííìëë: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../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 "STARTLSë ììíì ììëë"
 
-#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "SSL íìì ìííìëë"
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3046
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ëì ëëë IMAP ìë %sì ìêíëë ìííìëë: "
 
-#: ../camel/providers/imap/camel-imap-store.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../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:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
-#, c-format
-msgid "Connection cancelled"
-msgstr "ìêì ììë"
-
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" ëëìë ìêí ì ììëë: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3141
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP ìëë ììí %s ìì ëëì ììíì ììëë"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../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:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../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"
@@ -3363,70 +3218,70 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../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:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../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 "IMAP ìëì (ììì: %s, ìì: %s)"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
-#: ../camel/providers/local/camel-maildir-folder.c:409
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:611
-#: ../camel/providers/local/camel-maildir-store.c:617
-#: ../camel/providers/local/camel-maildir-store.c:665
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "ëì íìí"
+#: ../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:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "íë ìë \"%s\"ì(ê) ìëëì ììëë. \"%c\" ëìê ëì ìì ììëë"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../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:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../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:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../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:3137
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ìêì ìê ìëì ìêì ëêìëë"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
+#: ../camel/providers/imap/camel-imap-store.c:3217
 msgid "Server unexpectedly disconnected: "
 msgstr "ìêì ìê ìëì ìêì ëêìëë: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%sì ëí íë ììì ëë ì ììëë"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%sì ëí ììë ëë ì ììëë: "
@@ -3452,35 +3307,34 @@ msgstr "ìêì ììí ì(_R)"
 msgid "Namespace:"
 msgstr "ìë êê:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr "IMAP íí êëê"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#: ../camel/providers/imapx/camel-imapx-server.c:1480
 msgid "Error writing to cache stream: "
 msgstr "ìì ìíëì ìë ì ìë ëì: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2186
 #, c-format
 msgid "Not authenticated"
 msgstr "ììíì ìììëë"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "%sì (íí %s) ìêí ì ììëë: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#: ../camel/providers/imapx/camel-imapx-server.c:3416
 msgid "Closing tmp stream failed: "
 msgstr "ìì ìíë ëêì ìííìëë: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#: ../camel/providers/imapx/camel-imapx-server.c:5437
+#: ../camel/providers/imapx/camel-imapx-server.c:5452
 msgid "Cannot create spool file: "
 msgstr "ìí íìì ëë ì ììëë: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
 msgid "No such folder: %s"
 msgstr "êë íëê ììëë: %s"
@@ -3488,34 +3342,34 @@ msgstr "êë íëê ììëë: %s"
 #: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
-msgstr "ìì ìíëì ëìíë ëííì ìììëë"
+msgstr "ìë ìíëì ëìíë ëííì ìììëë"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
 msgid "Source stream unavailable"
 msgstr "ìëì ìíëì ììí ì ììëë"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../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)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:470
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "ëìì ëëì ëìíë ìëìë ëëê"
 
-#: ../camel/providers/local/camel-local-folder.c:683
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3534,13 +3388,13 @@ msgstr "MH-íì ëì ëëíë"
 
 #: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "MHì êì ëì ëëíëë ëì ëìì ììíë ë ììëë."
+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."
@@ -3548,29 +3402,29 @@ msgstr ""
 "íì 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 "ííë ëì íìíì ì ëììì ìì(_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 "íì ìëì MBOX ëì ëì íì"
 
-#: ../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."
@@ -3578,76 +3432,84 @@ msgstr ""
 "ìë íì mbox ëì ëì íììì ëì ëìë ìêë ììí ë ììíëë. ë"
 "í 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 "íì ìëì MBOX ëì ëì ëëíë"
 
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:319
+#: ../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:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../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:183
+#: ../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:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
+#: ../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:220
+#: ../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:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "ëì ëì íì %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "%s íëì ìëì %s(ì)ë ëê ì ììëë: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "'%s'ì ìëì ëê ì ììëë: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:695
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "íë ìì íì '%s'ì(ë) ììí ì ììëë: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "íë ëí íì '%s'ì(ë) ììí ì ììëë: %s"
 
+#: ../camel/providers/local/camel-local-store.c:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "'%s'ì ìëì ëê ì ììëë: %s"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ëììë ììì ìêí ì ììëë: ì ì ìë ìì"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../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:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ëì íëì ëììë ëëì ì ììëë: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../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
@@ -3655,7 +3517,7 @@ msgstr "ëì íëì ëììë ëëì ì ììëë: %s: "
 msgid "Cannot get message %s from folder %s: "
 msgstr "ëììë ìì ì ìì: %2$s íëìì %1$s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ëììë ëì íëë ìê ì ììëë: %s"
@@ -3666,29 +3528,29 @@ 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:682
+#: ../camel/providers/local/camel-maildir-store.c:722
 #, c-format
 msgid "Folder %s already exists"
 msgstr "'%s' íëê ìë ììëë"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../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:206
-#: ../camel/providers/local/camel-mbox-store.c:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../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:212
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../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' íëë ìì ì ììëë: íëê ììëë."
@@ -3700,7 +3562,7 @@ msgstr "'%s' íëë ìì ì ììëë: maildir ëëíëê ìë
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:584
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' íëë ììí ì ììëë: %s"
@@ -3709,37 +3571,37 @@ msgstr "'%s' íëë ììí ì ììëë: %s"
 msgid "not a maildir directory"
 msgstr "ëìíë ëëíëê ìëëë"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:821
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../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-store.c:673
+#: ../camel/providers/local/camel-maildir-store.c:713
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "íë ìëì ëê ì ììëë: %s: íë ìëì ìì ëì ììëë"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../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 "ëì ëëíë êëë ì ì ììëë: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "íëì ìêìì íì ììëë"
 
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "ì ëììë íìíë ììëë"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../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 "íëë ììíë ììëë"
@@ -3759,39 +3621,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "íëê ëê ëë ìíë ììë êìë ëìëë."
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../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:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../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:400
+#: ../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:550
+#: ../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:566
+#: ../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:568
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "íëê ìë ììëë"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../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"
@@ -3800,89 +3662,89 @@ msgstr ""
 "'%s' íëë ììí ì ììëë:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../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:641
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' íëê ëì ìì ììëë. ììíì ììëë."
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../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:761
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ì íëì ìëì ìëëì ììëë."
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../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:859
+#: ../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:476
+#: ../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:537
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "íë %2$sìì %1$s ììì ìëìì ëì íì ìëê ëìíìëë"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../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:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../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:711
+#: ../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:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../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:739
+#: ../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:756
+#: ../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:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../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:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../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 "
@@ -3890,65 +3752,55 @@ msgid ""
 msgstr ""
 "MBOX íìì ëêììëë. ëëììììì. (From ìì ìì íìë ììëë.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../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:1052
+#: ../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:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../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"
+msgstr "ìì ëìíì ìëë ìííìëë: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "ìì ëìíì ìë ë ìííìëë: %s: %s"
+msgstr "ìì ëìíì ìëë ìííìëë: %s: %s"
 
 #: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "MH íëì ëììë ìêí ì ììëë: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../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:497
+#: ../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:230
+#: ../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:327
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "'%s' ëì ëìì ì ì ììëë: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "'%s' ëì ëìì ìë íìë ìëê ëëíëë ìëëë"
-
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ëì ëì ëì íì %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ëì ëì íë íë %s"
@@ -3958,7 +3810,7 @@ msgstr "ëì ëì íë íë %s"
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' íëê ììëë."
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3967,12 +3819,12 @@ msgstr ""
 "'%s' íëë ì ì ììëë:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../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:416
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3981,26 +3833,36 @@ msgstr ""
 "'%s' íëë ëë ì ììëë:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../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:462
+#: ../camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ììêê ëì íìíì ììíì ììëë"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ëì ëì íëë ììí ì ììëë"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ëì ëì íëì ìëì ëê ì ììëë"
 
+#: ../camel/providers/local/camel-spool-store.c:580
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "'%s' ëì ëìì ì ì ììëë: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:596
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "'%s' ëì ëìì ìë íìë ìëê ëëíëë ìëëë"
+
 #: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
@@ -4024,40 +3886,47 @@ msgstr ""
 "ìí íë %sê(ì) ëêí í ì ììëë: %s\n"
 "íëê ëêìì êìëë. '%s'ì ìëì ììíëë"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../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:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../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:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../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
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "%s ëììë ìì ì ììëë: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:494
+#: ../camel/providers/nntp/camel-nntp-folder.c:500
+#: ../camel/providers/nntp/camel-nntp-folder.c:547
 #, c-format
 msgid "Posting failed: %s"
 msgstr "êìê ìííìëë: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:542
 msgid "Posting failed: "
 msgstr "êìê ìííìëë: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../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:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:591
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP íëìì ëììë ëìí ì ììëë!"
@@ -4072,36 +3941,44 @@ msgstr ""
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "êë ëí ìììì, ìë íë ìëì íì(_D)"
 
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "NNTP íí êëê"
+
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "NNTP, SSL ìì"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "ììë ëì"
 
-#: ../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 "ììë ëìêëì êì ìêë êìí ë ììëë ìê íëêëìëë."
 
-#: ../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 ìëì ììíëë."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../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:89
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "ìëì ììíë ë ìííìëë: %s"
+msgstr "ìëì ììíëë ìííìëë: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%sìì ìê ëììë ìì ì ììëë: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ìë %sìì ìë ìë %dì(ë) ëííìëë: %s"
@@ -4111,18 +3988,33 @@ msgstr "NNTP ìë %sìì ìë ìë %dì(ë) ëííìëë: %s"
 msgid "USENET News via %s"
 msgstr "%s ìëë íí USENET ëì"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"ëìêëì êììë ë ìëê ëìíìëë:\n"
+"ëìêëì êììëë ìëê ëìíìëë:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../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:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "ëì ììêì íëì ìëì ëê ì ììëë."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "ëì ììêì íëë ìêí ì ììëë: ëìì êë íìíììì."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4133,7 +4025,7 @@ msgstr ""
 "\n"
 "êë ëìêëì ììëë. ìíí íëì ìì íëì êìëë."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4144,85 +4036,69 @@ msgstr ""
 "\n"
 "ëìêëì ììëë!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "ëì ììêì íëë ëë ì ììëë: ëìì êëíììì."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "ëì ììêì íëì ìëì ëê ì ììëë."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "ëì ììêì íëë ìêí ì ììëë: ëìì êë íìíììì."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
 msgid "NNTP Command failed: "
 msgstr "NNTP ëëì ìííìëë: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, c-format
 msgid "Not connected."
 msgstr "ìêëì ìììëë."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../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:246
+#: ../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:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:369
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "headìì ììì ëí ìë ìë: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ììì ìííìëë: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../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ì ëììê ììëë"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../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:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:430
 msgid "Unknown reason"
 msgstr "ì ì ìë ìì"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:470
 msgid "Retrieving POP summary"
 msgstr "POP ììì êììë ììëë"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "POP ììì êìì ì ììëë: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:485
+msgid "Cannot get POP summary: "
+msgstr "POP ììì êìì ì ììëë: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "ìë ë ëììë ììí ììíëë"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 msgid "Expunging deleted messages"
 msgstr "ììí ëììë ììí ììíëë"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+msgid "Message Storage"
 msgstr "ëìì ììê"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4243,15 +4119,23 @@ msgstr "ëì ëì íìíìì ììí ìì(_E)"
 msgid "Disable _support for all POP3 extensions"
 msgstr "POP3 íì êë ëë ëê(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "POP3 íí êëê"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3, SSL ìì"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:58
+#: ../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:75
+#: ../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."
@@ -4259,7 +4143,7 @@ msgstr ""
 "ì ììì ìë ìë íìí ìíë ììí POP ìëì ìêíëë. ëì POP ìë"
 "ìì ì ììëì ììíëë."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../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 "
@@ -4270,42 +4154,42 @@ msgstr ""
 "ìì ìë ììëë."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP ìë %sìì ìëë ìê ëììë ìë ë ìííìëë"
+msgstr "POP ìë %sìì ìëë ìê ëììë ìëë ìííìëë"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../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"
+msgstr "POP ìë %sì ëì ëëë ìêíëë ìííìëë: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../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:218
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "POP ìë %sì ëì ëëë ìêíë ë ìííìëë%s"
+msgstr "POP ìë %sì ëì ëëë ìêíëë ìííìëë%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "TLS íìì ìííìëë"
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "POP ìë %sì ëì ëëë ìêíëë ìííìëë: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../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:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../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 "
@@ -4314,22 +4198,22 @@ msgstr ""
 "POP ìë %sì ìêí ì ììëë: ììí ìì ëëì ììíì ììëë."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "POP ìë %2$sì SASL '%1$s' ëêìì ìííìëë%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../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:374
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
-msgstr "POP ìë %sì ììíë ë ìííìëë: "
+msgstr "POP ìë %sì ììíëë ìííìëë: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:439
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4338,56 +4222,56 @@ msgstr ""
 "POP ìë %sì ìêí ì ììëë: ìëë APOP IDë ëììëë. êììë êê"
 "ì ììëëë. êëììê ëìíììì."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
-"POP ìë %sì ìêíë ë ìííìëë.\n"
-"ìíë ëëë ë ìëê ëìíìëë: %s"
+"POP ìë %sì ìêíëë ìííìëë.\n"
+"ìíë ëëëë ìëê ëìíìëë: "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
 "POP ìë %sì ìêí ì ììëë.\n"
-"ììì ìëì ëëë ë ìëê ëìíìëë%s"
+"ììì ìëì ëëëë ìëê ëìíìëë%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
 msgstr ""
-"POP ìë %sì ìêíë ë ìííìëë.\n"
-"ìíë ëëë ë ìëê ëìíìëë%s"
+"POP ìë %sì ìêíëë ìííìëë.\n"
+"ìíë ëëëë ìëê ëìíìëë%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 ìë %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 ìë (ììì: %s, ìì: %s)"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../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:720
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s'(ì)ëë íëê ììëë."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3ë íë êìë ììíì ììëë"
@@ -4444,48 +4328,64 @@ msgstr "%sì(ë) ìíí ì ììëë: ëìì ëëì ìììë
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmailì ìí %dëìë ëëìëë: ëìì ëëì ìììëë."
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "SMTP íí êëê"
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SMTP, SSL ìì"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "ëìì ìì íí"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c: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:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 msgstr "Welcome ìëì ìëê ììëë: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 #: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "SMTP ìë %sì ëì ëëë ìêíë ë ìííìëë: %s"
+msgstr "SMTP ìë %sì ëì ëëë ìêíëë ìííìëë: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: "
+msgstr "SMTP ìë %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:361
+#: ../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:408
+#: ../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:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4496,186 +4396,181 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../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:620
+#: ../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:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
 msgid "Sending message"
 msgstr "ëììë ëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../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:662
+#: ../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:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ëë ìëë, ëì ëëìì íìí ì ììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "ìì íì ìììì ëë ìëìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ëëì êíëì ìììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ëëì ììê êíëì ìììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ììí ìí, íì ììí ëìë ìë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "ëìë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "ìëì ìëëììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "ìëìê ìì ìëì ëììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "ìëìë ììí ì ììëë. ìì ìëì ëìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "ììí ëì ëìì ììììë ìííìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../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:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ììí ëì ëìì íì ììëë: ëìíì ììí ì ììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ììí ììì íì ììëë: ëìíì ììí ì ììëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
-msgstr "ììí ììì ììíìëë: ìëíë ë ìë ëì"
+msgstr "ììí ììì ììíìëë: ìëíëë ìë ëì"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../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:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ììí ëì ììì íì ììëë: ììí ìì êêì ëìíëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ììí ëì ììì ììíìëë: ìì êêì íëëì ëììëë<b"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ììí ëì ììì íì ììëë: ëìí ìëì ì ì ìë ìëìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../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:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "ììì ìííìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ìíë ëêì íëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ìì ëìì ëë ììíëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ììí ìì ëìììë ìííê íìíëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ììì ììë ìííìëë"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "SMTP ìê ëìì"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../camel/providers/smtp/camel-smtp-transport.c:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "HELO command failed: "
 msgstr "HELO ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "SMTP ìì"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL ìì ìëìíë ëëë ë ìëê ëìíìëë."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#: ../camel/providers/smtp/camel-smtp-transport.c:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "AUTH command failed: "
 msgstr "AUTH ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1491
+#: ../camel/providers/smtp/camel-smtp-transport.c:1504
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
 msgid "DATA command failed: "
 msgstr "DATA ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 msgid "RSET command failed: "
 msgstr "RSET ëëì ìííìëë: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
 msgid "QUIT command failed: "
 msgstr "QUIT ëëì ìííìëë: "
 
@@ -4791,11 +4686,27 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ëê"
 
+#: ../libedataserver/e-client.c:113
+msgid "Source not loaded"
+msgstr "ìëì ììëìì ëíìëë"
+
+#: ../libedataserver/e-client.c:115
+msgid "Source already loaded"
+msgstr "ìëì ìë ììëììëë"
+
+#: ../libedataserver/e-client.c:123
+msgid "Offline unavailable"
+msgstr "ìíëìì ììí ì ììëë"
+
+#: ../libedataserver/e-client.c:145
+msgid "D-Bus error"
+msgstr "D-ëì ìë"
+
 #. 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 "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -4803,7 +4714,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. 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 "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -4811,7 +4722,7 @@ msgstr "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I:%M"
 
@@ -4819,78 +4730,78 @@ msgstr "%Y/%m/%d (%a) %p %I:%M"
 #. 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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a) %p %I"
 
 #. 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 "%Y/%m/%d (%a) %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 "%Y/%m/%d (%a)"
 
 #. 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 "%Y/%m/%d %p %I:%M:%S"
 
 #. 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 "%Y/%m/%d %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 "%Y/%m/%d %p %I:%M"
 
 #. 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 "%Y/%m/%d %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 "%Y/%m/%d %p %I"
 
 #. 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 "%Y/%m/%d %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 "%Y/%m/%d"
 
 #. 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 "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c: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"
 
@@ -4898,222 +4809,267 @@ 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 "%p %I:%M"
 
 #. 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 "%p %I"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../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:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:412
 msgid "Failed to authenticate.\n"
-msgstr "ììíë ë ìííìëë.\n"
+msgstr "ììíëë ìííìëë.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:131
-msgid "Category Properties"
-msgstr "ëë ìì"
+#: ../libedataserverui/e-categories-editor.c:221
+msgid "Currently _used categories:"
+msgstr "íì ììíë ëë(_U):"
 
-#: ../libedataserverui/e-categories-dialog.c:142
-msgid "Category _Name"
-msgstr "ëë ìë(_N)"
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "ìì êëí ëë(_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:148
-msgid "Category _Icon"
-msgstr "ëë ììì(_I)"
+#: ../libedataserverui/e-categories-selector.c:320
+msgid "Icon"
+msgstr "ììì"
+
+#: ../libedataserverui/e-categories-selector.c:325
+msgid "Category"
+msgstr "ëë"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "ëë \"%s\" ëëê"
 
-#: ../libedataserverui/e-categories-dialog.c:189
+#: ../libedataserverui/e-category-editor.c:132
 msgid "Category Icon"
 msgstr "ëë ììì"
 
-#: ../libedataserverui/e-categories-dialog.c:195
+#: ../libedataserverui/e-category-editor.c:136
 msgid "_No Image"
 msgstr "êë ìì(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:406
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "ëë ìë(_N)"
+
+#: ../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.c:661
-msgid "Currently _used categories:"
-msgstr "íì ììíë ëë(_U):"
+#: ../libedataserverui/e-client-utils.c:799
+#, c-format
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"%s ëëì (ììì %s) ìíë ìëíììì\n"
+"ìì: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:668
-msgid "_Available Categories:"
-msgstr "ìì êëí ëë(_A):"
+#: ../libedataserverui/e-client-utils.c:801
+#, c-format
+msgid "Enter password for calendar %s (user %s)"
+msgstr "%s ëëì (ììì %s) ìíë ìëíììì"
 
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "íì(_E)"
+#: ../libedataserverui/e-client-utils.c:805
+#, c-format
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"%s ìì ëëì (ììì %s) ìíë ìëíììì\n"
+"ìì: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:767
-msgid "Icon"
-msgstr "ììì"
+#: ../libedataserverui/e-client-utils.c:807
+#, c-format
+msgid "Enter password for task list %s (user %s)"
+msgstr "%s ìì ëëì (ììì %s) ìíë ìëíììì"
 
-#: ../libedataserverui/e-categories-dialog.c:772
-msgid "Category"
-msgstr "ëë"
+#: ../libedataserverui/e-client-utils.c:811
+#, c-format
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"%s ëë ëëì (ììì %s) ìíë ìëíììì\n"
+"ìì: %s"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-client-utils.c:813
 #, c-format
-msgid "Create category \"%s\""
-msgstr "ëë \"%s\" ëëê"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "%s ëë ëëì (ììì %s) ìíë ìëíììì"
+
+#: ../libedataserverui/e-client-utils.c:818
+#, c-format
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr ""
+"%s ììëì (ììì %s) ìíë ìëíììì\n"
+"ìì: %s"
+
+#: ../libedataserverui/e-client-utils.c:820
+#, c-format
+msgid "Enter password for address book %s (user %s)"
+msgstr "%s ììëì (ììì %s) ìíë ìëíììì"
+
+#: ../libedataserverui/e-client-utils.c:917
+msgid "Enter Passphrase"
+msgstr "ìíêì ìëíììì"
 
-#: ../libedataserverui/e-name-selector-dialog.c:169
+#: ../libedataserverui/e-client-utils.c:919
+msgid "Enter Password"
+msgstr "ìíë ìëíììì"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "ìëì ëìê"
 
-#: ../libedataserverui/e-name-selector-dialog.c:191
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ììë(_O):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:199
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "ëë(_G):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:217
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "êì(_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:235
-#: ../libedataserverui/e-name-selector-dialog.c:970
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1011
 msgid "Any Category"
 msgstr "ëë ëë"
 
-#: ../libedataserverui/e-name-selector-dialog.c:237
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "ìëì(_N)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:282
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "êì"
 
-#: ../libedataserverui/e-name-selector-dialog.c:285
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "ììë"
 
-#: ../libedataserverui/e-name-selector-dialog.c:288
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "ìëì"
 
-#: ../libedataserverui/e-name-selector-dialog.c:405
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "ììëìì ìëìë ìííììì"
 
-#: ../libedataserverui/e-name-selector-dialog.c:740
+#: ../libedataserverui/e-name-selector-dialog.c:766
 msgid "_Add"
 msgstr "ìê(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:770
 msgid "_Remove"
 msgstr "ìê(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:884
+#: ../libedataserverui/e-name-selector-dialog.c:930
 #, c-format
 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:2665
+#: ../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:2680
+#: ../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:2690
+#: ../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:2707
+#: ../libedataserverui/e-name-selector-entry.c:2783
 #, c-format
 msgid "_Edit %s"
 msgstr "%s íì(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:513
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ìì(_D)"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
-msgstr "í ëìì íë ììí ì ììëë. êë ìììë íìí ìëì ììëë."
+msgstr ""
+"í ëìì íë ììí ì ììëë. êë ìììë íìí ìëì ììëë."
 
-#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords.c:699
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock íê ìì ììëë."
 
-#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords.c:819
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "ì ìí êì(_R)"
 
-#: ../libedataserverui/e-passwords.c:822
+#: ../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:827
+#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "ì ìí êì(_R)"
 
-#: ../libedataserverui/e-passwords.c:828
+#: ../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:170
+#: ../libedataserverui/e-source-selector-dialog.c:169
 msgid "_Destination"
 msgstr "ëì(_D)"
-
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "ìêì ìëëììëë"
-
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ìëì ìëì ìëëììëë"
-
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ìëìì ìëì ììëë"
-
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ëêëìê íëìëë"
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ì ìíí"



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