[evolution-data-server] Updated Greek translation



commit 9350b9c7b9af35b26c3e0b4a40540718b6408b7b
Author: Tom Tryfonidis <tomtryf gmail com>
Date:   Tue Jul 24 18:16:59 2012 +0300

    Updated Greek translation

 po/el.po | 1177 ++++++++++++++++++++++++++------------------------------------
 1 files changed, 493 insertions(+), 684 deletions(-)
---
diff --git a/po/el.po b/po/el.po
index e55d27d..1f5a534 100644
--- a/po/el.po
+++ b/po/el.po
@@ -30,11 +30,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
-"=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-06-24 12:20+0000\n"
-"PO-Revision-Date: 2012-07-02 07:19+0300\n"
-"Last-Translator: Dimitris Spingos (ÎÎÎÎÏÏÎÏ ÎÏÎÎÎÎÏ) <dmtrs32 gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n";
+"POT-Creation-Date: 2012-07-20 16:15+0000\n"
+"PO-Revision-Date: 2012-07-24 13:38+0200\n"
+"Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: team gnome gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +51,8 @@ msgstr ""
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:596
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
-#: ../calendar/libecal/e-cal.c:4029 ../calendar/libecal/e-cal-client.c:148
+#: ../calendar/libecal/e-cal.c:4032
+#: ../calendar/libecal/e-cal-client.c:148
 #: ../camel/camel-imapx-command.c:594
 #: ../camel/providers/imap/camel-imap-command.c:521
 #: ../camel/providers/imap/camel-imap-store.c:464
@@ -62,19 +62,16 @@ msgstr "ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to remove file '%s': %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÎÏÎÏÎÏ ÎÏÏÎÎÎÏ '%s': %s"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:164
 #, c-format
-#| msgid "Could not create directory %s: %s"
 msgid "Failed to make directory %s: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÏÎÎÏÎÎÏ %s: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:459
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÏÎÏ ÎÎÏÎÎÏ ÎÎÎ ÏÏÏÎ '%s': %s"
 
@@ -100,16 +97,16 @@ msgid "Failed to build summary for an address book %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏÎÎÎÏÎÏ ÎÎÎ ÎÎÎ ÎÎÎÎÎÎ ÎÎÎÏÎÏÎÏÎÏÎ %s"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:850
+#: ../addressbook/backends/google/e-book-backend-google.c:709
 msgid "Querying for updated contactsâ"
 msgstr "ÎÏÏÏÎÎÎ ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎÏ ÎÏÎÏÎÏâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Querying for updated groupsâ"
 msgstr "ÎÏÏÏÎÎÎ ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÎÏ ÎÎÎÎÎÏâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1439
+#: ../addressbook/backends/google/e-book-backend-google.c:1275
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
@@ -117,35 +114,33 @@ msgid "The backend does not support bulk additions"
 msgstr "Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÏÏÎÏÎÎÏÎÎÏ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1471
+#: ../addressbook/backends/google/e-book-backend-google.c:1307
 msgid "Creating new contactâ"
 msgstr "ÎÎÎÎÎÏÏÎÎÎ ÎÎÎÏ ÎÏÎÏÎÏâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1560
+#: ../addressbook/backends/google/e-book-backend-google.c:1396
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
-#| msgid "Calendar doesn't support Free/Busy"
 msgid "The backend does not support bulk removals"
 msgstr "Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÎÏÎÎÏÎÏÎÎÏ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1588
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
 msgid "Deleting contactâ"
 msgstr "ÎÎÎÎÏÎÏÎ ÎÏÎÏÎÏâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1838
+#: ../addressbook/backends/google/e-book-backend-google.c:1674
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
-#| msgid "Key usage does not support certificate signing"
 msgid "The backend does not support bulk modifications"
 msgstr "Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÏÏÎÏÎÏÎÎÎÏÎÎÏ"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1876
+#: ../addressbook/backends/google/e-book-backend-google.c:1712
 msgid "Modifying contactâ"
 msgstr "ÎÏÎÏÎÏÎÎÎÏÎ ÎÏÎÏÎÏâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2059
+#: ../addressbook/backends/google/e-book-backend-google.c:1895
 msgid "Loadingâ"
 msgstr "ÎÏÏÏÏÏÎâ"
 
@@ -216,7 +211,6 @@ msgstr "ÎÎÏÎ ÎÏÎÏÏÎ (%d)... "
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
 #, c-format
-#| msgid "Failed to authenticate on POP server %s: "
 msgid "Failed to get the DN for user '%s'"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÏ DN ÎÎÎ ÏÎÎ ÏÏÎÏÏÎ '%s'"
 
@@ -226,7 +220,6 @@ msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "Î ÎÎÎÎÎÏÏÎÎÎ ÏÏÏÎÏ '%s' ÎÏÎÏÏÏÎ ÎÎ ÎÎÏÎÏÏÎÏÎ HTTP: %d (%s)"
 
 #: ../addressbook/libebook/e-book-client.c:95
-#| msgid "No such folder %s"
 msgid "No such book"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÎÎÎ"
 
@@ -241,7 +234,6 @@ msgid "Contact ID already exists"
 msgstr "ÎÎ ÎÎÎÎÎÏÏÎÏÏÎÎÏ ÏÎÏ ÎÏÎÏÎÏ ÏÏÎÏÏÎÎ ÎÎÎ"
 
 #: ../addressbook/libebook/e-book-client.c:101
-#| msgid "No such message"
 msgid "No such source"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÏÎÎÎ"
 
@@ -251,13 +243,11 @@ msgid "No space"
 msgstr "ÎÏÏÎÏ ÏÏÏÎ"
 
 #: ../addressbook/libebook/e-book-client.c:488
-#| msgid "Failed to encode data"
 msgid "Failed to run book factory"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÎÏÎÏ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÎÎÎÎÏ"
 
 #: ../addressbook/libebook/e-book-client.c:2282
-#: ../calendar/libecal/e-cal-client.c:4630
-#| msgid "Cannot get contact list: %s"
+#: ../calendar/libecal/e-cal-client.c:4640
 msgid "Cannot get connection to view"
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÎÎÏÎ ÎÎÎ ÏÏÎÎÎÎÎ"
 
@@ -276,7 +266,6 @@ msgstr "ÎÏÏÎÎÎÎÎÏÎÏÎ ÏÎ"
 
 #. URI of the book to which the contact belongs to
 #: ../addressbook/libebook/e-contact.c:128
-#| msgid "Book URI"
 msgid "Book UID"
 msgstr "UID ÎÎÎÎÎÎÏ"
 
@@ -721,7 +710,6 @@ msgstr "ÎÎÏÏÎ"
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
 #: ../addressbook/libebook/e-contact.c:281
-#| msgid "List Show Addresses"
 msgid "List Shows Addresses"
 msgstr "ÎÎÏÎÎÎÏÎ ÎÎÏÏÎÏ ÎÎÎÏÎÏÎÏÎÏÎ"
 
@@ -809,42 +797,34 @@ msgid "SIP address"
 msgstr "ÎÎÎÏÎÏÎÏÎ SIP"
 
 #: ../addressbook/libebook/e-contact.c:312
-#| msgid "Skype Home Name 1"
 msgid "Google Talk Home Name 1"
 msgstr "ÎÎÎÎÎ Google Talk ÎÎÎÎÎÏ 1"
 
 #: ../addressbook/libebook/e-contact.c:313
-#| msgid "Skype Home Name 2"
 msgid "Google Talk Home Name 2"
 msgstr "ÎÎÎÎÎ Google Talk ÎÎÎÎÎÏ 2"
 
 #: ../addressbook/libebook/e-contact.c:314
-#| msgid "Skype Home Name 3"
 msgid "Google Talk Home Name 3"
 msgstr "ÎÎÎÎÎ Google Talk ÎÎÎÎÎÏ 3"
 
 #: ../addressbook/libebook/e-contact.c:315
-#| msgid "Skype Work Name 1"
 msgid "Google Talk Work Name 1"
 msgstr "ÎÎÎÎÎ Google Talk ÎÏÎÎÏÎÎÏ 1"
 
 #: ../addressbook/libebook/e-contact.c:316
-#| msgid "Skype Work Name 2"
 msgid "Google Talk Work Name 2"
 msgstr "ÎÎÎÎÎ Google Talk ÎÏÎÎÏÎÎÏ 2"
 
 #: ../addressbook/libebook/e-contact.c:317
-#| msgid "Skype Work Name 3"
 msgid "Google Talk Work Name 3"
 msgstr "ÎÎÎÎÎ Google Talk ÎÏÎÎÏÎÎÏ 3"
 
 #: ../addressbook/libebook/e-contact.c:318
-#| msgid "Skype Name List"
 msgid "Google Talk Name List"
 msgstr "ÎÎÏÏÎ ÎÎÎÎÎÏÏÎ Google Talk"
 
 #: ../addressbook/libebook/e-contact.c:320
-#| msgid "Skype Name List"
 msgid "Twitter Name List"
 msgstr "ÎÎÏÏÎ ÎÎÎÎÎÏÏÎ Twitter"
 
@@ -859,13 +839,11 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÏÎÎÏÎÎÏ, Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎ
 
 #: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
-#| msgid "Unknown error: %s"
 msgid "Unknown book property '%s'"
 msgstr "ÎÎÎÏÏÏÎ ÎÎÎÏÏÎÏÎ ÎÎÎÎÎÎÏ '%s'"
 
 #: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
-#| msgid "Cannot create folder '%s': %s"
 msgid "Cannot change value of book property '%s'"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÎÏ ÏÎÎÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÏ ÏÎÏ ÎÎÎÎÎÎÏ '%s'"
 
@@ -877,7 +855,6 @@ msgstr "ÎÎÎÏÎÏÎÎÏ ÎÎÎÎÎ"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
-#| msgid "Contact not found"
 msgid "Contact '%s' not found"
 msgstr "ÎÎ ÎÏÎÎÎÎÎ Î ÎÏÎÏÎ '%s'"
 
@@ -885,7 +862,6 @@ msgstr "ÎÎ ÎÏÎÎÎÎÎ Î ÎÏÎÏÎ '%s'"
 #: ../addressbook/libedata-book/e-data-book.c:201
 #: ../addressbook/libedata-book/e-data-book.c:214
 #: ../addressbook/libedata-book/e-data-book.c:724
-#| msgid "Invalid query: %s"
 msgid "Invalid query: "
 msgstr "ÎÎÏÏÎ ÎÏÏÏÎÎÎ: "
 
@@ -895,18 +871,21 @@ msgid "Success"
 msgstr "ÎÏÎÏÏÏÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:3997 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libedata-cal/e-data-cal.c:416
 #: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎÎÎ ÎÏÎÏÏÎÎÎÎÎÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4011 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libedata-cal/e-data-cal.c:418
 #: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "ÎÏÎÎÏÎ ÏÏÏÏÎÎÏÎ"
@@ -927,12 +906,14 @@ msgid "Unsupported field"
 msgstr "ÎÎÏÏÎÏÏÎÏÎÎÏÎ ÏÎÎÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "ÎÎÏÏÎÏÏÎÏÎÎÏÎ ÎÎÎÎÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÏ"
 
 #: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "ÎÎ TLS ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
 
@@ -950,27 +931,32 @@ msgid "Not available in offline mode"
 msgstr "ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ ÏÎ ÎÎÎÏÎÏÏÎÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "ÎÏÎÏÎÎÏÎ ÎÏÎÎÏ ÎÎÎÎÎÎÏÏ ÎÎÎÎÎÏÎÏÎÏ"
 
 #: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "ÎÏÎÏÎÎÏÎ ÎÏÎÎÏ ÏÏÏÎÎÏ ÎÎÎÎÎÏÎÏÎÏ"
 
 #: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
+#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "ÎÎÏÏÎ ÎÎÏÎÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "ÎÏÏÏÏÎÏÎ ÎÎÏÎÎÎÏÎÏ"
 
 #: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÏÏÏÎÏ"
 
@@ -982,111 +968,101 @@ msgid "Invalid server version"
 msgstr "ÎÎÏÏÎ ÎÎÎÎÏÎ ÎÎÏÏÎÏÎÏÎÏÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:3995 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../calendar/libecal/e-cal.c:3998
+#: ../calendar/libedata-cal/e-data-cal.c:439
 #: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "ÎÎÏÏÎ ÏÏÎÏÎÎ"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4034 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../calendar/libecal/e-cal.c:4037
+#: ../calendar/libedata-cal/e-data-cal.c:441
 #: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
-#| msgid "Backend is busy"
+#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÎÎÎÎÎÎ ÎÎÏÎÎ"
 
 #: ../addressbook/libedata-book/e-data-book.c:335
 #: ../calendar/libecal/e-cal-client.c:619
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
+#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "ÎÎÎÎ ÏÏÎÎÎÎ"
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:542
 #: ../addressbook/libedata-book/e-data-book.c:909
-#| msgid "Cannot get contact: %s"
 msgid "Cannot get contact: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÎÏÎÏÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:567
 #: ../addressbook/libedata-book/e-data-book.c:592
-#| msgid "Empty query: %s"
 msgid "Empty query: "
 msgstr "ÎÎÎÏ ÎÏÏÏÎÎÎ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:617
 #: ../addressbook/libedata-book/e-data-book.c:1007
-#| msgid "Cannot add contact: %s"
 msgid "Cannot add contact: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÎÎÎ ÏÎÏ ÎÏÎÏÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:642
 #: ../addressbook/libedata-book/e-data-book.c:1041
-#| msgid "Cannot modify contact: %s"
 msgid "Cannot modify contacts: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÏÎÎÎÏÎ ÎÏÎÏÏÎ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:796
-#| msgid "Cannot open book: %s"
 msgid "Cannot open book: "
 msgstr "ÎÎÏÎÎÏÎ ÏÎ ÎÎÎÎÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:812
-#| msgid "Cannot remove book: %s"
 msgid "Cannot remove book: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÏÎÎÏÎÏÎ ÏÎÏ ÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:839
-#| msgid "Cannot refresh calendar: %s"
 msgid "Cannot refresh address book: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎ ÏÎÏ ÎÎÎÎÎÎÏ ÎÎÎÏÎÏÎÏÎÏÎ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:865
-#| msgid "Cannot create calendar object: %s"
 msgid "Cannot get backend property: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÎÎÎÏÏÎÏÎÏ ÎÏÎÏÎÎÏÏÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:890
 #: ../calendar/libedata-cal/e-data-cal.c:1016
-#| msgid "Cannot send calendar objects: %s"
 msgid "Cannot set backend property: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÏÎÎÏ ÎÎÎÏÏÎÏÎÏ ÎÏÎÏÎÎÏÏÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:927
-#| msgid "Cannot get contact list: %s"
 msgid "Cannot get contact list: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÎÎÏÏÎÏ ÎÏÎÏÏÎ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:961
-#| msgid "Cannot get contact list: %s"
 msgid "Cannot get contact list uids: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ uids ÎÎÏÏÎÏ ÎÏÎÏÏÎ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:1066
-#| msgid "Cannot remove contacts: %s"
 msgid "Cannot remove contacts: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÏÎÏÎÏ ÎÏÎÏÏÎ: "
 
 #: ../addressbook/libedata-book/e-data-book-factory.c:103
 #: ../calendar/libedata-cal/e-data-cal-factory.c:114
 #, c-format
-#| msgid "No backend factory for '%s' of '%s'"
 msgid "No backend name in source '%s'"
 msgstr "ÎÏÏÎÏ ÏÎÎÎÎ ÎÏÎÏÎÎÏÏÎÎÎÎÏ ÏÏÎÎ ÏÎÎÎ '%s'"
 
@@ -1104,7 +1080,6 @@ msgstr "ÎÎÎÎÎÏÎ ÏÎÎÎÎÎÏ UID"
 #: ../addressbook/libedata-book/e-data-book-factory.c:332
 #: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-#| msgid "No such folder '%s'."
 msgid "No such source for UID '%s'"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÎÎ ÎÎÎ UID '%s'"
 
@@ -1115,23 +1090,12 @@ msgstr "Î ÎÎÏÏÎÏÎÏÎÏÎÏ ÎÎÎÎÎ ÎÏÏÎÏÏÎÎÎÏÏÎÏ (%s)"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:594
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÎ SSL: %s"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
-msgid ""
-"Failed to connect to a server using SSL. One possible reason is an invalid "
-"certificate being used by the server. If this is expected, like self-signed "
-"certificate being used on the server, then disable certificate validity "
-"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
-msgstr ""
-"ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÎ SSL. ÎÎÎ ÏÎÎÎÎÎ ÎÎÏÎÎ "
-"ÎÎÎÎÎ ÎÎÎ ÎÎÏÏÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÎÏÏ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ. ÎÎÎ "
-"ÎÏÏÏ ÎÎÎÎÎÎÎÏÎÎ, ÏÏÏÏ ÏÏÎÏÎ ÎÏÏÎÏÏÎÎÏÎÏÏÎÎÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÏÏÎÎ "
-"ÎÎÏÏÎÏÎÏÎÏÎ, ÏÏÏÎ ÎÏÎÎÎÏÎÎÏÎÎÎÏÏÎ ÏÎÏÏ ÎÎÎÎÏÎÏÏ ÎÎÎÏÏÏÏÎÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ "
-"ÎÎÎÎÎÎÎÎÏÎÏ ÏÎÎ ÎÏÎÎÎÎÎ 'ÏÎÏÎÎÎÎÏÎ ÎÎÏÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ SSL' ÏÏÎÏ "
-"ÎÎÎÏÏÎÏÎÏ."
+msgid "Failed to connect to a server using SSL. One possible reason is an invalid certificate being used by the server. If this is expected, like self-signed certificate being used on the server, then disable certificate validity tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÎ SSL. ÎÎÎ ÏÎÎÎÎÎ ÎÎÏÎÎ ÎÎÎÎÎ ÎÎÎ ÎÎÏÏÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ ÏÎÏ ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÎÏÏ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ. ÎÎÎ ÎÏÏÏ ÎÎÎÎÎÎÎÏÎÎ, ÏÏÏÏ ÏÏÎÏÎ ÎÏÏÎÏÏÎÎÏÎÏÏÎÎÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ, ÏÏÏÎ ÎÏÎÎÎÏÎÎÏÎÎÎÏÏÎ ÏÎÏÏ ÎÎÎÎÏÎÏÏ ÎÎÎÏÏÏÏÎÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÎÎÎÎÎÎÎÎÏÎÏ ÏÎÎ ÎÏÎÎÎÎÎ 'ÏÎÏÎÎÎÎÏÎ ÎÎÏÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ SSL' ÏÏÎÏ ÎÎÎÏÏÎÏÎÏ."
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
 #, c-format
@@ -1145,8 +1109,7 @@ msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
-"ÎÏÏÏÏÎÏÎÏ Î ÎÎÏÏÎÏÎÏÎÏÎÏ, ÏÎ ÎÎÎÏÎÎÏÎÎÎ ÎÎ ÎÎÎÎÎÎÎ ÏÎ ÎÎÏÎÏÏÎÏÎ ÎÎÎÎÎÏÏÎÏ "
-"ÎÏÎÎ.\n"
+"ÎÏÏÏÏÎÏÎÏ Î ÎÎÏÏÎÏÎÏÎÏÎÏ, ÏÎ ÎÎÎÏÎÎÏÎÎÎ ÎÎ ÎÎÎÎÎÎÎ ÏÎ ÎÎÏÎÏÏÎÏÎ ÎÎÎÎÎÏÏÎÏ ÎÏÎÎ.\n"
 "ÎÎÎÏÎÎ ÏÏÎÎÎÎÏÎÏ: %s"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:3668
@@ -1154,12 +1117,10 @@ msgid "CalDAV does not support bulk additions"
 msgstr "ÎÎ CalDAV ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÏÏÎÏÎÎÏÎÎÏ"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:3770
-#| msgid "Key usage does not support certificate signing"
 msgid "CalDAV does not support bulk modifications"
 msgstr "ÎÎ CalDAV ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÏÏÎÏÎÏÎÎÎÏÎÎÏ"
 
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:3938
-#| msgid "Calendar doesn't support Free/Busy"
 msgid "CalDAV does not support bulk removals"
 msgstr "ÎÎ CalDAV ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÎÎÎÎÎÎÏ ÎÏÎÎÏÎÏÎÎÏ"
 
@@ -1190,30 +1151,29 @@ msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÎÎÎÎÏÏÎÏ ÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎ
 msgid "Cannot save calendar data"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÎÎÏÏÎÏ ÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:480
+#: ../calendar/backends/http/e-cal-backend-http.c:481
 #, c-format
-#| msgid "Malformed signature"
 msgid "Malformed URI: %s"
 msgstr "ÎÎÎÎÎÎÎÏÏÏÏÎÎÎÎ URI: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:541
+#: ../calendar/backends/http/e-cal-backend-http.c:542
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ÎÎÎÎÏÎÎÎÎÏÎÎÏÎ ÏÎ ÎÎÏÏÎ URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:578
+#: ../calendar/backends/http/e-cal-backend-http.c:579
 #, c-format
 msgid "Bad file format."
 msgstr "ÎÎÎÎÎÏÎÎÎÎ ÎÎÏÏÎ ÎÏÏÎÎÎÏ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:588
+#: ../calendar/backends/http/e-cal-backend-http.c:589
 #, c-format
 msgid "Not a calendar."
 msgstr "ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÎÏÎÎÎ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:933
-#: ../calendar/backends/http/e-cal-backend-http.c:937
-#: ../calendar/backends/weather/e-cal-backend-weather.c:523
+#: ../calendar/backends/http/e-cal-backend-http.c:934
+#: ../calendar/backends/http/e-cal-backend-http.c:938
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÏÏÎÎÎÏ cache"
 
@@ -1257,72 +1217,77 @@ msgstr "ÎÎÎÏÏÏ: ÎÎÎÏÎÎÏÏÏÎÏ"
 msgid "Weather: Thunderstorms"
 msgstr "ÎÎÎÏÏÏ: ÎÎÏÎÎÎÎÎÎÏ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:429
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "ÎÏÏÎÎÏÏÎ ÎÎÎÏÎÏ"
 
-#: ../calendar/libecal/e-cal.c:3999
+#: ../calendar/libecal/e-cal.c:4002
 msgid "Repository is offline"
 msgstr "ÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÎÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ"
 
-#: ../calendar/libecal/e-cal.c:4001 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÏÎÎÏÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4003 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal-client.c:137
 #: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "ÎÎ ÎÏÎÎÎÎÎ ÏÎ ÎÎÏÎÎÎÎÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4005 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libecal/e-cal.c:4008
+#: ../calendar/libecal/e-cal-client.c:139
 #: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "ÎÎÏÏÎ ÎÎÏÎÎÎÎÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4007
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI not loaded"
 msgstr "To URI ÎÎÎ ÏÎÏÏÏÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4009
+#: ../calendar/libecal/e-cal.c:4012
 msgid "URI already loaded"
 msgstr "ÎÎ URI ÎÏÎÎ ÎÎÎ ÏÎÏÏÏÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:4016
 msgid "Unknown User"
 msgstr "ÎÎÎÏÏÏÎÏ ÏÏÎÏÏÎÏ"
 
-#: ../calendar/libecal/e-cal.c:4015 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libecal/e-cal.c:4018
+#: ../calendar/libecal/e-cal-client.c:143
 #: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "ÎÎ ÎÎÎÎÎÏÏÎÏÏÎÎÏ ÎÎÏÎÎÎÎÎÎÎÎÏ ÏÏÎÏÏÎÎ ÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Protocol not supported"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ ÏÎ ÏÏÏÏÏÎÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4019
+#: ../calendar/libecal/e-cal.c:4022
 msgid "Operation has been canceled"
 msgstr "Î ÎÎÎÏÎÏÏÎÎÎ ÎÎÏÏÏÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:4024
 msgid "Could not cancel operation"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÏÏÏÎÏ ÎÎÎÏÎÏÏÎÎÎÏ"
 
-#: ../calendar/libecal/e-cal.c:4023 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:4026
+#: ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "Î ÏÎÏÏÎÏÎÎÎÏÎ ÎÏÎÏÏÏÎ"
 
-#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libecal/e-cal.c:4028
 #: ../camel/providers/smtp/camel-smtp-transport.c:845
 #: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
 
-#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libecal/e-cal.c:4030
 msgid "A D-Bus exception has occurred"
 msgstr "ÎÎÎÎÎÏÏÎÎÎÎÎÎ ÎÎÎ ÎÎÎÎÏÎÏÎ D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libecal/e-cal.c:4034
 msgid "No error"
 msgstr "ÎÏÏÎÏ ÏÏÎÎÎÎ"
 
@@ -1337,7 +1302,6 @@ msgid "Invalid range"
 msgstr "ÎÎÏÏÎ ÎÏÏÎÏ"
 
 #: ../calendar/libecal/e-cal-client.c:610
-#| msgid "Failed to encode data"
 msgid "Failed to run calendar factory"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÎÏÎÏ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ"
 
@@ -1469,45 +1433,41 @@ msgstr "30Î"
 msgid "31st"
 msgstr "31Î"
 
-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
-#| msgid "High"
+#: ../calendar/libecal/e-cal-util.c:696
+#: ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "ÎÏÎÎÎ"
 
-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
-#| msgid "Normal"
+#: ../calendar/libecal/e-cal-util.c:698
+#: ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÎÎÎÎÎÎÎÎ"
 
-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
-#| msgid "Low"
+#: ../calendar/libecal/e-cal-util.c:700
+#: ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "ÎÎÎÎÎÎ"
 
 #. An empty string is the same as 'None'.
 #: ../calendar/libecal/e-cal-util.c:721
-#| msgid "Undefined"
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÎÏÏÎÏÏÎ"
 
 #: ../calendar/libedata-cal/e-cal-backend.c:36
-#| msgid "Cannot remove calendar object: %s"
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÏÎÎÏÎÎÏ, Î ÎÏÎÏÎÎÏÏÎÎÎÎ ÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ ÎÎÎÎÎÎÎ"
 
 #: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
-#| msgid "Unknown error: %s"
 msgid "Unknown calendar property '%s'"
 msgstr "ÎÎÎÏÏÏÎ ÎÎÎÏÏÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ '%s'"
 
 #: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
-#| msgid "Cannot create calendar object: %s"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÎ ÏÎÎÎÏ ÏÎÏ ÎÎÎÏÏÎÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ '%s'"
 
@@ -1542,9 +1502,7 @@ msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÏÎ ÏÎ ÏÏÏÏÎ ÏÏÎÏÎÎ ÎÎÎ
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr ""
-"ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÏÏÏÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ/ÏÏÏÎÎÏ "
-"ÎÎÏÎ ISO 8601"
+msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÏÏÏÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ/ÏÏÏÎÎÏ ÎÎÏÎ ISO 8601"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
@@ -1573,7 +1531,6 @@ msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÎÎÏÏÎÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎ
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects two or three arguments"
 msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ 2 Î 3 ÎÏÎÏÎÎÏÎ"
 
@@ -1587,13 +1544,11 @@ msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÎÎÏÏÎÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎ
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÏÏÎÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects none or two arguments"
 msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÎÎÎÎÎÎ Î 2 ÎÏÎÏÎÎÏÎ"
 
@@ -1604,13 +1559,8 @@ msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎ ÎÎÏÏÎÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎ
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
-msgstr ""
-"ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÏÎ ÏÎ ÏÏÏÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎ ÎÏÏ ÏÎ \"any\", \"summary\", "
-"\"description\", \"location\", \"attendee\", \"organizer\", Î \"classification\""
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
+msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÏÎ ÏÎ ÏÏÏÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÎÎÎ ÎÏÏ ÏÎ \"any\", \"summary\", \"description\", \"location\", \"attendee\", \"organizer\", Î \"classification\""
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
@@ -1619,12 +1569,8 @@ msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÎÏÎÎÏÎÏÏÎÎ ÎÎÎ ÏÏÎÏÎÎ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÏÎ ÏÎÎ ÏÎ ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎÏ Î ÎÎÎ ÎÎÎ ÎÏÎÎ "
-"ÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏ ÎÏÎÏÎ (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "ÎÎ \"%s\" ÎÎÎÎÎÎÎÎ ÏÏÎ ÏÎÎ ÏÎ ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎÏ Î ÎÎÎ ÎÎÎ ÎÏÎÎ ÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏ ÎÏÎÏÎ (#f)"
 
 #: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
@@ -1636,109 +1582,91 @@ msgstr "ÎÎ ÎÎÎÏÎÎÏÎÎÎ ÎÎÎ ÏÏÎÏÏÎÎ"
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:909
-#| msgid "Cannot open calendar: %s"
 msgid "Cannot open calendar: "
 msgstr "ÎÎÏÎÎÏÎ ÏÎ ÎÎÎÎÎÎÎ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:934
-#| msgid "Cannot remove calendar: %s"
 msgid "Cannot remove calendar: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÏÎÎÏÎÏÎ ÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:961
-#| msgid "Cannot refresh calendar: %s"
 msgid "Cannot refresh calendar: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎ ÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:990
-#| msgid "Cannot retrieve calendar address: %s"
 msgid "Cannot retrieve backend property: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÎÎÏÏÎÏÎÏ ÎÏÎÏÎÎÏÏÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1045
-#| msgid "Cannot retrieve calendar object path: %s"
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÎÎÎÏÎÎÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1075
-#| msgid "Cannot retrieve calendar object list: %s"
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÎÏÏÎÏ ÏÏÎ ÎÎÏÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1104
-#| msgid "Cannot retrieve calendar free/busy list: %s"
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÎÏÏÎÏ ÎÎÎÎÎÏÎÎÏÏÎÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1142
-#| msgid "Cannot create calendar object: %s"
 msgid "Cannot create calendar object: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎÎÎ ÎÎÏÎÎÎÎÎÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1177
-#| msgid "Cannot modify calendar object: %s"
 msgid "Cannot modify calendar object: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÏÎÎÎÏÎ ÎÎÏÎÎÎÎÎÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1217
-#| msgid "Cannot remove calendar object: %s"
 msgid "Cannot remove calendar object: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÏÎÎÏÎÏÎ ÎÎÏÎÎÎÎÎÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1254
-#| msgid "Cannot receive calendar objects: %s"
 msgid "Cannot receive calendar objects: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÏÎ ÎÎÏÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1285
-#| msgid "Cannot send calendar objects: %s"
 msgid "Cannot send calendar objects: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÏÎÏÏÎÎÎ ÎÎÏÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1317
-#| msgid "Could not retrieve attachment list: %s"
 msgid "Could not retrieve attachment uris: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÏÎ ÏÏÎÎÎÎÎÎÏÎ uri: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1345
-#| msgid "Could not store folder: %s"
 msgid "Could not discard reminder: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÏÏÎÏÎÏ ÏÏÎÎÎÏÎÎÏÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1374
-#| msgid "Could not retrieve calendar time zone: %s"
 msgid "Could not get calendar view path: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÏ ÎÎÎÎÏÎÎÎÏ ÏÏÎÎÎÎÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1404
-#| msgid "Could not retrieve calendar time zone: %s"
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÏÎÎÏ ÏÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1430
-#| msgid "Could not add calendar time zone: %s"
 msgid "Could not add calendar time zone: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÎÎÎ ÏÎÏ ÎÏÎÎÏ ÏÏÎÏ ÎÎÎÏÎÎÎÎÎÎÏ: "
 
 #: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
-#| msgid "Invalid range"
 msgid "Invalid call"
 msgstr "ÎÎÏÏÎ ÎÎÎÏÎ"
 
@@ -1825,31 +1753,38 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÎÏÎÎÎÏÏÎÏÏÎÎÎÏÎÏÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ"
 
-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
+#: ../camel/camel-disco-folder.c:76
+#: ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "ÎÎÏÎÎÎÏÎÎ ÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÎÎ ÎÏÎÎÏÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ"
 
-#: ../camel/camel-disco-folder.c:416
+#: ../camel/camel-disco-folder.c:417
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÎÏÎÎÏÎÎÎÎÏÎÎ ÏÎÎÎÎÎÏ '%s' ÎÎÎ ÎÏÎÎÏÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ"
 
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:329
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:484
+#: ../camel/camel-offline-folder.c:331
 msgid "Copy folder content locally for _offline operation"
 msgstr "ÎÎÏÎÎÏÎÏÎ ÏÎÏÎÎÏÎÎÎÎÏÎ ÏÎÎÎÎÎÏ ÏÎÏÎÎÎ ÎÎÎ ÎÏÎÎÏÎÎ Ï_ÏÏÎÏ ÏÏÎÎÎÏÎ"
 
-#: ../camel/camel-disco-store.c:466 ../camel/camel-imapx-folder.c:410
-#: ../camel/camel-imapx-folder.c:443 ../camel/camel-imapx-folder.c:479
-#: ../camel/camel-imapx-folder.c:535 ../camel/camel-imapx-folder.c:611
-#: ../camel/camel-imapx-folder.c:645 ../camel/camel-imapx-folder.c:685
-#: ../camel/camel-imapx-folder.c:721 ../camel/camel-imapx-store.c:273
-#: ../camel/camel-imapx-store.c:1363 ../camel/camel-imapx-store.c:1451
-#: ../camel/camel-imapx-store.c:1497
+#: ../camel/camel-disco-store.c:466
+#: ../camel/camel-imapx-folder.c:410
+#: ../camel/camel-imapx-folder.c:443
+#: ../camel/camel-imapx-folder.c:479
+#: ../camel/camel-imapx-folder.c:535
+#: ../camel/camel-imapx-folder.c:611
+#: ../camel/camel-imapx-folder.c:645
+#: ../camel/camel-imapx-folder.c:685
+#: ../camel/camel-imapx-folder.c:721
+#: ../camel/camel-imapx-store.c:273
+#: ../camel/camel-imapx-store.c:1364
+#: ../camel/camel-imapx-store.c:1452
+#: ../camel/camel-imapx-store.c:1498
 #: ../camel/providers/imap/camel-imap-store.c:1246
 #: ../camel/providers/imap/camel-imap-store.c:2002
-#: ../camel/providers/imap/camel-imap-store.c:2469
-#: ../camel/providers/imap/camel-imap-store.c:3219
+#: ../camel/providers/imap/camel-imap-store.c:2471
+#: ../camel/providers/imap/camel-imap-store.c:3221
 #: ../camel/providers/pop3/camel-pop3-folder.c:525
 #: ../camel/providers/pop3/camel-pop3-folder.c:655
 #: ../camel/providers/pop3/camel-pop3-folder.c:838
@@ -1858,15 +1793,15 @@ msgstr "ÎÎÏÎÎÏÎÏÎ ÏÎÏÎÎÏÎÎÎÎÏÎ ÏÎÎÎÎÎÏ ÏÎÏÎÎÎ
 #: ../camel/providers/pop3/camel-pop3-store.c:807
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr ""
-"ÎÏÎÏÎÎ ÎÎ ÎÎÏÏÎ ÏÏÎÎÎÎÎÎÎÎ ÏÏÎ ÎÎÎÏÏÎ ÎÎÎ ÎÎ ÎÎÎÎÎÎÏÏÎÎÎ ÎÏÏÎ Î ÎÎÎÎÎÎÎÏÎÎ"
+msgstr "ÎÏÎÏÎÎ ÎÎ ÎÎÏÏÎ ÏÏÎÎÎÎÎÎÎÎ ÏÏÎ ÎÎÎÏÏÎ ÎÎÎ ÎÎ ÎÎÎÎÎÎÏÏÎÎÎ ÎÏÏÎ Î ÎÎÎÎÎÎÎÏÎÎ"
 
 #: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ÎÎÏÏÏÎÎÎÎ"
 
-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:895
+#: ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÏÎÎÏÏÎÏ ÎÎÎÏÎÎÏÎÎÏ '%s': %s"
@@ -1876,16 +1811,19 @@ msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÏÎÎÏÏÎÏ ÎÎÎÏÎÎ
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÎÎÏÎ ÎÎÏÏÎÏ ÏÎÎÏ ÎÎÎÏÎÎÏÎÏ ÎÏÏ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
+#: ../camel/camel-filter-driver.c:1139
+#: ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "ÎÏÎÏÏÎÎÎÏÎÏÏ ÏÎÎÎÎÏÎ"
 
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÏÏÎÏ ÏÎÎÏÏÎÏ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÎÏÎÏ ÏÎÎÏÏÎÏ: %s: %s"
@@ -1905,16 +1843,19 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÏÎÎÏÎÎÏ ÏÎÎÎÎÎÏ ÎÏÎÏÎÏÏ
 msgid "Getting message %d (%d%%)"
 msgstr "ÎÎÏÎ ÎÎÎÏÎÎÏÎÏ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1384
+#: ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎ ÎÎÎÏÎÎ %d"
 
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
+#: ../camel/camel-filter-driver.c:1421
+#: ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "ÎÏÎÏÏÎÎÎÏÎÏÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
+#: ../camel/camel-filter-driver.c:1426
+#: ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "ÎÎÎÎÎÎÏÏÎÎÎÎ"
 
@@ -1940,7 +1881,8 @@ msgstr "ÎÎÏÏÎ ÎÏÎÏÎÎÏÎ ÏÎ (system-flag)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÎÎÏÏÎ ÎÏÎÏÎÎÏÎ ÏÎ (user-tag)"
 
-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
+#: ../camel/camel-filter-search.c:939
+#: ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÎÏÎÎÎÎ ÏÏÎÎ ÎÎÏÎÎÎÏÎ ÎÎÎÎÎÏÎÏÎÏ ÏÎÎÏÏÎÏ: %s: %s"
@@ -1967,7 +1909,7 @@ msgstr[0] "ÎÎÎÏÏÎÏÎÏÎÎ ÎÎÎÏ ÎÎÎÏÎÎÏÎÏ ÏÎ '%s'"
 msgstr[1] "ÎÎÎÏÏÎÏÎÏÎÎ ÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÏÎ '%s'"
 
 #: ../camel/camel-folder.c:930
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ"
 
@@ -1980,19 +1922,30 @@ msgstr "ÎÎÏÎÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ"
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÎÎÎÏÎÏÎÏÎÎÏ ÏÎÏÏÏÏÏÏÎÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎÏÎÎ ÎÎÎ ÏÎ ÏÎÎÎÎÎ '%s'"
 
-#: ../camel/camel-folder.c:3595
+#: ../camel/camel-folder.c:3371
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Expunging folder '%s'"
+msgstr "ÎÎÎÎÏÎÏÎ ÏÎÎÎÎÎÏ '%s'"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
-#| msgid "Retrieving message '%s'"
 msgid "Retrieving message '%s' in %s"
 msgstr "ÎÎÎÎÏÎÏÎ ÎÎÎÏÎÎÏÎÏ '%s' ÏÎ %s"
 
-#: ../camel/camel-folder.c:3744
+#: ../camel/camel-folder.c:3753
 #, c-format
-#| msgid "Fetching summary information for new messages in %s"
 msgid "Retrieving quota information for '%s'"
 msgstr "ÎÎÎÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÏÏÏÏÏÎÏ ÎÎÎ '%s'"
 
-#: ../camel/camel-folder-search.c:414 ../camel/camel-folder-search.c:575
+#: ../camel/camel-folder.c:3985
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "ÎÎÎÎÎÏÏÎ ÏÎÎÎÎÎÏ '%s'"
+
+#: ../camel/camel-folder-search.c:417
+#: ../camel/camel-folder-search.c:581
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2001,7 +1954,8 @@ msgstr ""
 "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÏÎÏ ÎÎÏÏÎÏÎÏ ÎÎÎÎÎÏÎÏÎÏ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:426 ../camel/camel-folder-search.c:587
+#: ../camel/camel-folder-search.c:429
+#: ../camel/camel-folder-search.c:593
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2011,36 +1965,39 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:800 ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:811
+#: ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "ÎÎ (%s) ÎÏÎÎÏÎÎ ÎÎÎ ÎÎÎÎÎÎÎÏ ÎÏÎÏÎÎÎÏÎÎ ÎÏÎÏÎ"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:904
+#: ../camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "ÎÎ (%s) ÎÎÎ ÎÏÎÏÏÎÏÎÏÎÎ ÎÎÏÎ ÏÏÎ %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:928
+#: ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "ÎÎ (%s) ÎÏÎÎÏÎÎ ÏÏÎÎÎÎÎÏÎÎÏÎ ÏÏÏÎÏ ÏÎÎÏÎÎÏÎÎÏÎÏ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "ÎÎ (%s) ÏÎÏÎÎÎÎÎÎ ÎÎÎ ÏÎÎÎÎÎ ÏÏ ÎÏÎÏÎÎÎÏÎÎ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:957
+#: ../camel/camel-folder-search.c:974
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "ÎÎ (%s) ÎÏÎÎÏÎÎ ÏÎÎ ÎÏÎÏÎÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:663
+#: ../camel/camel-gpg-context.c:668
 #: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
@@ -2067,7 +2024,8 @@ msgstr ""
 msgid "Failed to parse gpg userid hint."
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ gpg ÏÏÎÎÎÏÎÎÏ id ÏÏÎÏÏÎ."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:794
+#: ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ gpg ÎÎÏÎÏÎÏ ÏÏÎÎÎÎÎÏÎÎÎÏ."
@@ -2096,15 +2054,11 @@ msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÎÎÎÏÎÎÏÎÏÎ ÎÎÏÎÎÎ ÎÏÏ GnuPG ÎÎÎ '%s'"
 
 #: ../camel/camel-gpg-context.c:850
-msgid ""
-"Note the encrypted content doesn't contain information about a recipient, "
-"thus there will be a password prompt for each of stored private key."
-msgstr ""
-"ÎÎÎÎÎÏÏÏÎ ÏÏÎ ÏÎ ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÎ ÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÏÎÏÎÎÏÎÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ "
-"ÏÎÏÎÎÎÏÏÎ, ÏÏÎÎÏÏÏ ÎÎ ÏÏÎÏÏÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎ ÎÏÎÎÎÎÏ ÎÎÎ ÎÎÎÎ ÎÏÎÎÎÎÎÏÎÎÎÎ "
-"ÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎ."
+msgid "Note the encrypted content doesn't contain information about a recipient, thus there will be a password prompt for each of stored private key."
+msgstr "ÎÎÎÎÎÏÏÏÎ ÏÏÎ ÏÎ ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÎ ÏÎÏÎÎÏÏÎÎÎÎ ÎÎÎ ÏÎÏÎÎÏÎÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÏÎÏÎÎÎÏÏÎ, ÏÏÎÎÏÏÏ ÎÎ ÏÏÎÏÏÎÎ ÎÎÎ ÏÏÎÏÏÎÏÎ ÎÏÎÎÎÎÏ ÎÎÎ ÎÎÎÎ ÎÏÎÎÎÎÎÏÎÎÎÎ ÎÎÎÏÏÎÎÏ ÎÎÎÎÎÎ."
 
-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:879
+#: ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:382
 #: ../libedataserver/e-client.c:140
@@ -2115,8 +2069,7 @@ msgstr "ÎÎÏÏÏÎÎÎÎ"
 #: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
-"ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÎÎÏÎÎÏÎÏ ÎÏÏÏÎÎÎÏ ÎÎÎÎÎÎÎÏ: ÎÏÎÎÎÎÎ 3 ÎÏÏÎÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÎ."
+msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÎÎÏÎÎÏÎÏ ÎÏÏÏÎÎÎÏ ÎÎÎÎÎÎÎÏ: ÎÏÎÎÎÎÎ 3 ÎÏÏÎÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÎ."
 
 #: ../camel/camel-gpg-context.c:913
 #, c-format
@@ -2128,19 +2081,26 @@ msgstr "ÎÎÎÏÎÎÏÎÏÎ ÎÏÎÎÏÎÏÎ ÎÏÏ GnuPG: %s"
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÏÏÏÎÎÏÎÏÎÏÎÏ: ÎÎÎ ÎÏÎÏÎ ÎÏÎÏÏÎÎ ÎÎÎÏÏÎÎ ÏÎÏÎÎÎÏÏÎÏ."
 
-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1591
+#: ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎ ÏÏÎÎÏÎÏÎÏ: "
 
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
+#: ../camel/camel-gpg-context.c:1640
+#: ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201
+#: ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÎÏÎÏ gpg."
 
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-gpg-context.c:1719
+#: ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735
+#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:971
 #: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
@@ -2158,7 +2118,8 @@ msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎÎÎ ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÏÎ
 msgid "This is a digitally encrypted message part"
 msgstr "ÎÏÏÏ ÏÎ ÎÎÏÎÏ ÏÎÏ ÎÎÎÏÎÎÏÎÏ ÎÎÎÎÎ ÏÎÏÎÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÎÎ"
 
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2031
+#: ../camel/camel-gpg-context.c:2040
 #: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
@@ -2169,7 +2130,8 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÏÏÏÏÎÎÏÎÏÎÏÎÏ ÎÎÎÏÎÎÏÎÏ:
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÎÏÏÏÏÎÎÏÎÏÎÏÎÏ ÏÎÎÎÎÏÎÏ MIME: ÏÏÎÎÎÎ ÏÏÏÏÎÎÏÎÎÎÏ"
 
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+#: ../camel/camel-gpg-context.c:2142
+#: ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÎ ÏÎÏÎÎÏÏÎÎÎÎ"
 
@@ -2185,204 +2147,185 @@ msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÏÏÎÎÎ ÎÏÏÏÎÏ ÎÎÎÎÎÏ ÎÎÎ
 
 #: ../camel/camel-imapx-folder.c:791
 #: ../camel/providers/imap/camel-imap-folder.c:359
-#: ../camel/providers/nntp/camel-nntp-folder.c:731
-#| msgid "Cannot copy messages to the Trash folder"
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
 msgid "Apply message _filters to this folder"
 msgstr "ÎÏÎÏÎÎÎÎ ÎÎÎÏÎÎÏÎÏ _ÏÎÎÏÏÏÎ ÏÎ ÎÏÏÏÎ ÏÎÎ ÏÎÎÎÎÎ"
 
-#: ../camel/camel-imapx-server.c:855
-#| msgid "Server unexpectedly disconnected"
+#: ../camel/camel-imapx-server.c:1035
 msgid "Server disconnected"
 msgstr "Î ÎÎÏÏÎÏÎÏÎÏÎÏ ÎÏÎÏÏÎÎÎÎÎÎÎ"
 
-#: ../camel/camel-imapx-server.c:1264
+#: ../camel/camel-imapx-server.c:1487
 msgid "Error writing to cache stream: "
 msgstr "ÎÏÎÎÎÎ ÎÎÎÏÎÏÎÏ ÏÏÎÎ ÏÎÎ ÎÏÏÏÎÏ ÎÎÎÎÎÏ: "
 
-#: ../camel/camel-imapx-server.c:1997
+#: ../camel/camel-imapx-server.c:2416
 #, c-format
 msgid "Not authenticated"
 msgstr "ÎÎÎ ÏÎÏÏÎÏÎÎÎÎÎÎÎ"
 
-#: ../camel/camel-imapx-server.c:2066
-#| msgid "Error performing search"
+#: ../camel/camel-imapx-server.c:2485
 msgid "Error performing IDLE"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÎÏÎÏ IDLE"
 
-#: ../camel/camel-imapx-server.c:2910
+#: ../camel/camel-imapx-server.c:3329
 #: ../camel/providers/imap/camel-imap-store.c:409
 #: ../camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP %s ÏÎ ÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎÎÎ: %s"
 
-#: ../camel/camel-imapx-server.c:2911
+#: ../camel/camel-imapx-server.c:3330
 #: ../camel/providers/imap/camel-imap-store.c:410
 #: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "STARTTLS not supported"
 msgstr "ÎÎ STARTTLS ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ"
 
-#: ../camel/camel-imapx-server.c:2950
+#: ../camel/camel-imapx-server.c:3369
 #: ../camel/providers/imap/camel-imap-store.c:435
 #, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP %s ÏÎ ÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎÎÎ: "
 
-#: ../camel/camel-imapx-server.c:3017
+#: ../camel/camel-imapx-server.c:3436
 #: ../camel/providers/imap/camel-imap-store.c:734
 #, c-format
-#| msgid "IMAP server %s does not support requested authentication type %s"
 msgid "IMAP server %s does not support %s authentication"
 msgstr "Î ÎÎÏÏÎÏÎÏÎÏÎÏ IMAP %s ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ %s"
 
-#: ../camel/camel-imapx-server.c:3028 ../camel/camel-session.c:483
+#: ../camel/camel-imapx-server.c:3447
+#: ../camel/camel-session.c:486
 #: ../camel/providers/imap/camel-imap-store.c:1150
 #: ../camel/providers/pop3/camel-pop3-store.c:249
 #: ../camel/providers/pop3/camel-pop3-store.c:568
 #: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
-#| msgid "No support for authentication type %s"
 msgid "No support for %s authentication"
 msgstr "ÎÏÏÎÏ ÏÏÎÏÏÎÏÎÎÎ ÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎ %s"
 
-#: ../camel/camel-imapx-server.c:3047
+#: ../camel/camel-imapx-server.c:3466
 #: ../camel/providers/imap/camel-imap-store.c:1118
 #: ../camel/providers/nntp/camel-nntp-store.c:494
-#| msgid "Cannot authenticate to server: %s"
 msgid "Cannot authenticate without a username"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎÏ ÏÏÏÎÏ ÏÎÎÎÎ ÏÏÎÏÏÎ"
 
-#: ../camel/camel-imapx-server.c:3056
+#: ../camel/camel-imapx-server.c:3475
 #: ../camel/providers/imap/camel-imap-store.c:1126
 #: ../camel/providers/nntp/camel-nntp-store.c:503
 #: ../camel/providers/pop3/camel-pop3-store.c:493
 #: ../camel/providers/pop3/camel-pop3-store.c:513
-#| msgid "Authentication Failed"
 msgid "Authentication password not available"
 msgstr "Î ÎÏÎÎÎÏÏ ÏÎÏÏÎÏÎÎÎÏÎÏ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÏ"
 
-#: ../camel/camel-imapx-server.c:3246
-#| msgid "Encrypting message"
+#: ../camel/camel-imapx-server.c:3665
 msgid "Error fetching message"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÏÎÏÎÏ ÎÎÎÏÎÎÏÎÏ"
 
-#: ../camel/camel-imapx-server.c:3328
-#| msgid "Failed to cache %s: "
+#: ../camel/camel-imapx-server.c:3747
 msgid "Failed to copy the tmp file"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÏÎÏÎÏ ÏÎÏ ÎÏÏÎÎÎÏ tmp"
 
-#: ../camel/camel-imapx-server.c:3342
-#| msgid "Failed to encode data"
+#: ../camel/camel-imapx-server.c:3761
 msgid "Failed to close the tmp stream"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÎÎÎÏÎÏ ÏÎÏ ÏÎÎÏ tmp"
 
-#: ../camel/camel-imapx-server.c:3440
-#| msgid "Copying messages"
+#: ../camel/camel-imapx-server.c:3859
 msgid "Error copying messages"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÎÎÎÏÎÎÏÏÎ"
 
-#: ../camel/camel-imapx-server.c:3575
-#| msgid "Sending message"
+#: ../camel/camel-imapx-server.c:3994
 msgid "Error appending message"
 msgstr "ÎÏÎÎÎÎ ÏÏÎÏÎÏÏÎÏÎÏ ÎÎÎÏÎÎÏÎÏ"
 
-#: ../camel/camel-imapx-server.c:3762
+#: ../camel/camel-imapx-server.c:4181
 msgid "Error fetching message headers"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÏÎÏÎÏ ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÏÎÏ"
 
-#: ../camel/camel-imapx-server.c:3908
-#| msgid "Retrieving message '%s'"
+#: ../camel/camel-imapx-server.c:4320
 msgid "Error retrieving message"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÏÎÏÎÏ ÎÎÎÏÎÎÏÎÏ"
 
-#: ../camel/camel-imapx-server.c:4030 ../camel/camel-imapx-server.c:4235
-#: ../camel/providers/imap/camel-imap-folder.c:4005
-#: ../camel/providers/imap/camel-imap-folder.c:4085
+#: ../camel/camel-imapx-server.c:4442
+#: ../camel/camel-imapx-server.c:4642
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ %s"
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ '%s'"
 
-#: ../camel/camel-imapx-server.c:4089
-#: ../camel/providers/imap/camel-imap-folder.c:1127
+#: ../camel/camel-imapx-server.c:4495
 #, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "ÎÎÏÏÏÎ ÎÎÎ ÎÎÎÎÎÎÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ %s"
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "ÎÎÏÏÏÎ ÎÎÎ ÎÎÎÎÎÎÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ '%s'"
 
-#: ../camel/camel-imapx-server.c:4131
-#| msgid "Checking for new messages"
+#: ../camel/camel-imapx-server.c:4538
 msgid "Error fetching new messages"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÏÎÏÎÏ ÎÎÏÎ ÎÎÎÏÎÎÏÏÎ"
 
-#: ../camel/camel-imapx-server.c:4330
-#| msgid "Verifying message"
+#: ../camel/camel-imapx-server.c:4738
 msgid "Error while fetching messages"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎ ÏÎ ÎÎÏÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ"
 
-#: ../camel/camel-imapx-server.c:4338 ../camel/camel-imapx-server.c:4370
+#: ../camel/camel-imapx-server.c:4746
+#: ../camel/camel-imapx-server.c:4782
 #, c-format
-#| msgid "Fetching summary information for new messages in %s"
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ %d ÎÎÎÏÎÎ ÏÏÎ %s"
-msgstr[1] "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ %d ÎÎÎÏÎÎÏÎ ÏÏÎ %s"
+#| msgid "Fetching summary information for %d message in %s"
+#| msgid_plural "Fetching summary information for %d messages in %s"
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ %d ÎÎÎÏÎÎ ÏÏÎ '%s'"
+msgstr[1] "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ %d ÎÎÎÏÎÎÏÎ ÏÏÎ '%s'"
 
-#: ../camel/camel-imapx-server.c:4495 ../camel/camel-imapx-server.c:4531
-#| msgid "Error performing search"
+#: ../camel/camel-imapx-server.c:4909
+#: ../camel/camel-imapx-server.c:4945
 msgid "Error refreshing folder"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÎÏÏÎÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-imapx-server.c:4624
-#| msgid "Expunging old messages"
+#: ../camel/camel-imapx-server.c:5038
 msgid "Error expunging message"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÏÎÏÎÏ ÎÎÎÏÎÎÏÎÏ"
 
-#: ../camel/camel-imapx-server.c:4713
-#| msgid "Storing folder"
+#: ../camel/camel-imapx-server.c:5135
 msgid "Error fetching folders"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÏÎÏÎÏ ÏÎÎÎÎÏÎ"
 
-#: ../camel/camel-imapx-server.c:4792
-#| msgid "_Show only subscribed folders"
+#: ../camel/camel-imapx-server.c:5214
 msgid "Error subscribing to folder"
 msgstr "ÎÏÎÎÎÎ ÏÏÎÎÏÎÎÎÏ ÏÏÎÎ ÏÎÎÎÎÎ"
 
-#: ../camel/camel-imapx-server.c:4849
-#| msgid "Storing folder"
+#: ../camel/camel-imapx-server.c:5271
 msgid "Error creating folder"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-imapx-server.c:4898
-#| msgid "Storing folder"
+#: ../camel/camel-imapx-server.c:5320
 msgid "Error deleting folder"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎ ÏÎ ÎÎÎÎÏÎÏÎ ÏÎÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-imapx-server.c:4952
-#| msgid "Storing folder"
+#: ../camel/camel-imapx-server.c:5374
 msgid "Error renaming folder"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ"
 
-#: ../camel/camel-imapx-server.c:5007
-#| msgid "Error performing search"
+#: ../camel/camel-imapx-server.c:5429
 msgid "Error performing NOOP"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÎÏÎÏ NOOP"
 
-#: ../camel/camel-imapx-server.c:5105
+#: ../camel/camel-imapx-server.c:5527
 msgid "Error syncing changes"
 msgstr "ÎÏÎÎÎÎ ÏÏÎÏÏÎÎÎÏÎÎÏ ÎÎÎÎÎÏÎ"
 
-#: ../camel/camel-imapx-server.c:5716
-#: ../camel/providers/imap/camel-imap-folder.c:3473
+#: ../camel/camel-imapx-server.c:6157
+#: ../camel/providers/imap/camel-imap-folder.c:3482
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÎÎÎÏÎÎÏÎÏ ÎÎ ID ÎÎÎÏÎÎÏÎÏ %s: %s"
 
-#: ../camel/camel-imapx-server.c:5717
-#: ../camel/providers/imap/camel-imap-folder.c:3474
+#: ../camel/camel-imapx-server.c:6158
+#: ../camel/providers/imap/camel-imap-folder.c:3483
 msgid "No such message available."
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÏÎÎ ÎÎÎÎÎÏÎÎÎ."
 
-#: ../camel/camel-imapx-server.c:5872 ../camel/camel-imapx-server.c:5887
+#: ../camel/camel-imapx-server.c:6313
+#: ../camel/camel-imapx-server.c:6328
 msgid "Cannot create spool file: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÎÏÏÎÎÎÏ ÎÏÎÏÎÏÏÎÎÎÏÎÎÏ: "
 
@@ -2408,22 +2351,21 @@ msgstr "ÎÏÎÎÎÏÏ ÏÏÏÏÎÎÏÎÏ"
 #: ../camel/camel-imapx-store.c:251
 #: ../camel/providers/imap/camel-imap-provider.c:100
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Î ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÎÏ ÏÏÎÎÎÏÎÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP ÎÎ ÏÏÎÏÎ ÎÏÎÎÎÎÏ "
-"ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ."
+msgstr "Î ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÎÏ ÏÏÎÎÎÏÎÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP ÎÎ ÏÏÎÏÎ ÎÏÎÎÎÎÏ ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ."
 
 #: ../camel/camel-imapx-store.c:342
 #: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2227
+#: ../camel/providers/imap/camel-imap-store.c:2229
 #, c-format
 msgid "No such folder %s"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎÏ ÏÎÎÎÎÎÏ %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:367 ../camel/camel-imapx-store.c:838
+#: ../camel/camel-imapx-store.c:367
+#: ../camel/camel-imapx-store.c:838
 #: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2640
-#: ../camel/providers/local/camel-maildir-folder.c:474
+#: ../camel/providers/imap/camel-imap-store.c:2642
+#: ../camel/providers/local/camel-maildir-folder.c:473
 #: ../camel/providers/local/camel-maildir-store.c:301
 #: ../camel/providers/local/camel-maildir-store.c:679
 #: ../camel/providers/local/camel-maildir-store.c:685
@@ -2432,35 +2374,33 @@ msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎÏ ÏÎÎÎÎÎÏ %s"
 msgid "Inbox"
 msgstr "ÎÎÏÎÏÏÏÎÎÎÎ"
 
-#: ../camel/camel-imapx-store.c:1070
+#: ../camel/camel-imapx-store.c:1071
 #, c-format
-#| msgid "Retrieving message '%s'"
 msgid "Retrieving folder list for %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÏÎÏ ÏÎÎÎÎÎÏ ÎÎÎ ÏÎ %s"
 
-#: ../camel/camel-imapx-store.c:1171
+#: ../camel/camel-imapx-store.c:1172
 #: ../camel/providers/nntp/camel-nntp-store.c:1749
 #, c-format
 msgid "No such folder: %s"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎÏ ÏÎÎÎÎÎÏ: %s"
 
-#: ../camel/camel-imapx-store.c:1384
+#: ../camel/camel-imapx-store.c:1385
 #: ../camel/providers/imap/camel-imap-store.c:2046
-#: ../camel/providers/imap/camel-imap-store.c:2484
+#: ../camel/providers/imap/camel-imap-store.c:2486
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ÎÎ ÏÎÎÎÎ ÏÎÎÎÎÎÏ \"%s\" ÎÎÎÎÎ ÎÎÏÏÎ ÎÏÎÎÎÎ ÏÎÏÎÎÏÎÎ ÏÎÎ ÏÎÏÎÎÏÎÏÎ \"%c\""
 
-#: ../camel/camel-imapx-store.c:1395
-#: ../camel/providers/imap/camel-imap-store.c:2497
+#: ../camel/camel-imapx-store.c:1396
+#: ../camel/providers/imap/camel-imap-store.c:2499
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÎÎÎÏÏÏÎÏ ÎÎÎÏÎ ÏÎÎÎÎÎÏ: %s"
 
-#: ../camel/camel-imapx-store.c:1405
+#: ../camel/camel-imapx-store.c:1406
 #: ../camel/providers/imap/camel-imap-store.c:2109
-#: ../camel/providers/imap/camel-imap-store.c:2548
+#: ../camel/providers/imap/camel-imap-store.c:2550
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Î ÎÎÎÏÎ ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÏÏÎÏÎÏÎÎ ÎÎ ÏÎÏÎÎÏÎÎ ÏÏÎÏÎÎÎÎÎÏÏ"
@@ -2505,7 +2445,8 @@ msgstr "ÎÎÏÎÎÏÎ Î ÎÎÏÎÏÎÎÏÎ ÏÏÎÎÎÏÏÎÏ ÎÎÎÎÎÏ Î
 msgid "Cannot fork locking helper: %s"
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÎÎÎÏÏÎ ÎÎÎÎÎÏ ÎÎÎÎÎÏÎÎÏÏÎ: %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:211
+#: ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÎÎÏÎÏ ÏÎÏ '%s': ÏÏÎÎÎÎ ÏÏÏÏÎÎÏÎÎÎÏ ÎÎ ÎÎÎÎÏ ÎÎÎÎÎÏÎÎÏÏÎ"
@@ -2564,7 +2505,8 @@ msgstr "ÎÏÎÎÎÎ ÎÎÎÎÎÏÏÎÏ ÏÎÏ ÎÏÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎ
 msgid "Error writing mail temp file: %s"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÏÎÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÏÎ ÏÏÏÏÎÎÏÎ ÎÏÏÎÎÎ: %s"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:491
+#: ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ÎÏÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÏÎ ÏÏÏÏÎÎÏÎ ÎÏÏÎÎÎ: %s"
@@ -2616,12 +2558,13 @@ msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÎÏÎÏ ÎÎÏÎÎÏÎÏ: %s"
 msgid "Could not connect to %s: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÎÎÏÎ ÏÏÎ %s: "
 
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:207
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÎÏÎÏÏÎÎÎÏÎÏÏ ÎÎÎÏÎÎÏÏÎ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÎÎÏÎÎ"
 
-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145
+#: ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÏÏÎÏ ÏÏÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ ÎÎÎ ÏÎ ÏÎÎÎÎÎ '%s': %s"
@@ -2637,9 +2580,7 @@ msgstr "ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÏ ÎÏÏÏ
 #: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÎÏ %s: Î ÏÏÏÏÏÏÎ ÎÏÎÏÏÎÎÏÏÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ Ï' ÎÏÏÏ ÏÎ "
-"ÏÏÏÏÎÎÎ."
+msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÎÏ %s: Î ÏÏÏÏÏÏÎ ÎÏÎÏÏÎÎÏÏÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ Ï' ÎÏÏÏ ÏÎ ÏÏÏÏÎÎÎ."
 
 #: ../camel/camel-provider.c:202
 #, c-format
@@ -2651,7 +2592,8 @@ msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÎÏ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÎÏ %s: ÎÏÏÎÏ ÎÏÎÎÎÎ ÎÏÏÎÎÎÏÎÎÎÏÎÏ ÏÏÎ ÎÏÎÏÏÎÎ."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:395
+#: ../camel/camel-provider.c:410
+#: ../camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÎÏÏÎÏ ÎÎÎÎÎÏÎÎÎ ÏÎÏÎÏÎ ÎÎÎ ÏÎ ÏÏÏÏÏÎÎÎÎÎ '%s'"
@@ -2701,24 +2643,16 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: ../camel/camel-sasl-cram-md5.c:48
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏ CRAM-MD5, "
-"ÎÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎÏÎÏÎÏ."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏ CRAM-MD5, ÎÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎÏÎÏÎÏ."
 
 #: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: ../camel/camel-sasl-digest-md5.c:61
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏ DIGEST-"
-"MD5, ÎÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎÏÎÏÎÏ."
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÏÏÎÎÎ ÎÏÎÎÎÏ DIGEST-MD5, ÎÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÎ Î ÎÎÏÏÎÏÎÏÎÏÎÏ."
 
 #: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
@@ -2733,8 +2667,7 @@ msgstr "ÎÎÏÏÎ ÏÏÎÎÎÎÎÏÎÎÏ ÎÎÏÏÎÏÎÏÎÏÎ\n"
 #: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr ""
-"ÎÎ ÏÏÎÎÎÎÎÏÎÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏÎ ÏÎÏÎÎÏÎÎ ÎÎÏÏÎ ÎÎÏÏÏÎÎ \"ÏÎÎÏÏÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ\""
+msgstr "ÎÎ ÏÏÎÎÎÎÎÏÎÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏÎ ÏÎÏÎÎÏÎÎ ÎÎÏÏÎ ÎÎÏÏÏÎÎ \"ÏÎÎÏÏÎÏÎÏ ÏÏÎÏÏÎÏÎÎÏ\""
 
 #: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
@@ -2757,57 +2690,35 @@ msgstr "GSSAPI"
 
 #: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ "
-"Kerberos 5."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ Kerberos 5."
 
 #: ../camel/camel-sasl-gssapi.c:134
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"Î ÎÎÎÎÏÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎÏÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ ÎÏÏ ÏÎ ÏÎÏÎÏÏÎÎÎÎ "
-"ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ, Î ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏÎÎ ÏÏÎÎ ÎÏÎÏÎÎÎÎ ÏÎÏ."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgstr "Î ÎÎÎÎÏÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎÏÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÏÎÎ ÎÏÏ ÏÎ ÏÎÏÎÏÏÎÎÎÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ, Î ÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏÎÎ ÏÏÎÎ ÎÏÎÏÎÎÎÎ ÏÎÏ."
 
 #: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Î ÏÎÏÎÏÏÎÎÎÎ ÏÎÏÎÎÎÏÏÎÏ target_name ÎÎÎÎÎ ÎÎÎÎÎÎÎÏÏÏÏÎÎÎÎ."
 
 #: ../camel/camel-sasl-gssapi.c:142
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"Î ÏÎÏÎÏÏÎÎÎÎ ÏÎÏÎÎÎÏÏÎÏ target_name ÏÎÏÎÎÎÏÎ ÎÎÎ ÎÎÏÏÎ Î ÎÎÏÏÎÏÏÎÏÎÎÏÎ ÏÏÏÎ "
-"ÎÎÏÎÎÏÎÏ."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "Î ÏÎÏÎÏÏÎÎÎÎ ÏÎÏÎÎÎÏÏÎÏ target_name ÏÎÏÎÎÎÏÎ ÎÎÎ ÎÎÏÏÎ Î ÎÎÏÏÎÏÏÎÏÎÎÏÎ ÏÏÏÎ ÎÎÏÎÎÏÎÏ."
 
 #: ../camel/camel-sasl-gssapi.c:146
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"ÎÎ input_token ÏÎÏÎÎÏÎÎ ÎÎÎÏÎÏÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÏ ÎÎÎÎÎÎÎÏ ÎÏÏ ÎÎÎÎÎÎÏ ÏÎÏ "
-"ÎÎÎÎÏÎÎÎÎÏÎÎ ÎÎÏÏ ÏÎÏ ÏÎÏÎÎÎÏÏÎÏ input_chan_bindings."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgstr "ÎÎ input_token ÏÎÏÎÎÏÎÎ ÎÎÎÏÎÏÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÏ ÎÎÎÎÎÎÎÏ ÎÏÏ ÎÎÎÎÎÎÏ ÏÎÏ ÎÎÎÎÏÎÎÎÎÏÎÎ ÎÎÏÏ ÏÎÏ ÏÎÏÎÎÎÏÏÎÏ input_chan_bindings."
 
 #: ../camel/camel-sasl-gssapi.c:151
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"ÎÎ input_token ÏÎÏÎÎÏÎÎ ÎÎÎ ÎÎÏÏÎ ÏÏÎÎÏÎÏÎ, Î ÎÎÎ ÎÎÎÏÎÎÎÎÎÎÏÏÎ ÏÏÎÎÏÎÏÎ."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "ÎÎ input_token ÏÎÏÎÎÏÎÎ ÎÎÎ ÎÎÏÏÎ ÏÏÎÎÏÎÏÎ, Î ÎÎÎ ÎÎÎÏÎÎÎÎÎÎÏÏÎ ÏÏÎÎÏÎÏÎ."
 
 #: ../camel/camel-sasl-gssapi.c:155
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"ÎÎ ÏÎÏÎÏÏÎÎÎÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ ÎÎÎ ÎÏÎÎ ÎÎÎÏÏÎ ÎÎÎ ÎÏÏÎÎÎÏÎÎÎÏÎ ÏÎÏÎÎÏÎÎÎÎÎÏ, "
-"Î Î ÏÎÎÏÎÏÎÏÏ ÎÎÎÏÎÏÏÎÏÏÎÏÎÏÎ ÎÎÎ ÎÎÎÏÎÏÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgstr "ÎÎ ÏÎÏÎÏÏÎÎÎÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ ÎÎÎ ÎÏÎÎ ÎÎÎÏÏÎ ÎÎÎ ÎÏÏÎÎÎÏÎÎÎÏÎ ÏÎÏÎÎÏÎÎÎÎÎÏ, Î Î ÏÎÎÏÎÏÎÏÏ ÎÎÎÏÎÏÏÎÏÏÎÏÎÏÎ ÎÎÎ ÎÎÎÏÎÏÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ."
 
 #: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"ÎÎ ÏÎÏÎÏÏÎÎÎÎ ÏÎÎÏÎÏÏÎÏÎÎ ÏÎÏÎÎÏÎÎÎÎÎÏ ÎÎÎ ÎÎÎÏÎÏÎÏÎÎ ÏÎ ÎÎÎÏÏÎ ÏÎÏÎÎÏÏÎÎÎÎ."
+msgstr "ÎÎ ÏÎÏÎÏÏÎÎÎÎ ÏÎÎÏÎÏÏÎÏÎÎ ÏÎÏÎÎÏÎÎÎÎÎÏ ÎÎÎ ÎÎÎÏÎÏÎÏÎÎ ÏÎ ÎÎÎÏÏÎ ÏÎÏÎÎÏÏÎÎÎÎ."
 
 #: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
@@ -2821,8 +2732,10 @@ msgstr "ÎÎ ÎÎÎÎÏÎÎ ÏÏÎÎÏÎÎÎÏ ÏÎÏ ÎÎÎÎÎÎ ÏÏÎ ÎÎÎ
 msgid "The referenced credentials have expired."
 msgstr "ÎÎ ÎÎÎÏÎÏÏÎÎÎÎ ÎÎÎÏÎÏÏÎÏÏÎÏÎÎ ÎÏÎÏÎ ÎÎÎÎÎ."
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
-#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/camel-sasl-gssapi.c:175
+#: ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381
+#: ../camel/camel-sasl-gssapi.c:398
 #: ../camel/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
@@ -2837,11 +2750,10 @@ msgstr "ÎÎÏÏÎÏÏÎÏÎÎÏÎ ÏÏÏÏÏÎ ÎÏÏÎÎÎÎÎÏ."
 msgid "Login"
 msgstr "ÎÏÎÎÎÏÎ"
 
-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:42
+#: ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÏÏÎÏÎ ÎÎÏÏ ÎÏÎÎÏ "
-"ÎÏÎÎÎÎÏ."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÎÎÎÎÎ ÏÏÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÏÏÎÏÎ ÎÎÏÏ ÎÏÎÎÏ ÎÏÎÎÎÎÏ."
 
 #: ../camel/camel-sasl-login.c:107
 #, c-format
@@ -2853,12 +2765,8 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: ../camel/camel-sasl-ntlm.c:49
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÎ ÎÎÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÎÏÎ ÏÎ Windows ÎÎ "
-"ÏÎ ÏÏÎÏÎ NTLM / ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÎÏÏÎÎÎÏÏ ÎÏÎÎÎÎÏ."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÎ ÎÎÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎ ÎÎÏÎ ÏÎ Windows ÎÎ ÏÎ ÏÏÎÏÎ NTLM / ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÎÏÏÎÎÎÏÏ ÎÏÎÎÎÎÏ."
 
 #: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
@@ -2870,12 +2778,9 @@ msgstr "POP ÏÏÎÎ ÎÏÏ SMTP"
 
 #: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎÎÏÏÎÎÎÎÏÎÎÏÎÎ ÏÏÏÏÎ Î ÏÏÎÎÎÏÎ POP ÏÏÎÎ ÎÏÏ ÏÎÎ "
-"ÏÏÎÏÏÎÎÎÎÎ SMTP"
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎÎÏÏÎÎÎÎÏÎÎÏÎÎ ÏÏÏÏÎ Î ÏÏÎÎÎÏÎ POP ÏÏÎÎ ÎÏÏ ÏÎÎ ÏÏÎÏÏÎÎÎÎÎ SMTP"
 
 #: ../camel/camel-sasl-popb4smtp.c:84
-#| msgid "POP Source URI"
 msgid "POP Source UID"
 msgstr "UID ÏÎÎÎÏ POP"
 
@@ -2884,9 +2789,9 @@ msgstr "UID ÏÎÎÎÏ POP"
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ÎÎÏÏÎÏÎÎÎÏÎ POP ÏÏÎÎ ÏÎÎ SMTP ÏÏÎÏÎÎÎÏÎÎÏÎÏÎÏ ÎÎÎ ÎÎÎÏÏÏÎ ÎÎÏÎÏÎÏÎ"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#: ../camel/camel-sasl-popb4smtp.c:108
+#: ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
-#| msgid "POP Before SMTP authentication using a non-POP source"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ÎÏÎÏÏÎÎÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎÏ POP ÏÏÎÎ ÏÎÎ SMTP ÎÎ ÎÎÎ ÏÏÎÏÎÏÎÎ %s"
 
@@ -2895,25 +2800,23 @@ msgstr "ÎÏÎÏÏÎÎÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎÏ POP ÏÏÎÎ ÏÎÎ SMTP 
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÎÏÏÏÎÏÎÏ ÎÎÎÎÎÎÎÎÏ ÎÎÏÏÎÏÎÏ: %s: %s"
 
-#: ../camel/camel-session.c:404
+#: ../camel/camel-session.c:407
 #, c-format
-#| msgid "No provider available for protocol '%s'"
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÎÎÏÏÎÏ GType ÎÎÏÎÏÏÏÎÎÎÎÎÏ ÎÎÎ ÏÎ ÏÏÏÏÏÎÎÎÎÎ '%s'"
 
-#: ../camel/camel-session.c:498
+#: ../camel/camel-session.c:501
 #, c-format
-#| msgid "Authentication failed"
 msgid "%s authentication failed"
 msgstr "Î ÏÎÏÏÎÏÎÎÎÏÎ %s ÎÏÎÏÏÏÎ"
 
-#: ../camel/camel-session.c:1236
+#: ../camel/camel-session.c:1239
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr ""
-"ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ %s ÎÎÎ ÏÎ %s ÏÏÎÎ ÎÎÎÎÎÎÏÏÏÏÎ %s."
+msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ %s ÎÎÎ ÏÎ %s ÏÏÎÎ ÎÎÎÎÎÎÏÏÏÏÎ %s."
 
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:351
+#: ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÎÎÎ '%s'"
@@ -2946,7 +2849,8 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ ÎÎÏÏÎ
 msgid "Cannot add CMS Signing time"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÎÏ ÏÏÏÎÎÏ ÏÏÎÎÏÎÏÎÏ CMS"
 
-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:439
+#: ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ ÎÏÏÏÏÎÎÏÎÏÎÏÎÏ ÎÎÎ ÏÎ '%s' ÎÎÎ ÏÏÎÏÏÎÎ"
@@ -3016,30 +2920,30 @@ msgstr "ÎÎÎ ÏÏÎÏÏÎÏÎ ÏÏÎÎÎÎÏÎÎÎÎÎÎ ÎÎÎÎÎÎÎÎ ÏÏ
 msgid "Digests missing from enveloped data"
 msgstr "ÎÎÎÏÎÏÎ ÏÎÏÎÎÎÏÎÎÏ ÎÏÏ ÏÎ ÏÎÏÎÎÎÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎ"
 
-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:591
+#: ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÎÎÎÎÏÎÎÏ ÏÎÏÎÎÎÏÎÏÎ"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÏÎÎÏ ÎÎÎÏÎÎÏÎÏ ÏÎÏÎÎÎÏÎÏÎ"
 
-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÏÎÎÏÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÎÎÏ"
 
 #: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr ""
-"ÎÎÎÏÎÎ ÏÎÏ ÏÎÏÎÎÏÎÎ ÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ, ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÏÎÎÎÎÎÎÏÏÎÎ "
-"ÏÎÏÏÎÏÎÎÎÏÎÎÎ"
+msgstr "ÎÎÎÏÎÎ ÏÎÏ ÏÎÏÎÎÏÎÎ ÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ, ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÎÏÎÎÎÎÎÎÏÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÎ"
 
 #: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr ""
-"ÎÎÎÏÎÎ ÎÏÎÎ ÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ, ÏÎ ÏÎÏÏÎÏÎÎÎÏÎÎÎ ÎÎÏÎÏÎÎÏÎÎ ÎÎÎ ÎÏÎÎÎÎÎÎÏÎÎÎÎÎ"
+msgstr "ÎÎÎÏÎÎ ÎÏÎÎ ÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ, ÏÎ ÏÎÏÏÎÏÎÎÎÏÎÎÎ ÎÎÏÎÏÎÎÏÎÎ ÎÎÎ ÎÏÎÎÎÎÎÎÏÎÎÎÎÎ"
 
 #: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
@@ -3050,7 +2954,8 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÏÎÎÏÎÏÎÏ ÏÎÏÎÎÎÏÎÏÎ"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÎÏÎÎÏÎÏÏÎ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:842
+#: ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏÎÎÏÎÎÎÎÎÏ ÎÏÎÎÎÎÏÎÎÎÏÎ"
 
@@ -3058,11 +2963,13 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏÎÎÏÎÎÎÎÎÏ ÎÏÎ
 msgid "Failed to add data to CMS encoder"
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÏÎÎÎÎÏ ÎÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÏÎÎÎÎÏÎÎÎÏÎ CMS"
 
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:853
+#: ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÎÎÎÏÎÎÎÏÎÏ ÎÎÎÎÎÎÎÏÎ"
 
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÎÎÏÎÎÎÎÏÎÎÎÏÎ"
 
@@ -3113,24 +3020,24 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ '%s': Î 
 
 #: ../camel/camel-store.c:1881
 #, c-format
-#| msgid "Syncing folders"
 msgid "Opening folder '%s'"
 msgstr "ÎÎÎÎÎÎÎ ÏÎÎÎÎÎÏ '%s'"
 
 #: ../camel/camel-store.c:2066
 #, c-format
-#| msgid "Scanning for changed messages in %s"
 msgid "Scanning folders in '%s'"
 msgstr "ÎÎÏÏÏÎ ÏÎÎÎÎÏÎ ÏÏÎ '%s'"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
+#: ../camel/camel-store.c:2078
+#: ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÎÏÎÏÏÎÎÎÎÏÎ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
+#: ../camel/camel-store.c:2081
+#: ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÎÎÎÏÎÎÏÎÎÏÎ"
@@ -3142,17 +3049,18 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ %s: Î ÏÎÎÎÎ
 
 #: ../camel/camel-store.c:2554
 #, c-format
-#| msgid "Cannot get folder '%s': %s"
 msgid "Creating folder '%s'"
 msgstr "ÎÎÎÎÎÏÏÎÎÎ ÏÎÎÎÎÎÏ '%s'"
 
-#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2672
+#: ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÎÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ: %s: ÎÎÏÏÎ ÎÎÎÏÎÏÏÎÎÎ"
 
-#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/camel-store.c:2815
+#: ../camel/camel-vee-store.c:460
 #: ../camel/providers/local/camel-maildir-store.c:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3176,12 +3084,25 @@ msgstr "Î ÏÏÎÎÎÏÎ ÎÎÏÏÏÎÎÎÎ"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÎÎÎ \"%s\": %s"
 
+#: ../camel/camel-subscribable.c:386
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Subscribing to folder '%s'"
+msgstr "ÎÏÎÎÏÎÎÎ ÏÏÎ ÏÎÎÎÎÎ '%s'"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+#| msgid "Error subscribing to folder"
+msgid "Unsubscribing from folder '%s'"
+msgstr "ÎÎÏÎÏÎÎÏÎ ÏÏÎÎÏÎÎÎÏ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s'"
+
 #: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "ÎÏÎÎÎÎÏ ÏÏÎÎÎÎÏÎÏ NSPR %d"
 
-#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
+#: ../camel/camel-tcp-stream-raw.c:647
+#: ../camel/camel-tcp-stream-raw.c:658
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "Î ÎÎÎÎÎÎÏÏÏÏÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÏÎÏ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÏÎ SOCKS4"
@@ -3191,7 +3112,8 @@ msgstr "Î ÎÎÎÎÎÎÏÏÏÏÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÏÎÏ ÎÎÎ Ï
 msgid "The proxy host denied our request: code %d"
 msgstr "Î ÎÎÎÎÎÎÏÏÏÏÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÎÏÎÎÎÎÎÎ ÏÎ ÎÎÏÎÎÎ ÏÎÏ: ÎÏÎÎÎÏÏ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:765
+#: ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "Î ÎÎÎÎÎÎÏÏÏÏÎÏ ÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÏÎ SOCKS5"
@@ -3250,23 +3172,18 @@ msgstr "ÎÎÎ ÎÎÎÎÎÎÏÏÎÎÎÎ Î ÎÏÎÎÏÎÏÎ ÎÏÏ ÏÎÎ ÎÎÏ
 #: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
-msgstr ""
-"ÎÎ ÏÎÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏÏÏÏÎ ÎÎÎÎÎ ÏÎÎÏ ÎÎÎÎÎÎ (ÏÎ ÎÎÎÎÏÏÎ ÎÎÎÎÎ 255 ÏÎÏÎÎÏÎÏÎÏ)"
+msgstr "ÎÎ ÏÎÎÎÎ ÏÎÏ ÎÎÎÎÎÎÏÏÏÏÎ ÎÎÎÎÎ ÏÎÎÏ ÎÎÎÎÎÎ (ÏÎ ÎÎÎÎÏÏÎ ÎÎÎÎÎ 255 ÏÎÏÎÎÏÎÏÎÏ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
+#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÎÎÏÏÎ ÎÏÎÎÏÎÏÎ ÎÏÏ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÏÎÎÎÎÎÏÎÏ"
 
 #: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
-#| msgid ""
-#| "Issuer:            %s\n"
-#| "Subject:           %s\n"
-#| "Fingerprint:       %s\n"
-#| "Signature:         %s"
 msgid ""
 "   Issuer:       %s\n"
 "   Subject:      %s\n"
@@ -3295,8 +3212,7 @@ msgid ""
 "Detailed information about the certificate:\n"
 "%s"
 msgstr ""
-"ÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ SSL ÎÎÎ ÏÎ '%s' ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÎÏÏÎ. ÎÎÎÎÏÎ ÎÎ ÏÎ "
-"ÎÏÎÎÎÏÏÎÎÏÎ;\n"
+"ÎÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ SSL ÎÎÎ ÏÎ '%s' ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÎÏÏÎ. ÎÎÎÎÏÎ ÎÎ ÏÎ ÎÏÎÎÎÏÏÎÎÏÎ;\n"
 "\n"
 "ÎÎÏÏÎÎÎÏÎÎÏ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÏÎ ÏÎÏÏÎÏÎÎÎÏÎÎÏ:\n"
 "%s"
@@ -3354,28 +3270,29 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÏÎÏ URL '%s'"
 
-#: ../camel/camel-vee-folder.c:485
+#: ../camel/camel-vee-folder.c:484
 #, c-format
-#| msgid "Storing folder"
-msgid "Updating %s folder"
-msgstr "ÎÎÎÎÎÏÏÏÎ %s ÏÎÎÎÎÎÏ"
+#| msgid "Creating folder '%s'"
+msgid "Updating folder '%s'"
+msgstr "ÎÎÎÎÎÏÏÎ ÏÎÎÎÎÎÏ '%s'"
 
-#: ../camel/camel-vee-folder.c:842 ../camel/camel-vee-folder.c:952
+#: ../camel/camel-vee-folder.c:843
+#: ../camel/camel-vee-folder.c:953
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ Î ÎÎÏÎÎÎÎÎÏÎÏ ÎÎÎÏÎÎÏÏÎ ÏÎ ÎÎÎ ÎÎÎÎÎÎÎÏ ÏÎÎÎÎÎ"
 
-#: ../camel/camel-vee-folder.c:875
+#: ../camel/camel-vee-folder.c:876
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÎÎÎÎÎÎ ÏÎÏÎÎÎ ÎÎÎÏÎÎ %s ÏÏÎ %s"
 
-#: ../camel/camel-vee-folder.c:928
+#: ../camel/camel-vee-folder.c:929
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÎÏÎÎÎÎ ÎÏÎÎÎÎÎÏÏÎÏ '%s': "
 
-#: ../camel/camel-vee-folder.c:1156
+#: ../camel/camel-vee-folder.c:1157
 msgid "Automatically _update on change in source folders"
 msgstr "ÎÏÏÏÎÎÏÎ Î_ÎÎÎÎÏÏÏÎ ÏÏÎÎ ÎÎÎÎÎÎÏÎ ÎÎ ÏÎÎÎÎÎÎ ÏÎÎÎÏ"
 
@@ -3426,9 +3343,6 @@ msgstr "ÎÏÏÎÏÎÏÎÎÏÎ ÎÏÎÏÏÎÎÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏ
 
 #: ../camel/providers/imap/camel-imap-command.c:422
 #, c-format
-#| msgid ""
-#| "Alert from IMAP server %s %s:\n"
-#| "%s"
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
 "%s"
@@ -3471,7 +3385,6 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÎÏÏÎÏÎÏÎÎÏÎ ÎÏÎÎÏÎÏÎ ÎÎÏÎÎÎÎ ÎÏÏ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP: %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:348
-#| msgid "Always check for new mail in this folder"
 msgid "Always check for _new mail in this folder"
 msgstr "ÎÎÎÏÎ ÎÎÎÎÏÎÏ ÎÎÎ _ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÎ ÎÏÏÏ ÏÎ ÏÎÎÎÎÎ"
 
@@ -3485,28 +3398,39 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏ ÎÎÏÎÎÏÎÎÏ %s: %s
 msgid "Could not load summary for %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÏÏÏÏÎÏ ÏÎÏ ÏÎÏÎÎÎÏÎÏ ÎÎÎ %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3436
+#: ../camel/providers/imap/camel-imap-folder.c:1127
+#, c-format
+msgid "Scanning for changed messages in %s"
+msgstr "ÎÎÏÏÏÎ ÎÎÎ ÎÎÎÎÎÎÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:3445
 msgid "Unable to retrieve message: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÎÎÏÎÏÎ ÏÎÏ ÎÎÎÏÎÎÏÎÏ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3547
-#: ../camel/providers/imap/camel-imap-folder.c:4417
+#: ../camel/providers/imap/camel-imap-folder.c:3556
+#: ../camel/providers/imap/camel-imap-folder.c:4435
 #: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÎÏÏÏ ÏÎ ÎÎÎÏÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ ÎÏÏÎÎ ÏÎ ÏÏÎÎÎÎ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4216
+#: ../camel/providers/imap/camel-imap-folder.c:4014
+#: ../camel/providers/imap/camel-imap-folder.c:4094
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÎÎÏÎÏÎÏÎ ÏÎÎÏÎÏÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4225
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÎÎÎÏÎÎÎÏ ÎÏÏÎÏÎÏÎ ÎÎÏÏÎÏÎÏÎÏÎ: ÎÎ ÎÏÎÎÎÎÎ ÏÎÎÏÎÏÎÏÎÎÏ ÎÎÎ ÏÎ ÎÎÎÏÎÎ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4226
+#: ../camel/providers/imap/camel-imap-folder.c:4235
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÎÎÎÏÎÎÎÏ ÎÏÏÎÏÎÏÎ ÎÎÏÏÎÏÎÏÎÏÎ: ÎÎ ÎÏÎÎÎÎ UID ÎÎÎ ÏÎ ÎÎÎÏÎÎ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4454
+#: ../camel/providers/imap/camel-imap-folder.c:4472
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÏÎÎÏÎÏ ÎÎÎÏÎÎÏÎÏ ÏÏÎÎ ÎÏÎÎÏÎÏÎ FETCH."
@@ -3578,15 +3502,13 @@ msgstr "ÎÏÎÎÎÎÎÏ"
 #: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
-#| msgid "_Apply filters to new messages in INBOX"
 msgid "Apply _filters to new messages in all folders"
 msgstr "ÎÏÎÏÎÎÎÎ _ÏÎÎÏÏÏÎ ÏÏÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÎ ÏÎÎÏÏ ÏÎÏÏ ÏÎÎÎÎÎÏÏ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Î_ÏÎÏÎÎÎÎ ÏÎÎÏÏÏÎ ÏÏÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ ÎÎÏÎÏÏÏÎÎÎÎ ÎÏÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏÎ"
+msgstr "Î_ÏÎÏÎÎÎÎ ÏÎÎÏÏÏÎ ÏÏÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ ÎÎÏÎÏÏÏÎÎÎÎ ÎÏÏÎÏ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏÎ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
@@ -3609,7 +3531,6 @@ msgstr "ÎÏÎÎÏÎÎÎÎÎÎÎÎ ÎÏÏÎ IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-#| msgid "IMAP server %s"
 msgid "IMAP over SSL"
 msgstr "IMAP ÏÎÎÏ ÏÎ SSL"
 
@@ -3630,18 +3551,17 @@ msgstr "ÎÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÎÎÎÏÎÎÏÏÎ 
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ '%s': Î ÏÎÎÎÎÎÏ ÏÏÎÏÏÎÎ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2921
+#: ../camel/providers/imap/camel-imap-store.c:2923
 #, c-format
-#| msgid "Retrieving message '%s'"
 msgid "Retrieving list of folders at '%s'"
 msgstr "ÎÎÎÎÏÎÏÎ ÎÎÏÏÎÏ ÏÎÎÎÎÏÎ ÏÏÎ '%s'"
 
-#: ../camel/providers/imap/camel-imap-store.c:3263
+#: ../camel/providers/imap/camel-imap-store.c:3265
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÎÏÏÎÏÎÏÎÎÏÎ ÎÏÎÏÏÎÎÎÏÎ ÏÎÏ ÎÎÏÏÎÏÎÏÎÏÎ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3266
+#: ../camel/providers/imap/camel-imap-store.c:3268
 msgid "Server unexpectedly disconnected: "
 msgstr "ÎÏÏÎÏÎÏÎÎÏÎ ÎÏÎÏÏÎÎÎÏÎ ÎÎÏÏÎÏÎÏÎÏÎ: "
 
@@ -3682,7 +3602,6 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../camel/providers/local/camel-local-folder.c:495
-#| msgid "Index message body data"
 msgid "_Index message body data"
 msgstr "ÎÎÎÎÎÎÎÎ ÏÏÎÎÏÎÏ ÎÎÎÏÎÎÏÎÏ _ÎÏÏÎÏÎÏÎÎÏ"
 
@@ -3705,25 +3624,18 @@ msgstr "ÎÎÏÎÎÎÎÎÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÎ ÎÎÏÏÎ ÎÎ"
 
 #: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
-msgstr ""
-"ÎÎÎ ÏÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÎ ÎÎÏÎÎÏÎÎÏÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÏÏÏ "
-"ÎÎ."
+msgstr "ÎÎÎ ÏÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÎ ÎÎÏÎÎÏÎÎÏÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÏÏÏ ÎÎ."
 
 #: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ÎÎÏÎÎÎ ÏÎÏÎÎÎÏÎ"
 
 #: ../camel/providers/local/camel-local-provider.c:65
-msgid ""
-"For retrieving (moving) local mail from standard mbox-formatted spools into "
-"folders managed by Evolution."
-msgstr ""
-"ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÏÎ (ÎÎÏÎÎÎÎÎÏÎ) ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÏÏ ÏÏÏÎÎÎ ÎÎÏÏÎÏÎÎÎÎÎÎÎ "
-"ÎÏÎÏÎÏÏÎÎÎÏÎÎÎÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÏÎ ÏÎÎÎÎÎÏÏ ÏÎÏ Evolution."
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgstr "ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÏÎ (ÎÎÏÎÎÎÎÎÏÎ) ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÏÏ ÏÏÏÎÎÎ ÎÎÏÏÎÏÎÎÎÎÎÎÎ ÎÏÎÏÎÏÏÎÎÎÏÎÎÎÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÏÎ ÏÎÎÎÎÎÏÏ ÏÎÏ Evolution."
 
 #: ../camel/providers/local/camel-local-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:99
-#| msgid "_Apply filters to new messages in INBOX"
 msgid "_Apply filters to new messages in Inbox"
 msgstr "ÎÏÎÏÎÎÎÎ _ÏÎÎÏÏÏÎ ÏÏÎ ÎÎÎ ÎÎÎÏÎÎÏÎ ÏÏÎ ÎÎÏÎÏÏÏÎÎÎÎ"
 
@@ -3749,10 +3661,8 @@ msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"ÎÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÎ ÎÎÏÏÎÏÎÎÎ ÏÏÏÎÎÎ ÎÏÏÎÎÎ "
-"ÎÏÎÏÎÏÏÎÎÎÏÎÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎÏ.\n"
-"ÎÏÎÏÎÎ ÎÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎÏÏÎÏ ÏÎÎÎÎÏÎ "
-"ÏÎÏÎÎÏÏÎÏÎÎÏ Elm, Pine, Î Mutt."
+"ÎÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎ ÎÏÎÎÎÎÎÏÏÎ ÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÏÎ ÎÎÏÏÎÏÎÎÎ ÏÏÏÎÎÎ ÎÏÏÎÎÎ ÎÏÎÏÎÏÏÎÎÎÏÎÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎÏ.\n"
+"ÎÏÎÏÎÎ ÎÎÏÎÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎÏÏÎÏ ÏÎÎÎÎÏÎ ÏÎÏÎÎÏÏÎÏÎÎÏ Elm, Pine, Î Mutt."
 
 #: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
@@ -3818,38 +3728,36 @@ msgid "Unable to add message to summary: unknown reason"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÎÎÎÎÏ ÎÎÎÏÎÎÏÎÏ ÏÏÎÎ ÏÎÏÎÎÎÏÎ : ÎÎÎÏÏÏÎ ÎÎÏÎÎ"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÏÎÎ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÎÎÎ ÎÎÎÏÎÎÏÎÏ ÏÏÎ ÏÎÎÎÎÎ maildir: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÏÎ ÏÎÏ ÎÎÎÏÎÎÏÎÏ %s ÎÏÏ ÏÎ ÏÎÎÎÎÎ %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ÎÎÏÎÎÏÎ Î ÎÎÏÎÏÎÏÎ ÏÎÏ ÎÎÎÏÎÎÏÎÏ ÏÏÎÎ ÏÎÎÎÎÎ ÏÏÎÎÏÎÏÎÎÏ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ %s: ÏÎ ÏÎÎÎÎ ÏÎÏ ÏÎÎÎÎÎÏ ÏÎÏÎÎÏÎÎ ÏÎÎÎÎÎ"
+msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ %s: ÏÎ ÏÎÎÎÎ ÏÎÏ ÏÎÎÎÎÎÏ ÏÎÏÎÎÏÎÎ ÏÎÎÎÎÎ"
 
 #: ../camel/providers/local/camel-maildir-store.c:119
 #: ../camel/providers/local/camel-maildir-store.c:786
@@ -3906,9 +3814,7 @@ msgstr "ÎÎÏÎÎÎÎÎ ÏÎÏÏÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ '%s': %s"
 #: ../camel/providers/local/camel-maildir-store.c:777
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ %s: ÎÎ ÏÎÎÎÎ ÏÎÏ ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÏÎÎ ÎÎ "
-"ÏÎÏÎÎÏÎÎ ÏÎÎÎÎÎ"
+msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ %s: ÎÎ ÏÎÎÎÎ ÏÎÏ ÏÎÎÎÎÎÏ ÎÎÎ ÎÏÎÏÎÎ ÎÎ ÏÎÏÎÎÏÎÎ ÏÎÎÎÎÎ"
 
 #: ../camel/providers/local/camel-maildir-summary.c:434
 #: ../camel/providers/local/camel-maildir-summary.c:567
@@ -3926,9 +3832,9 @@ msgstr "ÎÎÎÎÏÎÏ ÎÎÎ ÎÎÎ ÎÎÎÏÎÎÏÎ"
 
 #: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "ÎÎÎÎÎÎÏ ÎÏÎÎÎÎÎÏÏÎÏ"
 
@@ -4027,83 +3933,78 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÎÎÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ: %s: %s"
 #: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
-msgstr ""
-"ÎÎÎÏÎÎÎ ÏÏÎÎÎÎ ÎÎÎÎÏÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÎÎÏÎ ÏÏÎÎ ÏÎÏÎÎÎÏÎÎ %s ÏÏÎ ÏÎÎÎÎÎ %s"
+msgstr "ÎÎÎÏÎÎÎ ÏÏÎÎÎÎ ÎÎÎÎÏÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÎÎÏÎ ÏÏÎÎ ÏÎÏÎÎÎÏÎÎ %s ÏÏÎ ÏÎÎÎÎÎ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÎÎÏÎÏ ÏÎÏ ÎÏÏÎÎÎÏ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÎÎÏÎÏ ÏÎÏ ÏÏÎÏÏÏÎÎÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎÏ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:919
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÎÎÎÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ ÏÎÎÎÏ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÎÎÎÏÎÏ ÏÎÏ ÏÏÎÏÏÏÎÎÎÏ ÏÎÎÎÎÎÏ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏ ÏÎÏ ÏÎÎÎÎÎÏ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1085
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÎÎÎÎÏÏÎÏ ÏÎÏ ÏÎÎÎÎÎÏ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1116
 #, c-format
-msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
-"it.)"
-msgstr ""
-"ÎÎ ÎÏÏÎÎÎ MBOX ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÎ, ÏÎÏÎÎÎÎÏ ÎÎÎÏÎÏÏÏÎ ÏÎ. (ÎÎÎÎÎÎÏÏÎÎ ÎÎÎ "
-"ÎÏÎÎÎÎ ÎÎ From ÎÎÎÎ ÎÎÎ ÏÎÏÎÎÎÏÎÎ.)"
+msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
+msgstr "ÎÎ ÎÏÏÎÎÎ MBOX ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÎ, ÏÎÏÎÎÎÎÏ ÎÎÎÏÎÏÏÏÎ ÏÎ. (ÎÎÎÎÎÎÏÏÎÎ ÎÎÎ ÎÏÎÎÎÎ ÎÎ From ÎÎÎÎ ÎÎÎ ÏÎÏÎÎÎÏÎÎ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:865
+#: ../camel/providers/local/camel-mbox-summary.c:1125
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÎÏÏÎÏÏÎÎÎ ÏÎÏÎÎÎÏÎÏ ÎÎÎ ÏÎÎÎÎÎÏ, ÎÎÏÎÎ ÎÎÎ ÎÎÏÎ ÎÏÏ ÏÏÎÏÏÎÎÎÏÎÏ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Î ÎÎÎÏÎÏÎ ÏÏÎ ÏÏÎÏÏÏÎÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÏÎÏÏÏÎ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Î ÎÎÎÏÎÏÎ ÏÏÎ ÏÏÎÏÏÏÎÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÏÎÏÏÏÎ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÎÎÏÎÎÏÎ Î ÏÏÎÏÎÎÎÎ ÎÎÎÏÎÎÏÎÏ ÏÏÎÎ ÏÎÎÎÎÎ mh: %s: "
@@ -4144,7 +4045,6 @@ msgid "Spool folder tree %s"
 msgstr "ÎÎÎÏÏÎ ÏÎÎÎÎÎÏ ÎÏÎÏÎÏÏÎÎÎÏÎÎÏ %s"
 
 #: ../camel/providers/local/camel-spool-store.c:423
-#| msgid "Invalid source"
 msgid "Invalid spool"
 msgstr "ÎÎÏÏÎ ÏÎÎÎ"
 
@@ -4196,21 +4096,21 @@ msgstr "ÎÎ ÎÏÎÏÎÏÏÎÎÎÏÎÎÎÎÎ ÏÎÎÎÎÎÎ ÎÎ ÎÏÎÏÎÏÎ
 msgid "Spool folders cannot be renamed"
 msgstr "ÎÎ ÎÏÎÏÎÏÏÎÎÎÏÎÎÎÎÎ ÏÎÎÎÎÎÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏÎ"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÏÎÎÎÏÎÎÏ ÏÎÏ ÏÏÎÏÏÏÎÎÎÏ ÏÎÎÎÎÎÏ %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÏÏÎÎÎÏÎÎÏ ÎÏÎÏÎÏÏÎÎÎÏÎÎÎÎÏ ÏÎÎÎÎÎÏ %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -4265,11 +4165,8 @@ msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÏÎÏÎÏ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÎÎÎÎ ÏÎÎÎÎÎ NNTP!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"_ÎÎÏÎÎÎÏÎ ÏÎÎÎÎÏÎ ÎÎ ÏÏÎÏÎÎÎ ÏÎÎÎÎÎÎÏÎÏÎÎ (Ï.Ï c.o.linux ÎÎÏÎ ÎÎÎ "
-"comp.os.linux)"
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "_ÎÎÏÎÎÎÏÎ ÏÎÎÎÎÏÎ ÎÎ ÏÏÎÏÎÎÎ ÏÎÎÎÎÎÎÏÎÏÎÎ (Ï.Ï c.o.linux ÎÎÏÎ ÎÎÎ comp.os.linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
@@ -4289,17 +4186,11 @@ msgstr "ÎÎÎÎÏÎÎÏ USENET"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr ""
-"ÎÏÏÏÏ ÎÎÎÎÎ ÎÎÎÏ ÏÎÏÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎ ÏÎÏÏÎÏÏÎÎÏÎ ÏÎ ÎÎÎÎÎÏ ÎÎÎÎÏÎÏÎ "
-"USENET."
+msgstr "ÎÏÏÏÏ ÎÎÎÎÎ ÎÎÎÏ ÏÎÏÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÎÎÎ ÏÎÏÏÎÏÏÎÎÏÎ ÏÎ ÎÎÎÎÎÏ ÎÎÎÎÏÎÏÎ USENET."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:86
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÎÏÏÎÏÎÎÎÎÏÏÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ NNTP ÎÎ ÏÎ ÏÏÎÏÎ "
-"ÎÏÎÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÎÏÏÎÏÎÎÎÎÏÏÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ NNTP ÎÎ ÏÎ ÏÏÎÏÎ ÎÏÎÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:283
 #, c-format
@@ -4330,8 +4221,7 @@ msgstr ""
 #: ../camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ ÏÎ ÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÏÎ: ÎÎÎÏÏÎÏÎ ÎÎ ÎÎÎÏÎÏÎÎÏÎ."
+msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÎÎÎÎÎÏ ÏÎ ÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÏÎ: ÎÎÎÏÏÎÏÎ ÎÎ ÎÎÎÏÎÏÎÎÏÎ."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
@@ -4341,9 +4231,7 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÎÎÏÎÎÏ ÎÎÏÏ ÏÎÎÎÎÎÏ ÏÏÎ
 #: ../camel/providers/nntp/camel-nntp-store.c:1175
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"ÎÎÏÎÎÏÎ Î ÎÏÎÎÎÎÏÏÎÏÎ ÏÎÎÎÎÎÏ ÏÎ ÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÏÎ: ÎÎÎÏÏÎÏÎ ÎÎ "
-"ÎÏÎÏÏÏÎÏÎÏÎ ÎÏÏ ÏÎÎ ÎÎÎÎÎ."
+msgstr "ÎÎÏÎÎÏÎ Î ÎÏÎÎÎÎÏÏÎÏÎ ÏÎÎÎÎÎÏ ÏÎ ÎÎÎ ÎÏÎÎÎÏÎÏÎÎ ÎÎÏÎ: ÎÎÎÏÏÎÏÎ ÎÎ ÎÏÎÏÏÏÎÏÎÏÎ ÎÏÏ ÏÎÎ ÎÎÎÎÎ."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1371
 #, c-format
@@ -4354,8 +4242,7 @@ msgid ""
 msgstr ""
 "ÎÎÎ ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÏÎÏÎÎÏÎ ÏÎ ÎÏÏÎ ÏÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÎ:\n"
 "\n"
-"ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÎ. ÎÎ ÎÏÎÎÎÎÎÎÎÎ ÎÎÏÎÎÎÎÎÎÎÎ ÎÎÎÎÎÎ ÎÎÎÎÎ "
-"ÎÎÎÏ ÎÎÎÎÎÏÎÎÏÏ ÏÎÎÎÎÎÏ."
+"ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÎÎÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏÎ. ÎÎ ÎÏÎÎÎÎÎÎÎÎ ÎÎÏÎÎÎÎÎÎÎÎ ÎÎÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏ ÎÎÎÎÎÏÎÎÏÏ ÏÎÎÎÎÎÏ."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
@@ -4418,7 +4305,6 @@ msgid "Retrieving POP summary"
 msgstr "ÎÎÎÎÏÎÏÎ ÏÎÏÎÎÎÏÎÏ POP"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:711
-#| msgid "Cannot get POP summary: %s"
 msgid "Cannot get POP summary: "
 msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ ÏÎÏÎÎÎÏÎÏ POP: "
 
@@ -4431,7 +4317,6 @@ msgid "Expunging deleted messages"
 msgstr "ÎÎÎÎÎÎÏÎ ÏÏÎ ÎÎÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "ÎÏÎÎÎÎÎÏÏÎ ÎÎÎÏÎÎÏÏÎ"
 
@@ -4458,7 +4343,6 @@ msgid "Default POP3 port"
 msgstr "ÎÏÎÎÏÎÎÎÎÎÎÎÎ ÎÏÏÎ POP3"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
-#| msgid "POP3 server %s"
 msgid "POP3 over SSL"
 msgstr "POP3 ÏÎÎÏ ÏÎ SSL"
 
@@ -4471,24 +4355,12 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "ÎÎÎ ÏÎ ÏÏÎÎÎÏÎ ÎÎÎ ÎÎÏÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÏÏ ÎÎÏÏÎÏÎÏÎÏÎÏ POP."
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÎ ÎÎ ÏÎ ÏÏÎÏÎ ÎÏÎÎÎÎÏ "
-"ÏÏÏÏÎÎÏÎÏ ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ. ÎÎÎÎÎ Î ÎÏÎÎ ÎÏÎÎÎÎÎ ÏÎÏ ÏÏÎÏÏÎÏÎÎÎÏÎ ÎÎ ÏÎÎ "
-"ÏÎÎÎÎÎ ÎÎÏÏÎÏÎÏÎÏÎÏ POP."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÎ ÎÎ ÏÎ ÏÏÎÏÎ ÎÏÎÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÏÎÎÏ ÎÎÎÎÎÎÎÏ. ÎÎÎÎÎ Î ÎÏÎÎ ÎÏÎÎÎÎÎ ÏÎÏ ÏÏÎÏÏÎÏÎÎÎÏÎ ÎÎ ÏÎÎ ÏÎÎÎÎÎ ÎÎÏÏÎÏÎÏÎÏÎÏ POP."
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:94
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP ÎÎ ÏÎ ÏÏÎÏÎ "
-"ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÎÏ ÎÏÎÎÎÎÏ ÏÏÏÏÎÎÏÎÏ, ÎÎÏÏ ÏÎÏ ÏÏÏÏÎÎÏÎÎÎÏ APOP. ÎÏÏÏ ÎÏÎÏÎÎ "
-"ÎÎ ÎÎ ÎÎÎÏÎÏÏÎÎÎ ÎÎÎ ÏÎÎÏÏ ÏÎÏÏ ÏÏÎÏÏÎÏ, ÎÎÏÎÎ ÎÎÎ ÎÎ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎÏ "
-"ÎÏÏÏÏÎÎÎÎÏÎÎ ÏÏÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÏÎ."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "ÎÎ ÏÎÎ ÎÏÎÎÎÎÎ ÎÏÏÎ ÎÎ ÏÏÎÎÎÎÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP ÎÎ ÏÎ ÏÏÎÏÎ ÎÏÏÏÏÎÎÏÎÏÎÎÎÎÎÏ ÎÏÎÎÎÎÏ ÏÏÏÏÎÎÏÎÏ, ÎÎÏÏ ÏÎÏ ÏÏÏÏÎÎÏÎÎÎÏ APOP. ÎÏÏÏ ÎÏÎÏÎÎ ÎÎ ÎÎ ÎÎÎÏÎÏÏÎÎÎ ÎÎÎ ÏÎÎÏÏ ÏÎÏÏ ÏÏÎÏÏÎÏ, ÎÎÏÎÎ ÎÎÎ ÎÎ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎÏ ÎÏÏÏÏÎÎÎÎÏÎÎ ÏÏÎ ÏÎ ÏÏÎÏÏÎÏÎÎÎÏÎ."
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:83
@@ -4517,7 +4389,6 @@ msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP
 
 #: ../camel/providers/pop3/camel-pop3-store.c:185
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP %s ÏÎ ÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎÎÎ: "
 
@@ -4543,18 +4414,11 @@ msgstr "ÎÎÎÎÎÎÎÏÏÎÏ POP3 ÎÎÎ %s ÏÏÎ %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:527
 #, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÏÏÎÎÎÏÎÏ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP %s: \tÎÎÏÎ ÎÎÏÏÎÏ ID APOP. ÎÏÎÏÎÎ "
-"ÎÏÎÎÎÏÎÏ ÎÎ ÎÎÏÎÏÎÎÎÏÎ. ÎÎÏÎÎÎÎÏ, ÎÏÎÎÎÎÎÏÎÎÏÏÎ ÎÎ ÏÎ ÎÎÎÏÎÎÏÎÏÏÎ ÏÎÏ."
+msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
+msgstr "ÎÎÏÎÎÎÎÎ ÏÏÎÎÎÏÎÏ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ POP %s: \tÎÎÏÎ ÎÎÏÏÎÏ ID APOP. ÎÏÎÏÎÎ ÎÏÎÎÎÏÎÏ ÎÎ ÎÎÏÎÏÎÎÎÏÎ. ÎÎÏÎÎÎÎÏ, ÎÏÎÎÎÎÎÏÎÎÏÏÎ ÎÎ ÏÎ ÎÎÎÏÎÎÏÎÏÏÎ ÏÎÏ."
 
 #: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
@@ -4593,12 +4457,8 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"ÎÎÎ ÏÎÎ ÏÎÏÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÎ ÏÎÎ ÏÏÎÏÎÎÏÎ ÏÏÎ ÏÏÏÎÏÎÎÎÎ \"sendmail\" ÏÏÎ "
-"ÏÎÏÎÎÏ ÏÏÏÏÎÎÎ."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "ÎÎÎ ÏÎÎ ÏÎÏÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÎ ÏÎÎ ÏÏÎÏÎÎÏÎ ÏÏÎ ÏÏÏÎÏÎÎÎÎ \"sendmail\" ÏÏÎ ÏÎÏÎÎÏ ÏÏÏÏÎÎÎ."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4616,8 +4476,7 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÏÏÎÏ ÎÎÏÏÎÏ ÏÎÏÎÎÎÏÏÏÎ"
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÏÎÎÎÏÏÎÏ ÏÏÎÏ ÏÎ sendmail: %s: ÏÎ ÎÎÎÏÎÎ ÎÎ ÏÏÎÎÎÎÎÎ"
+msgstr "ÎÎÏÎÎÎÎÎ ÎÎÎÎÎÏÏÎÎÎÏ ÏÏÎÎÎÏÏÎÏ ÏÏÎÏ ÏÎ sendmail: %s: ÏÎ ÎÎÎÏÎÎ ÎÎ ÏÏÎÎÎÎÎÎ"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
@@ -4631,8 +4490,7 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÎÏÏÎÎÎÏ ÏÎÏ ÎÎÎÏÎÎÏÎÏ: "
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-"ÏÎ ÏÏÏÎÏÎÎÎÎ sendmail ÏÎÏÎÎÏÎÏÏÎÎÎ ÎÎ ÏÎÎÎ %s: Î ÎÎÎÎÎÎÎÏÎÏÎÎ ÎÎÎ ÏÏÎÎÎÎÎÎ."
+msgstr "ÏÎ ÏÏÏÎÏÎÎÎÎ sendmail ÏÎÏÎÎÏÎÏÏÎÎÎ ÎÎ ÏÎÎÎ %s: Î ÎÎÎÎÎÎÎÏÎÏÎÎ ÎÎÎ ÏÏÎÎÎÎÎÎ."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
@@ -4642,15 +4500,13 @@ msgstr "ÎÎÏÎÎÎÎÎ ÎÎÏÎÎÎÏÎÏ ÏÎÏ %s: ÏÎ ÎÎÎÏÎÎ ÎÎ Ï
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-"ÏÎ ÏÏÏÎÏÎÎÎÎ sendmail ÏÎÏÎÎÏÎÏÏÎÎÎ ÏÎ ÎÎÏÎÏÏÎÏÎ %d: ÏÎ ÎÎÎÏÎÎ ÎÎÎ ÏÏÎÎÎÎÎÎ."
+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 server %s"
 msgid "SMTP over SSL"
 msgstr "SMTP ÏÎÎÏ ÏÎ SSL"
 
@@ -4664,9 +4520,7 @@ msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-"ÎÎÎ ÏÎ ÏÎÏÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÎ ÏÏÎÎÎÏÎ ÏÎ ÎÏÎÎÎÎÏÏÏÎÎÎÎ ÎÏÎÎÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÎ "
-"ÏÏÎÏÎ SMTP."
+msgstr "ÎÎÎ ÏÎ ÏÎÏÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÎ ÏÏÎÎÎÏÎ ÏÎ ÎÏÎÎÎÎÏÏÏÎÎÎÎ ÎÏÎÎÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÎ ÏÏÎÏÎ SMTP."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:150
 #: ../camel/providers/smtp/camel-smtp-transport.c:158
@@ -4686,7 +4540,6 @@ msgstr "Î ÎÎÏÎÎÎ STARTTLS ÎÏÎÏÏÏÎ: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÎÏÎÏÏÏÎÎ ÏÏÎÎÎÏÎÏ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ SMTP %s ÏÎ ÎÏÏÎÎÎ ÎÎÎÏÎÏÏÎÎÎ: "
 
@@ -4702,7 +4555,6 @@ msgstr "SMTP ÏÎÏÎÎÎÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎÏ ÎÎÏÏ %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:369
 #, c-format
-#| msgid "SMTP server %s does not support requested authentication type %s."
 msgid "SMTP server %s does not support %s authentication"
 msgstr "Î ÎÎÏÏÎÏÎÏÎÏÎÏ SMTP %s ÎÎÎ ÏÏÎÏÏÎÏÎÎÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ %s"
 
@@ -4787,14 +4639,11 @@ msgstr "ÎÎ ÏÎÏÎÎÏÏ ÏÏÎÏÏÎÏÂ ÎÎ ÏÏÎÏÎÎÎÎÎ ÏÏÎ <for
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÏÎÏÏÎÏÎÎÎÎÎÏ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÎÎ "
-"ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
+msgstr "Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÏÎÏÏÎÏÎÎÎÎÎÏ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-"Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
+msgstr "Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Requested action aborted: error in processing"
@@ -4814,9 +4663,7 @@ msgstr "Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÎÎÎÎÏÎÎÎÎÏÎÎÎÎ: Ï
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÏÎÎÎÎ ÏÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎÏ ÎÎÎ "
-"ÎÏÎÏÏÎÏÎÏÎÎ"
+msgstr "Î ÎÎÏÎÎÎÎÏÎ ÎÎÎÏÎÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÏÎÎÎ: ÏÎ ÏÎÎÎÎ ÏÎÏ ÎÏÎÎÎÎÏÎÎÎÎÏÏÎÎÏ ÎÎÎ ÎÏÎÏÏÎÏÎÏÎÎ"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -4891,7 +4738,6 @@ msgid "QUIT command failed: "
 msgstr "Î ÎÎÏÎÎÎ QUIT ÎÏÎÏÏÏÎ: "
 
 #: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
-#| msgid "Contact ID already exists"
 msgid "Contact UID of a user"
 msgstr "ÎÎ UID ÏÎÏ ÎÏÎÏÎÏ ÏÏÎÏÏÎ"
 
@@ -4916,11 +4762,8 @@ msgid "Birthday and anniversary reminder units"
 msgstr "ÎÎÎÎÎÎÏ ÏÏÎÎÎÏÎÎÏÎÏ ÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÏÎÏÎÎÏÎ"
 
 #: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr ""
-"ÎÎÎÎÎÎÏ ÎÎÎ ÏÏÎÎÎÏÎÎÏÎ ÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÏÎÏÎÎÏÎ, \"ÎÎÏÏÎ\", \"ÏÏÎÏ\" Î \"ÎÎÎÏÎÏ\""
+msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "ÎÎÎÎÎÎÏ ÎÎÎ ÏÏÎÎÎÏÎÎÏÎ ÎÎÎÎÎÎÎÏÎ ÎÎÎ ÎÏÎÏÎÎÏÎ, \"ÎÎÏÏÎ\", \"ÏÏÎÏ\" Î \"ÎÎÎÏÎÏ\""
 
 #: ../libebackend/e-authentication-mediator.c:145
 #: ../libebackend/e-authentication-mediator.c:156
@@ -4930,7 +4773,6 @@ msgid "Bus name vanished (client terminated?)"
 msgstr "ÎÎ ÏÎÎÎÎ ÎÎÎÏÎÎÏ ÎÎÎÏÎÎÎÏÏÎÎÎ (ÏÎÏÎÎÏÎÏÎÏÏ ÏÎÎÎÏÎ;)"
 
 #: ../libebackend/e-authentication-mediator.c:204
-#| msgid "No response from the server"
 msgid "No response from client"
 msgstr "ÎÏÏÎÏ ÎÏÎÎÏÎÏÎ ÎÏÏ ÏÎÎ ÏÎÎÎÏÎ"
 
@@ -4938,7 +4780,6 @@ msgstr "ÎÏÏÎÏ ÎÏÎÎÏÎÏÎ ÎÏÏ ÏÎÎ ÏÎÎÎÏÎ"
 #: ../libebackend/e-authentication-mediator.c:275
 #: ../libebackend/e-authentication-mediator.c:606
 #: ../libebackend/e-authentication-mediator.c:967
-#| msgid "Could not cancel operation"
 msgid "Client cancelled the operation"
 msgstr "Î ÏÎÎÎÏÎÏ ÎÎÏÏÏÏÎ ÏÎ ÎÎÎÏÎÏÏÎÎÎ"
 
@@ -4957,7 +4798,6 @@ msgstr "Î ÎÏÎÎÎÏÏ ÎÎÎÎÎ ÎÏÏÎÎÎÎÎÎÏ"
 #: ../libebackend/e-authentication-session.c:1322
 #: ../libebackend/e-authentication-session.c:1494
 #: ../libebackend/e-authentication-session.c:1673
-#| msgid "Operation cancelled"
 msgid "Keyring operation was cancelled"
 msgstr "Î ÎÎÎÏÎÏÏÎÎÎ ÎÎÎÎÎÎÎÎÎÎÏ ÎÎÏÏÏÎÎÎÎ"
 
@@ -4966,7 +4806,7 @@ msgstr "Î ÎÎÎÏÎÏÏÎÎÎ ÎÎÎÎÎÎÎÎÎÎÏ ÎÎÏÏÏÎÎÎÎ"
 msgid "Data source is missing a [%s] group"
 msgstr "ÎÏÏ ÏÎÎ ÏÎÎÎ ÎÎÎÎÎÎÎÏÎ ÎÎÎÏÎÎ ÎÎÎ ÎÎÎÎÎ [%s]"
 
-#: ../libebackend/e-server-side-source.c:1068
+#: ../libebackend/e-server-side-source.c:1079
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "ÎÎ ÎÏÏÎÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÎ ÎÎÎ ÎÏÎÎÏÎÏÎ '.source'"
@@ -5089,109 +4929,91 @@ msgid "Waiting"
 msgstr "ÎÎÎÎÎÎÎ"
 
 #: ../libedataserver/e-client.c:124
-#| msgid "URI not loaded"
 msgid "Source not loaded"
 msgstr "Î ÏÎÎÎ ÎÎÎ ÏÎÏÏÏÎÎÎÎ"
 
 #: ../libedataserver/e-client.c:126
-#| msgid "URI already loaded"
 msgid "Source already loaded"
 msgstr "Î ÏÎÎÎ ÎÏÎÎ ÎÎÎ ÏÎÏÏÏÎÎÎ"
 
 #. Translators: This means that the EClient does not support offline mode, or
 #. * it's not set to by a user, thus it is unavailable while user is not connected.
 #: ../libedataserver/e-client.c:136
-#| msgid "Offline mode unavailable"
 msgid "Offline unavailable"
 msgstr "Î ÎÎÎÏÎÏÏÎÎÎ ÏÏÏÎÏ ÏÏÎÎÎÏÎ ÎÎÎ ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎ"
 
 #: ../libedataserver/e-client.c:158
-#| msgid "parse error"
 msgid "D-Bus error"
 msgstr "ÎÏÎÎÎÎ ÎÎÎÏÎÎÏ D"
 
 #: ../libedataserver/e-source-authenticator.c:166
-#| msgid "Authentication required"
 msgid "Address book authentication request"
 msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎÎÎÎÎÏ ÎÎÎÏÎÏÎÏÎÏÎ"
 
 #: ../libedataserver/e-source-authenticator.c:171
-#| msgid "Authentication required"
 msgid "Calendar authentication request"
 msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎÎÏÎÎÎÎÎÎÏ"
 
 #: ../libedataserver/e-source-authenticator.c:175
-#| msgid "Authentication required"
 msgid "Mail authentication request"
 msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ"
 
 #. generic account prompt
 #: ../libedataserver/e-source-authenticator.c:178
-#| msgid "Authentication required"
 msgid "Authentication request"
 msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
 
 #: ../libedataserver/e-source-authenticator.c:188
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for address book \"%s\"."
 msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎ ÎÎÎÎÎÎ ÎÎÎÏÎÏÎÏÎÏÎ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:194
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎ ÎÎÎÏÎÎÏÎÎÎ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:200
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for mail account \"%s\"."
-msgstr ""
-"ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÎÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎ \"%s\"."
+msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÎÏÎÏ ÎÎÎÎÎÎÎÏÎÏÎÎ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:206
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for mail transport \"%s\"."
-msgstr ""
-"ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÏÎÏÎÏÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ \"%s\"."
+msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÏÎÏÎÏÎ ÎÎÎÎÎÎÎÏÎÏÎÎÏ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:212
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎ ÎÎÏÏÎ ÏÏÎÎÎÎÎÎÏÏÎ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:218
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for task list \"%s\"."
 msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎ ÎÎÏÏÎ ÎÏÎÎÏÎÏÎ \"%s\"."
 
 #: ../libedataserver/e-source-authenticator.c:224
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
 msgid "Please enter the password for account \"%s\"."
 msgstr "ÎÎÏÎÎÎÎÏ ÎÎÏÎÎÎÏÎ ÏÎÎ ÎÏÎÎÎÏ ÏÏÏÏÎÎÏÎÏ ÎÎÎ ÏÎÎ ÎÎÎÎÏÎÎÏÎÏ \"%s\"."
 
-#: ../libedataserver/e-source.c:602
+#: ../libedataserver/e-source.c:603
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "ÎÏÏ ÏÎ ÎÏÏÎÎÎ ÏÎÎÎÏ ÎÎÎÏÎÎ ÎÎÎ ÎÎÎÎÎ [%s]"
 
-#: ../libedataserver/e-source.c:881
+#: ../libedataserver/e-source.c:882
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Î ÏÎÎÎ ÎÎÎÎÎÎÎÏÎ '%s' ÎÎÎ ÎÎÎÎÎ ÎÎÏÎÎÎÎÎÏÎÎÎ"
 
-#: ../libedataserver/e-source.c:963
+#: ../libedataserver/e-source.c:964
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "Î ÏÎÎÎ ÎÎÎÎÎÎÎÏÎ '%s' ÎÎÎ ÎÎÎÎÎ ÎÎÎÏÎÏÎÎÎ"
 
-#: ../libedataserver/e-source.c:1137
-#| msgid "Unnamed List"
+#: ../libedataserver/e-source.c:1138
 msgid "Unnamed"
 msgstr "ÎÎÏÎÏÎÎ"
 
@@ -5200,8 +5022,7 @@ msgstr "ÎÎÏÎÏÎÎ"
 msgid "Signature script must be a local file"
 msgstr "ÎÎ ÏÎÎÎÏÎÎ ÏÏÎÎÏÎÏÎÏ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏ ÎÏÏÎÎÎ"
 
-#: ../libedataserver/e-source-registry.c:1496
-#| msgid "Failed to authenticate.\n"
+#: ../libedataserver/e-source-registry.c:1512
 msgid "The user declined to authenticate"
 msgstr "Î ÏÏÎÏÏÎÏ ÎÏÎÎÎÎÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
 
@@ -5209,7 +5030,8 @@ msgstr "Î ÏÏÎÏÏÎÏ ÎÏÎÎÎÎÎÎ ÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1647
+#: ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5217,7 +5039,8 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1652
+#: ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -5225,7 +5048,8 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1657
+#: ../libedataserver/e-time-utils.c:1941
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5233,7 +5057,8 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1932
+#: ../libedataserver/e-time-utils.c:1662
+#: ../libedataserver/e-time-utils.c:1932
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -5251,7 +5076,8 @@ msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1675
+#: ../libedataserver/e-time-utils.c:1795
 #: ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5292,19 +5118,22 @@ msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1709
+#: ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1989
+#: ../libedataserver/e-time-utils.c:1869
+#: ../libedataserver/e-time-utils.c:1989
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1981
+#: ../libedataserver/e-time-utils.c:1873
+#: ../libedataserver/e-time-utils.c:1981
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5312,14 +5141,16 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1986
+#: ../libedataserver/e-time-utils.c:1878
+#: ../libedataserver/e-time-utils.c:1986
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1978
+#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1978
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5338,12 +5169,8 @@ msgid "Proxy type to use"
 msgstr "ÎÏÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÏÎÏÎ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-msgstr ""
-"ÎÏÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÏÎÏÎ. \"0\" ÏÎÎÎÎÎÎÎ ÏÏÏÏÎÎÎ, \"1\" ÏÎÎÎÎÎÎÎ ÏÏÏÎÏ "
-"ÎÎÏÎÎÎÎÎÏÎ, \"2\" ÏÎÎÎÎÎÎÎ ÏÎÎÏÎÎÎÎÎÏÎÏ ÎÎÏÎÎÎÎÎÏÎÏ."
+msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy."
+msgstr "ÎÏÏÎÏ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎ ÏÏÎÏÎ. \"0\" ÏÎÎÎÎÎÎÎ ÏÏÏÏÎÎÎ, \"1\" ÏÎÎÎÎÎÎÎ ÏÏÏÎÏ ÎÎÏÎÎÎÎÎÏÎ, \"2\" ÏÎÎÎÎÎÎÎ ÏÎÎÏÎÎÎÎÎÏÎÏ ÎÎÏÎÎÎÎÎÏÎÏ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
@@ -5358,7 +5185,6 @@ msgid "Whether proxy server requires authentication"
 msgstr "ÎÎÎ Î ÎÎÏÏÎÏÎÏÎÏÎÏ ÎÎÏÎÎÎÎÎÏÎÏ ÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-#| msgid "Bad authentication response from server."
 msgid "Whether authentication is required to access proxy server."
 msgstr "ÎÎÎ ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎÎ ÏÏÏÏÎÎÏÎ ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÏÎÎÎÎÎÏÎÏ."
 
@@ -5379,25 +5205,18 @@ msgid "Port number to use for HTTP requests."
 msgstr "ÎÏÎÎÎÏÏ ÎÏÏÎÏ ÎÎÎ ÏÏÎÏÎ ÎÎ ÎÎÏÎÎÎÏÎ HTTP."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Unknown authentication state."
 msgid "Proxy authentication user name"
 msgstr "ÎÎÎÎÎ ÏÏÎÏÏÎ ÏÎÏÏÎÏÎÎÎÏÎÏ ÎÎÏÎÎÎÎÎÏÎ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-#| msgid ""
-#| "Unable to authenticate to IMAP server.\n"
-#| "%s\n"
-#| "\n"
 msgid "User name to use to authenticate against proxy server."
 msgstr "ÎÎÎÎÎ ÏÏÎÏÏÎ ÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÏÎÎÎÎÎÏÎÏ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-#| msgid "Temporary authentication failure"
 msgid "Proxy authentication password"
 msgstr "ÎÏÎÎÎÏÏ ÏÎÏÏÎÏÎÎÎÏÎÏ ÎÎÏÎÎÎÎÎÏÎ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-#| msgid "Cannot authenticate to server: %s"
 msgid "Password to use to authenticate against proxy server."
 msgstr "ÎÏÎÎÎÏÏ ÎÎÎ ÏÎÏÏÎÏÎÎÎÏÎ ÎÎ ÎÎÏÏÎÏÎÏÎÏÎ ÎÎÏÎÎÎÎÎÏÎÏ."
 
@@ -5426,7 +5245,6 @@ msgid "Port number to use for HTTPS requests."
 msgstr "ÎÏÎÎÎÏÏ ÎÏÏÎÏ ÎÎÎ ÏÏÎÏÎ ÎÎ ÎÎÏÎÎÎÏÎ HTTPS."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-#| msgid "Host is unreachable from SOCKS server"
 msgid "Host name for SOCKS requests"
 msgstr "ÎÎÎÎÎ ÎÎÎÎÎÎÏÏÏÏÎ ÎÎÎ ÎÎÏÎÎÎÏÎ SOCKS"
 
@@ -5493,12 +5311,8 @@ msgstr "ÎÎÎÏÏÎÏÎÏ ÎÎÏÎÎÎÏÎÎÏ"
 
 #: ../libedataserverui/e-category-editor.c:287
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr ""
-"ÎÏÎÏÏÎÎ ÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÎÎ '%s' ÏÏÎÎ ÏÏÎÎÎÏÎ. ÎÎÏÎÎÎÎÎÏÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÎÎÎ "
-"ÎÎÎÏÎÏÎÏÎÎÏ ÏÎÎÎÎ"
+msgid "There is already a category '%s' in the configuration. Please use another name"
+msgstr "ÎÏÎÏÏÎÎ ÎÎÎ ÎÎÎ ÎÎÏÎÎÎÏÎÎ '%s' ÏÏÎÎ ÏÏÎÎÎÏÎ. ÎÎÏÎÎÎÎÎÏÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÏÎ ÎÎÎ ÎÎÎÏÎÏÎÏÎÎÏ ÏÎÎÎÎ"
 
 #: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
@@ -5509,7 +5323,6 @@ msgid "Address B_ook:"
 msgstr "ÎÎÎÎÎÎ ÎÎÎÏ_ÎÏÎÏÎÏÎ:"
 
 #: ../libedataserverui/e-name-selector-dialog.c:308
-#| msgid "Cate_gory:"
 msgid "Cat_egory:"
 msgstr "Î_ÎÏÎÎÎÏÎÎ:"
 
@@ -5587,9 +5400,7 @@ msgstr "ÎÎÎÎÏÎ_ÏÎ %s"
 
 #: ../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-win32.c:614
@@ -5604,8 +5415,7 @@ msgstr "ÎÏÎ_ÎÎÎÎÏÎÎÏÏÎ ÎÏÏÎÏ ÏÎÏ ÏÏÎÎÎÎÎÏÎÎÎÏ"
 #: ../libedataserverui/e-passwords.c:822
 #: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
-msgstr ""
-"ÎÏÎ_ÎÎÎÎÏÎÎÏÏÎ ÎÏÏÎÏ ÏÎÏ ÏÏÎÎÎÎÎÏÎÎÎÏ ÎÎÏÏÎ ÏÎ ÏÎÎÎÏ ÎÏÏÎÏ ÏÎÏ ÏÏÎÎÎÏÎÎÏ"
+msgstr "ÎÏÎ_ÎÎÎÎÏÎÎÏÏÎ ÎÏÏÎÏ ÏÎÏ ÏÏÎÎÎÎÎÏÎÎÎÏ ÎÎÏÏÎ ÏÎ ÏÎÎÎÏ ÎÏÏÎÏ ÏÎÏ ÏÏÎÎÎÏÎÎÏ"
 
 #: ../libedataserverui/e-passwords.c:827
 #: ../libedataserverui/e-passwords-win32.c:743
@@ -5633,14 +5443,12 @@ msgstr "ÎÎÎÏÎÎÏÎÎÎ"
 #. TODO: more specific
 #: ../modules/online-accounts/goaewsclient.c:184
 #, c-format
-#| msgid "Unexpected response from IMAP server: %s"
 msgid "Code: %u - Unexpected response from server"
 msgstr "ÎÏÎÎÎÎÏ: %u - ÎÏÏÎÏÎÏÎÎÏÎ ÎÏÎÎÏÎÏÎ ÎÏÏ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ"
 
 #. TODO: more specific
 #: ../modules/online-accounts/goaewsclient.c:205
 #, c-format
-#| msgid "Failed to retrieve message"
 msgid "Failed to parse autodiscover response XML"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÎÎÎÏÏÎÏ ÎÏÎÎÏÎÏÎÏ ÎÏÏÏÎÎÏÎÏ ÎÏÏÎÏÎÏ XML"
 
@@ -5669,7 +5477,6 @@ msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "ÎÏÎÏÏÏÎÎ ÎÏÏÎÏÎÏ ASUrl ÎÎÎ OABUrl ÏÎ ÎÏÏÎÏÎÏÎ ÎÏÏÏÎÎÏÎÏ ÎÏÏÎÏÎÏ"
 
 #: ../modules/yahoo-backend/module-yahoo-backend.c:215
-#| msgid "Trash"
 msgid "Tasks"
 msgstr "ÎÏÎÎÏÎÎÏ"
 
@@ -5683,23 +5490,25 @@ msgstr "ÎÎÎÏÎÏÎÏÎ ÎÎÏÎÎÎÏÎÏ ÎÎÏÎ ÏÎ ÎÎÎÎÏÎÎÎ Ï
 msgid "Wait running until at least one client is connected"
 msgstr "ÎÎÎÎÎÎÎ ÎÎÏÎÎÎÏÎÏ ÎÎÏÏÎ ÏÎÏÎÎÏÎÏÏÎÎ ÎÎÎÏ ÏÎÎÎÏÎÏ ÎÎ ÏÏÎÎÎÎÎÎ"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:458
+#: ../tests/libedataserverui/evolution-source-viewer.c:569
 msgid "Evolution Source Viewer"
 msgstr "ÎÏÎÎÎÎÎÎÏ ÏÎÎÎÏ Evolution"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:487
-#| msgid "Family Name"
+#: ../tests/libedataserverui/evolution-source-viewer.c:598
 msgid "Display Name"
 msgstr "ÎÎÎÎÎ ÎÎÏÎÎÎÏÎÏ"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:496
+#: ../tests/libedataserverui/evolution-source-viewer.c:607
 msgid "Flags"
 msgstr "ÎÎÎÎÎÎÏ"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:520
+#: ../tests/libedataserverui/evolution-source-viewer.c:635
 msgid "Identity"
 msgstr "ÎÎÏÏÏÏÎÏÎ"
 
+#~| msgid "Storing folder"
+#~ msgid "Updating %s folder"
+#~ msgstr "ÎÎÎÎÎÏÏÏÎ %s ÏÎÎÎÎÎÏ"
 #, fuzzy
 #~ msgid "Authenticating with the serverâ"
 #~ msgstr "ÎÏÎÎÏÎÎÏÎÎ ÏÎÏÏÎÏÎÎÎÏÎ"
@@ -6223,23 +6032,23 @@ msgstr "ÎÎÏÏÏÏÎÏÎ"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
 #~ msgstr ""
-#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ '%"
-#~ "s': ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ"
+#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ "
+#~ "'%s': ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ"
 
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
 #~ msgstr ""
-#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ '%"
-#~ "s': ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ"
+#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ "
+#~ "'%s': ÎÎÎÏÏÏÎ ÏÏÎÎÎÎ"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
 #~ msgstr ""
-#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ '%"
-#~ "s': ÎÏÏÎÎÎÎÎÎ ÎÎÏÎÎÎ"
+#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ "
+#~ "'%s': ÎÏÏÎÎÎÎÎÎ ÎÎÏÎÎÎ"
 
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 #~ msgstr ""
-#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ '%"
-#~ "s': ÎÏÏÎÎÎÎÎÎ ÎÎÏÎÎÎ"
+#~ "ÎÎÎ ÎÎÎÎÎ ÎÏÎÎÏÎ Î ÎÎÏÎÎÏÎÏÎ ÎÎÎÏÎÎÏÏÎ ÎÏÏ ÏÎ ÏÎÎÎÎÎ '%s' ÏÏÎ ÏÎÎÎÎÎ "
+#~ "'%s': ÎÏÏÎÎÎÎÎÎ ÎÎÏÎÎÎ"
 
 #~ msgid "Only check for Junk messa_ges in the INBOX folder"
 #~ msgstr "ÎÎÎÎÏÎÏ ÎÎÎ ÎÎÎÏÎÎÏÎÎÏÎ ÎÎ_ÎÏÎÎÏÎ ÎÏÎÎ ÏÏÎ ÏÎÎÎÎÎ ÎÎÏÎÏÏÎÎÎÎÏÎ"
@@ -6268,8 +6077,8 @@ msgstr "ÎÎÏÏÏÏÎÏÎ"
 #~ "Cannot authenticate to IMAP server %s using the %s authentication "
 #~ "mechanism"
 #~ msgstr ""
-#~ "ÎÎÎ ÎÏÎÎ ÎÏÎÎÏÎ Î ÏÏÎÎÎÏÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP %s ÎÎ ÏÏÎÏÎ ÏÎÏ %"
-#~ "sÎÎÏÎÎÎÏÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÏ"
+#~ "ÎÎÎ ÎÏÎÎ ÎÏÎÎÏÎ Î ÏÏÎÎÎÏÎ ÎÎ ÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP %s ÎÎ ÏÏÎÏÎ ÏÎÏ "
+#~ "%sÎÎÏÎÎÎÏÎÎÏ ÏÎÏÏÎÏÎÎÎÏÎÏ"
 
 #~ msgid "Cannot authenticate to IMAP server %s using %s"
 #~ msgstr ""
@@ -6328,8 +6137,8 @@ msgstr "ÎÎÏÏÏÏÎÏÎ"
 
 #~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 #~ msgstr ""
-#~ "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ %s ÏÎÎÏÎÏÎÏÎÏÎ ÎÎÎ ÏÎ ÎÎÏÎÎÎ '%s' ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP %"
-#~ "s: %s"
+#~ "ÎÎÏÎÎÎÎÎ ÎÎÏÎÏ %s ÏÎÎÏÎÏÎÏÎÏÎ ÎÎÎ ÏÎ ÎÎÏÎÎÎ '%s' ÏÏÎÎ ÎÎÏÏÎÏÎÏÎÏÎ IMAP "
+#~ "%s: %s"
 
 #~ msgid "Cannot subscribe to IMAP folders in offline mode."
 #~ msgstr ""



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