[evolution-data-server/gnome-3-0] Added UG translation



commit 708d0f9ea92c145e1c5f0b3968fb841be6d0ca82
Author: Abduxukur Abdurixit <abdurixit gmail com>
Date:   Fri Aug 19 19:37:37 2011 +0200

    Added UG translation

 po/ug.po | 1481 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 749 insertions(+), 732 deletions(-)
---
diff --git a/po/ug.po b/po/ug.po
index 431eb7d..6a0c4bf 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-07-06 20:09+0000\n"
-"PO-Revision-Date: 2011-06-27 15:26+0600\n"
+"POT-Creation-Date: 2011-08-18 14:25+0000\n"
+"PO-Revision-Date: 2011-08-08 17:25+0600\n"
 "Last-Translator: Sahran <sahran ug gmail com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ yahoogroups com>\n"
 "MIME-Version: 1.0\n"
@@ -21,62 +21,64 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-04-11 00:16+0000\n"
 "X-Generator: Launchpad (build 12757)\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:668
+#: ../addressbook/backends/file/e-book-backend-file.c:823
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "ÙÛÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:671
+#: ../addressbook/backends/file/e-book-backend-file.c:826
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "ØÙØØÛÛØØÙØÛâ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:628
+#: ../addressbook/backends/google/e-book-backend-google.c:788
 msgid "Querying for updated contactsâ"
 msgstr "ÙÛÚÙÙØÙØØÙ ØØÙØÙÛØØØÙØØÙÙ ØÛØÛØØÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:672
-#: ../addressbook/libebook/e-book.c:3572 ../calendar/libecal/e-cal.c:1331
-#: ../libedataserver/e-client.c:1777
+#: ../addressbook/backends/google/e-book-backend-google.c:839
+#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1318
+#: ../libedataserver/e-client.c:1851
 msgid "Personal"
 msgstr "ØÛØØÙÙ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:674
+#: ../addressbook/backends/google/e-book-backend-google.c:841
 msgid "Friends"
 msgstr "ØÙØØÙØØ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:676
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Family"
 msgstr "ØÛÙÛØÙÙ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:678
+#: ../addressbook/backends/google/e-book-backend-google.c:845
 msgid "Coworkers"
 msgstr "ØÙØÙÛØØØØÙØØ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:757
+#: ../addressbook/backends/google/e-book-backend-google.c:924
 msgid "Querying for updated groupsâ"
 msgstr "ÙÛÚÙÙØÙØØÙ ÚÛØÛÙÙÙÙØØÙÙ ØÛØÛØØÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1036
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1329
 msgid "Creating new contactâ"
 msgstr "ÙÛÚÙ ØØÙØÙÛØØØ ÙÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1128
+#: ../addressbook/backends/google/e-book-backend-google.c:1433
 msgid "Deleting contactâ"
 msgstr "ØØÙØÙÛØØØÙÙ ØÛÚÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1240
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1699
 msgid "Modifying contactâ"
 msgstr "ØØÙØÙÛØØØÙÙ ØÛØÙØÙÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1387
+#: ../addressbook/backends/google/e-book-backend-google.c:1892
 msgid "Loadingâ"
 msgstr "ÙÛÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
 msgid "Authenticating with the serverâ"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÛØØÙØÛâ"
 
@@ -128,14 +130,15 @@ msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ(%d)... "
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
-#: ../addressbook/libedata-book/e-data-book.c:440
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
+#: ../addressbook/libedata-book/e-data-book.c:442
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
 #: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4462
+#: ../calendar/libecal/e-cal.c:4420
 #: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/smtp/camel-smtp-transport.c:525
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imapx/camel-imapx-server.c:2246
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 msgid "Unknown error"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
 
@@ -144,18 +147,18 @@ msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÙÛÙØÛ Â%s ÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ. ØÛ ÚØØØÙÙÙ HTTP ÚØÙÙØÙ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3247
+#: ../addressbook/libebook/e-book.c:3158
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ØØ ØØÙÙØÙØØÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
 
-#: ../addressbook/libebook/e-book.c:3555 ../calendar/libecal/e-cal.c:1311
-#: ../libedataserver/e-client.c:1772
+#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1298
+#: ../libedataserver/e-client.c:1846
 msgid "On This Computer"
 msgstr "ØÛ ÙÙÙÙÙÛØÛØØØ"
 
-#: ../addressbook/libebook/e-book.c:3681
-#: ../addressbook/libebook/e-book-client.c:613
+#: ../addressbook/libebook/e-book.c:3592
+#: ../addressbook/libebook/e-book-client.c:634
 #: ../addressbook/libedata-book/e-data-book.c:310
 msgid "Address book does not exist"
 msgstr "ØØØØÛØ ØÛÙØÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
@@ -190,41 +193,41 @@ msgctxt "BookClientError"
 msgid "Unknown error"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:167
+#: ../addressbook/libebook/e-book-client.c:168
 msgid "D-Bus book proxy gone"
 msgstr "D-Bus ÙÙØØØ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:428
+#: ../addressbook/libebook/e-book-client.c:448
 msgid "Failed to run book factory"
 msgstr "ÙÙØØØ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:438
-#: ../addressbook/libedata-book/e-data-book-factory.c:371
-#: ../addressbook/libedata-book/e-data-book-factory.c:429
-#: ../calendar/libecal/e-cal-client.c:544
-#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#: ../addressbook/libebook/e-book-client.c:458
+#: ../addressbook/libedata-book/e-data-book-factory.c:375
+#: ../addressbook/libedata-book/e-data-book-factory.c:433
+#: ../calendar/libecal/e-cal-client.c:564
+#: ../calendar/libedata-cal/e-data-cal-factory.c:395
 #, c-format
 msgid "Invalid source"
 msgstr "ÙÛÙØÛ ØÙÙØÛÛØØÙØ"
 
-#: ../addressbook/libebook/e-book-client.c:538
-#: ../calendar/libecal/e-cal-client.c:656
+#: ../addressbook/libebook/e-book-client.c:559
+#: ../calendar/libecal/e-cal-client.c:677
 #, c-format
 msgid "Incorrect uri '%s'"
 msgstr "uri Â%s ØØØØ"
 
-#: ../addressbook/libebook/e-book-client.c:576
+#: ../addressbook/libebook/e-book-client.c:597
 msgid "Failed to find system book"
 msgstr "ØÙØØÛÙØ ÙÙØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:683
-#: ../calendar/libecal/e-cal-client.c:804
+#: ../addressbook/libebook/e-book-client.c:704
+#: ../calendar/libecal/e-cal-client.c:825
 #, c-format
 msgid "There was no source for UID '%s' stored in a source list."
 msgstr "ÙÛÙØÛ ØÙØÙÙÙØÙÙÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
 
-#: ../addressbook/libebook/e-book-client.c:2006
-#: ../calendar/libecal/e-cal-client.c:3611
+#: ../addressbook/libebook/e-book-client.c:2093
+#: ../calendar/libecal/e-cal-client.c:4091
 msgid "Cannot get connection to view"
 msgstr "ÙÛØÙØÙØØÙ ØØØÙÙÙÙØÙØØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ"
 
@@ -775,7 +778,7 @@ msgid "SIP address"
 msgstr "SIP ØØØØÛØÙ"
 
 #: ../addressbook/libebook/e-contact.c:1542
-#: ../addressbook/libebook/e-destination.c:870
+#: ../addressbook/libebook/e-destination.c:868
 msgid "Unnamed List"
 msgstr "ÙØÙØÙØ ØÙØÙÙ"
 
@@ -783,47 +786,46 @@ msgstr "ÙØÙØÙØ ØÙØÙÙ"
 msgid "Cannot process, book backend is opening"
 msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙØØØ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:92
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÙØÙÛÙÛÙ ÙÙØØØ ØØØÙÙÙÙ Â%sÂ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:103
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÙÙØØØ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:406
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
+#: ../camel/camel-db.c:470
 #, c-format
-msgid "Empty URI"
-msgstr "ÙÛØÛÙ URI"
+msgid "Insufficient memory"
+msgstr "ØÛØÙÛÙ ÙÛØÙÙØÙ"
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:196
 #: ../addressbook/libedata-book/e-data-book.c:209
-#: ../addressbook/libedata-book/e-data-book.c:692
+#: ../addressbook/libedata-book/e-data-book.c:694
 msgid "Invalid query: "
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ: "
 
 #: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:413
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Success"
 msgstr "ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:414
+#: ../calendar/libecal/e-cal.c:4388 ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Backend is busy"
 msgstr "Backend ØØÙØÙØØØ"
 
 #: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Repository offline"
 msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
 
 #: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal.c:4402 ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Permission denied"
 msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
 
@@ -836,27 +838,27 @@ msgid "Contact ID already exists"
 msgstr "ØØÙØÙÛØØØ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
 
 #: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Authentication Failed"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Required"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ"
 
 #: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unsupported field"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÙØ ØÛÙÙÙÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported authentication method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "TLS not available"
 msgstr "TLS ÙÙÙ"
 
@@ -865,39 +867,39 @@ msgid "Book removed"
 msgstr "ÙÙØØØ ÚÙÙÙØÙÛÛØÙÙÚÛÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Not available in offline mode"
 msgstr "ØÙØØØ ÙÙÙ ÚØÙÛØØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
 #: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Search size limit exceeded"
 msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Search time limit exceeded"
 msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid query"
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
 
 #: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Query refused"
 msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Could not cancel"
 msgstr "ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
 #: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Invalid server version"
 msgstr "ÙÛÙØØÙÙÛØÙØ ÙÛØØÙ ØÙÙØÛÛØØÙØ"
 
@@ -906,105 +908,117 @@ msgid "No space"
 msgstr "ØÙØÙÛÙ ÙÙÙ"
 
 #: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:437
+#: ../calendar/libecal/e-cal.c:4386 ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid argument"
 msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../calendar/libecal/e-cal.c:4425 ../calendar/libedata-cal/e-data-cal.c:440
 msgid "Not supported"
 msgstr "ÙÙÙÙÙÙØÙØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libecal/e-cal-client.c:552
-#: ../calendar/libedata-cal/e-data-cal.c:447
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:441
+msgid "Backend is not opened yet"
+msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
+
+#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../calendar/libecal/e-cal-client.c:572
+#: ../calendar/libedata-cal/e-data-cal.c:449
 msgid "Other error"
 msgstr "ØØØÙØ ØØØØÙÙÙ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:534
-#: ../addressbook/libedata-book/e-data-book.c:864
+#: ../addressbook/libedata-book/e-data-book.c:536
+#: ../addressbook/libedata-book/e-data-book.c:866
 msgid "Cannot get contact: "
 msgstr "ØØÙØÙÛØØØÙØ ØÛØÙØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:556
-#: ../addressbook/libedata-book/e-data-book.c:578
+#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:580
 msgid "Empty query: "
 msgstr "ÙÛØÛÙ ØÛØÛØØÛØÛØ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:600
-#: ../addressbook/libedata-book/e-data-book.c:930
+#: ../addressbook/libedata-book/e-data-book.c:602
+#: ../addressbook/libedata-book/e-data-book.c:932
 msgid "Cannot add contact: "
 msgstr "ØØÙØÙÛØØØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:622
-#: ../addressbook/libedata-book/e-data-book.c:949
+#: ../addressbook/libedata-book/e-data-book.c:624
+#: ../addressbook/libedata-book/e-data-book.c:951
 msgid "Cannot modify contact: "
 msgstr "ØØÙØÙÛØØØÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:715
-#: ../calendar/libedata-cal/e-data-cal.c:822
+#: ../addressbook/libedata-book/e-data-book.c:717
+#: ../calendar/libedata-cal/e-data-cal.c:824
 msgid "Cannot authenticate user: "
 msgstr "ØÙØÙÛØÙÛÚÙÙÙÚ ØØÙØÚÙÙÙØÙÙÙ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:777
+#: ../addressbook/libedata-book/e-data-book.c:779
 msgid "Cannot open book: "
 msgstr "ÙÙØØØÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:791
+#: ../addressbook/libedata-book/e-data-book.c:793
 msgid "Cannot remove book: "
 msgstr "ÙÙØØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:816
+#: ../addressbook/libedata-book/e-data-book.c:818
 msgid "Cannot refresh address book: "
 msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:832
+#: ../addressbook/libedata-book/e-data-book.c:834
 msgid "Cannot get backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:848
-#: ../calendar/libedata-cal/e-data-cal.c:999
+#: ../addressbook/libedata-book/e-data-book.c:850
+#: ../calendar/libedata-cal/e-data-cal.c:1001
 msgid "Cannot set backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÛÚØÙÚÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:879
+#: ../addressbook/libedata-book/e-data-book.c:881
 msgid "Cannot get contact list: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙØØ ØÛØÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:903
+#: ../addressbook/libedata-book/e-data-book.c:905
 msgid "Cannot get contact list uids: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙÙÙÚ uids ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:967
+#: ../addressbook/libedata-book/e-data-book.c:969
 msgid "Cannot remove contacts: "
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:517
+#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../addressbook/libedata-book/e-data-book-factory.c:392
+#: ../calendar/libedata-cal/e-data-cal-factory.c:410
+#, c-format
+msgid "Empty URI"
+msgstr "ÙÛØÛÙ URI"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ %d ØÛÚÛÙ HTTP ÚØÙÛØ ÙÙØÙ ÙØÙØÛØÛÙØÙ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2097
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2445
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1014,7 +1028,7 @@ msgstr ""
 "ØÛÚÙÙØÙ.\n"
 "ØØØØÙÙÙ ØÛÚÛØ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4187
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÙÙÙÙØÙÛ ØÙÙØØ/ØØÙØÙØØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
@@ -1103,6 +1117,84 @@ msgstr "ÚØÛØØØÙÙ: ÚÛÙØÛØÙØÙÙÙÙÙ ÙØÙØÛØ"
 msgid "Forecast"
 msgstr "ØØÙØÙÙ ÙÛÙÛÙØØ"
 
+#: ../calendar/libecal/e-cal.c:851 ../libedataserverui/e-book-auth-util.c:198
+#: ../libedataserverui/e-book-auth-util.c:417
+#: ../libedataserverui/e-client-utils.c:795
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#.
+#. This password prompt will be prompted rarely. Since the key that is passed to
+#. the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:865
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr ""
+"%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
+
+#: ../calendar/libecal/e-cal.c:4390
+msgid "Repository is offline"
+msgstr "ØÛØÙÙÛ ØÙØØØ ÙÙÙ"
+
+#: ../calendar/libecal/e-cal.c:4392
+msgid "No such calendar"
+msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
+
+#: ../calendar/libecal/e-cal.c:4394 ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Object not found"
+msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
+
+#: ../calendar/libecal/e-cal.c:4396 ../calendar/libedata-cal/e-data-cal.c:420
+msgid "Invalid object"
+msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
+
+#: ../calendar/libecal/e-cal.c:4398
+msgid "URI not loaded"
+msgstr "URI ØÙÙÛÙÙÙØØÙ"
+
+#: ../calendar/libecal/e-cal.c:4400
+msgid "URI already loaded"
+msgstr "URI ØÙÙÛÙØØÙ"
+
+#: ../calendar/libecal/e-cal.c:4404
+msgid "Unknown User"
+msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
+
+#: ../calendar/libecal/e-cal.c:4406 ../calendar/libedata-cal/e-data-cal.c:421
+msgid "Object ID already exists"
+msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
+
+#: ../calendar/libecal/e-cal.c:4408
+msgid "Protocol not supported"
+msgstr "ÙÛÙÙØÙÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
+
+#: ../calendar/libecal/e-cal.c:4410
+msgid "Operation has been canceled"
+msgstr "ÙÛØØÛÙØØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
+
+#: ../calendar/libecal/e-cal.c:4412
+msgid "Could not cancel operation"
+msgstr "ÙÛØØÛÙØØØÙÙ ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
+
+#: ../calendar/libecal/e-cal.c:4414
+msgid "Authentication failed"
+msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../calendar/libecal/e-cal.c:4416
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
+msgid "Authentication required"
+msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
+
+#: ../calendar/libecal/e-cal.c:4418
+msgid "A D-Bus exception has occurred"
+msgstr "ØÙØ D-Bus ÙÛØØÛØÙØ ÙÛØÛÙØÙ"
+
+#: ../calendar/libecal/e-cal.c:4422
+msgid "No error"
+msgstr "ØØØØÙÙÙ ÙÙÙ"
+
 #: ../calendar/libecal/e-cal-client.c:127
 msgctxt "CalClientError"
 msgid "No such calendar"
@@ -1138,24 +1230,24 @@ msgctxt "CalClientError"
 msgid "Unknown error"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
 
-#: ../calendar/libecal/e-cal-client.c:213
+#: ../calendar/libecal/e-cal-client.c:214
 msgid "D-Bus calendar proxy gone"
 msgstr "D-Bus ÙÙÙÙØÙÛ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:534
+#: ../calendar/libecal/e-cal-client.c:554
 msgid "Failed to run calendar factory"
 msgstr "ÙÙÙÙØÙÛ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:695
+#: ../calendar/libecal/e-cal-client.c:716
 msgid "Failed to find system calendar"
 msgstr "ØÙØØÛÙØ ÙÙÙÙØÙÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:733
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../calendar/libecal/e-cal-client.c:754
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Calendar does not exist"
 msgstr "ÙÙÙÙØÙÛ ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../calendar/libecal/e-cal-client.c:843
+#: ../calendar/libecal/e-cal-client.c:864
 msgid "Invalid source type"
 msgstr "ÙÛÙØÛ ØÙÙÙ ØÙÙØÛÛØØÙØ"
 
@@ -1163,224 +1255,164 @@ msgstr "ÙÛÙØÛ ØÙÙÙ ØÙÙØÛÛØØÙØ"
 msgid "Untitled appointment"
 msgstr "ÙØÛØÛØÙØ ØÛÙÙØÙÛ"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
 msgstr "1-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
 msgstr "2-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
 msgstr "3-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
 msgstr "4-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
 msgstr "5-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
 msgstr "6-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
 msgstr "7-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
 msgstr "8-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
 msgstr "9-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
 msgstr "10-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
 msgstr "11-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
 msgstr "12-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
 msgstr "13-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
 msgstr "14-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
 msgstr "15-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
 msgstr "16-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
 msgstr "17-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
 msgstr "18-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
 msgstr "19-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
 msgstr "20-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
 msgstr "21-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
 msgstr "22-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
 msgstr "23-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
 msgstr "24-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
 msgstr "25-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
 msgstr "26-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
 msgstr "27-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
 msgstr "28-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
 msgstr "29-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
 msgstr "30-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
 msgstr "31-ÚÛØÙØ"
 
 #: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+msgctxt "Priority"
 msgid "High"
 msgstr "ÙÛÙÙØÙ"
 
 #: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+msgctxt "Priority"
 msgid "Normal"
 msgstr "ÙÙØÙØÙ"
 
 #: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+msgctxt "Priority"
 msgid "Low"
 msgstr "ØÛÛÛÙ"
 
 #. An empty string is the same as 'None'.
 #: ../calendar/libecal/e-cal-util.c:702
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ØÛÙÙÙÙÙÙÙØÙØ"
 
-#: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:427
-#: ../libedataserverui/e-client-utils.c:758
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙÙÙØÙÛ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:874
+#: ../calendar/libedata-cal/e-cal-backend.c:207
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr ""
-"%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
-
-#: ../calendar/libecal/e-cal.c:4432
-msgid "Repository is offline"
-msgstr "ØÛØÙÙÛ ØÙØØØ ÙÙÙ"
-
-#: ../calendar/libecal/e-cal.c:4434
-msgid "No such calendar"
-msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
-
-#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:418
-msgid "Object not found"
-msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
-
-#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:419
-msgid "Invalid object"
-msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
-
-#: ../calendar/libecal/e-cal.c:4440
-msgid "URI not loaded"
-msgstr "URI ØÙÙÛÙÙÙØØÙ"
-
-#: ../calendar/libecal/e-cal.c:4442
-msgid "URI already loaded"
-msgstr "URI ØÙÙÛÙØØÙ"
-
-#: ../calendar/libecal/e-cal.c:4446
-msgid "Unknown User"
-msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
-
-#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:420
-msgid "Object ID already exists"
-msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
-
-#: ../calendar/libecal/e-cal.c:4450
-msgid "Protocol not supported"
-msgstr "ÙÛÙÙØÙÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
-
-#: ../calendar/libecal/e-cal.c:4452
-msgid "Operation has been canceled"
-msgstr "ÙÛØØÛÙØØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
-
-#: ../calendar/libecal/e-cal.c:4454
-msgid "Could not cancel operation"
-msgstr "ÙÛØØÛÙØØØÙÙ ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
-
-#: ../calendar/libecal/e-cal.c:4456
-msgid "Authentication failed"
-msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../calendar/libecal/e-cal.c:4458
-#: ../camel/providers/smtp/camel-smtp-transport.c:795
-msgid "Authentication required"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
-
-#: ../calendar/libecal/e-cal.c:4460
-msgid "A D-Bus exception has occurred"
-msgstr "ØÙØ D-Bus ÙÛØØÛØÙØ ÙÛØÛÙØÙ"
+msgid "Unknown calendar property '%s'"
+msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%sÂ"
 
-#: ../calendar/libecal/e-cal.c:4464
-msgid "No error"
-msgstr "ØØØØÙÙÙ ÙÙÙ"
+#: ../calendar/libedata-cal/e-cal-backend.c:219
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
@@ -1478,133 +1510,119 @@ msgstr ""
 "ØÙØÙØ ÙØØØÙÛØÙØÙÙÚ boolean ØÙÙÛØÙ ÛÛ ÙÙÙÙÙØÙÙÙÚ false (#f) ØÙÙÛØÙÙÙ ØÛÙÛÙ "
 "ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
-msgid "Cannot process, calendar backend is opening"
-msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙÙÙØÙÛ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:206
-#, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%sÂ"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:218
-#, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Invalid range"
 msgstr "ØÙÙØÛÛØØÙØ ØØØÙØÛ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÛØÛÙ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Unknown user"
 msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:907
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:928
+#: ../calendar/libedata-cal/e-data-cal.c:930
 msgid "Cannot remove calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:953
+#: ../calendar/libedata-cal/e-data-cal.c:955
 msgid "Cannot refresh calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:977
+#: ../calendar/libedata-cal/e-data-cal.c:979
 msgid "Cannot retrieve backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1023
+#: ../calendar/libedata-cal/e-data-cal.c:1025
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1048
+#: ../calendar/libedata-cal/e-data-cal.c:1050
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1073
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÙÙÙÙØÙÙÙÙÚ ØÙÙØØ/ØØÙØÙØØØ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1099
+#: ../calendar/libedata-cal/e-data-cal.c:1101
 msgid "Cannot create calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1126
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot modify calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1154
+#: ../calendar/libedata-cal/e-data-cal.c:1156
 msgid "Cannot remove calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1179
 msgid "Cannot receive calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÙÙØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1202
+#: ../calendar/libedata-cal/e-data-cal.c:1204
 msgid "Cannot send calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1229
+#: ../calendar/libedata-cal/e-data-cal.c:1231
 msgid "Could not retrieve attachment uris: "
 msgstr "ÙÙØÛÙÙÙÙÙÚ uris ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1253
-msgid "Could not discard alarm: "
-msgstr "ÙÙÙÙØÙÛ ÚÛØÛÙÙÙÙ ÙÙÙ ÙÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
+#: ../calendar/libedata-cal/e-data-cal.c:1255
+msgid "Could not discard reminder: "
+msgstr "ØÛØÙÛØØÙÛÚÙÙ ØØØÙÙÛÛØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1277
+#: ../calendar/libedata-cal/e-data-cal.c:1279
 msgid "Could not get calendar view path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛØÛÙÙÛ ÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1302
+#: ../calendar/libedata-cal/e-data-cal.c:1304
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1324
+#: ../calendar/libedata-cal/e-data-cal.c:1326
 msgid "Could not add calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:379
+#: ../calendar/libedata-cal/e-data-cal-factory.c:383
 #, c-format
 msgid "Invalid call"
 msgstr "ØÙÙØÛÛØØÙØ ÚØÙÙØÙØ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:420
+#: ../calendar/libedata-cal/e-data-cal-factory.c:424
 #, c-format
 msgid "Invalid URI"
 msgstr "ØÙÙØÛÛØØÙØ URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:438
+#: ../calendar/libedata-cal/e-data-cal-factory.c:442
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Â%2$s ØØ ÙÙØØÛØÛÙ Â%1$s ÙÙÚ ØØØÙØ ØÛÚ ØØÛÛØÙ ÙÙÙ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:481
+#: ../calendar/libedata-cal/e-data-cal-factory.c:485
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "backend ÙÙÚ ØÛÙÚÙØÙÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
@@ -1661,11 +1679,6 @@ msgstr "ØÛÙÙÛÙ ÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ØÛÙÙÛÙØÙÙÙ ÙÙØÚÛÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/camel-db.c:470
-#, c-format
-msgid "Insufficient memory"
-msgstr "ØÛØÙÛÙ ÙÛØÙÙØÙ"
-
 #: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
@@ -1693,36 +1706,36 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÛÙ ÙØÙØØ ÙÛØÛÙØØØÙØØ"
 
-#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:406
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ Â%s ÙÙ ØÛÙÙØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 "ØÙØØÙØ ÚØÙÛØØÙÙÙ ÙÛØØÛÙØØØØ ØÙØÙÙØÙØ ØÛÚÛÙ ÙÙØÙÛÚ ÙÛØÙÛÙÙÙÙ ÙÛØÙÙÙÙÛ ÙÛÚÛØÙØÛ"
 
-#: ../camel/camel-disco-store.c:436
-#: ../camel/providers/imap/camel-imap-store.c:1180
-#: ../camel/providers/imap/camel-imap-store.c:1832
-#: ../camel/providers/imap/camel-imap-store.c:2315
-#: ../camel/providers/imap/camel-imap-store.c:3136
-#: ../camel/providers/imapx/camel-imapx-folder.c:298
-#: ../camel/providers/imapx/camel-imapx-folder.c:331
-#: ../camel/providers/imapx/camel-imapx-folder.c:385
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../camel/providers/imapx/camel-imapx-folder.c:465
-#: ../camel/providers/imapx/camel-imapx-folder.c:505
-#: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:258
-#: ../camel/providers/imapx/camel-imapx-store.c:1276
-#: ../camel/providers/imapx/camel-imapx-store.c:1364
-#: ../camel/providers/imapx/camel-imapx-store.c:1404
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1153
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imap/camel-imap-store.c:3171
+#: ../camel/providers/imapx/camel-imapx-folder.c:311
+#: ../camel/providers/imapx/camel-imapx-folder.c:344
+#: ../camel/providers/imapx/camel-imapx-folder.c:398
+#: ../camel/providers/imapx/camel-imapx-folder.c:444
+#: ../camel/providers/imapx/camel-imapx-folder.c:478
+#: ../camel/providers/imapx/camel-imapx-folder.c:518
+#: ../camel/providers/imapx/camel-imapx-folder.c:554
+#: ../camel/providers/imapx/camel-imapx-store.c:238
+#: ../camel/providers/imapx/camel-imapx-store.c:1278
+#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imapx/camel-imapx-store.c:1412
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ØÙØØØ ØÛÙØÙÙÙØØ ØÛ ÙÛØØÛÙØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
@@ -1806,11 +1819,53 @@ msgstr "(system-flag) ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØ
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag)ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-filter-search.c:790 ../camel/camel-filter-search.c:799
+#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ØÛØÚÛÚÙÛÙ ØÙØØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
+#: ../camel/camel-folder.c:243
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ spam ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:283
+#, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ ham ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:331
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙ ØÛØÛÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:898
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ØÛÚÛØÙØØ ÙÛØÙÙÙÙÛØØÙØÛ."
+
+#: ../camel/camel-folder.c:901
+msgid "Copying messages"
+msgstr "ØÛÚÛØÙØØ ÙÛÚÛØÛÙÛÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:1156
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr "ÙÙØÙÛÚ Â%s ØØ ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../camel/camel-folder.c:3265
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "ØÛÚÛØ Â%s ÙÙ %s ØÙÙ ØÙÙÛÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:3390
+#, c-format
+msgid "Retrieving quota information for '%s'"
+msgstr "Â%s  ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙÙÛÛØØÙØÛ"
+
 #: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
@@ -1831,73 +1886,36 @@ msgstr ""
 "ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÙØØØ ÙÙÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ØØ ÙÙÚÙÙÙÙÙÙ ÙÛØÙØÛ ÙÛØÛÙ"
 
-#: ../camel/camel-folder-search.c:938
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÙÙ %s ÙÙÚ ØÙÚÙØÛ ØÙØÙÙØÙØÙÛ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:948 ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ØØ ØÙØØÛØ ØÙÙÙÙÙ ÙÛØØÙØÙÙ ØÛØÙØÙØØÙ ØÛÙÙØØ ÙÛØÛÙ"
 
-#: ../camel/camel-folder-search.c:978
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ØÙØÙÙ ÙØÙØÛØÛØÙÙ ØØØØÛ ÙÙÙÙØÛ"
 
-#: ../camel/camel-folder-search.c:987
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:994
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ØØ ÙÙØÙÛÚ ØÙÙÙÙÙÙ ÙÛØÛÙ"
 
-#: ../camel/camel-folder.c:236
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ spam ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
-
-#: ../camel/camel-folder.c:271
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ ham ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
-
-#: ../camel/camel-folder.c:312
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "'%s' ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙ ØÛØÛÛØØÙØÛ"
-
-#: ../camel/camel-folder.c:870
-#: ../camel/providers/local/camel-maildir-folder.c:318
-msgid "Moving messages"
-msgstr "ØÛÚÛØÙØØ ÙÛØÙÙÙÙÛØØÙØÛ."
-
-#: ../camel/camel-folder.c:873
-msgid "Copying messages"
-msgstr "ØÛÚÛØÙØØ ÙÛÚÛØÛÙÛÛØØÙØÛ"
-
-#: ../camel/camel-folder.c:1128
-#, c-format
-msgid "Quota information not supported for folder '%s'"
-msgstr "ÙÙØÙÛÚ Â%s ØØ ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
-
-#: ../camel/camel-folder.c:3235
-#, c-format
-msgid "Retrieving message '%s' in %s"
-msgstr "ØÛÚÛØ Â%s ÙÙ %s ØÙÙ ØÙÙÛÛØØÙØÛ"
-
-#: ../camel/camel-folder.c:3359
-#, c-format
-msgid "Retrieving quota information for '%s'"
-msgstr "Â%s  ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙÙÛÛØØÙØÛ"
-
 #: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
 #: ../camel/camel-gpg-context.c:1272
 #, c-format
@@ -1905,7 +1923,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "gpg ÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
 #: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
@@ -1955,11 +1973,11 @@ msgstr "Â%s ØØ ÙÙØØÛØÛÙ GnuPG ÙÙÚØÙÙ ØÙÙÙØÙÙÛ ØØÙ
 
 #: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:5025
-#: ../camel/providers/imapx/camel-imapx-server.c:5042
-#: ../camel/providers/imapx/camel-imapx-store.c:179
+#: ../camel/providers/imapx/camel-imapx-server.c:4951
+#: ../camel/providers/imapx/camel-imapx-server.c:4968
+#: ../camel/providers/imapx/camel-imapx-store.c:159
 #: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../libedataserverui/e-book-auth-util.c:227
+#: ../libedataserverui/e-book-auth-util.c:221
 #, c-format
 msgid "Cancelled"
 msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
@@ -2024,25 +2042,9 @@ msgstr "MIME ÙØØÚÙØÙÙÙ ØÙÙÙØØÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ:
 msgid "Encrypted content"
 msgstr "ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "locking helper ÙÙÚ pipe ÙÙ ÙØØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
-
-#: ../camel/camel-lock-client.c:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "locking helper ÙÙ ØØÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
-
-#: ../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 ÙÙ ÙÛÙÛÙÙÙØÙÙÙ ØÙÙÙÙØÙ: lock-helper ÙÛÙÙØÙÙÙ ØØØØ"
-
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Â%s ÙÛÙÛÙÙÙÙØÙÙÙØÙ"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2066,6 +2068,26 @@ msgstr "fcntl(2) ÙÙ ØÙØÙÙØÙÙ ÙÛÙÛÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ:
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) ÙÙ ØÙØÙÙØÙÙ ÙÛÙÛÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "locking helper ÙÙÚ pipe ÙÙ ÙØØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "locking helper ÙÙ ØØÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
+
+#: ../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 ÙÙ ÙÛÙÛÙÙÙØÙÙÙ ØÙÙÙÙØÙ: lock-helper ÙÛÙÙØÙÙÙ ØØØØ"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Â%s ÙÛÙÛÙÙÙÙØÙÙÙØÙ"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2135,6 +2157,20 @@ msgstr "ØÙÙØØ ÙÙÙ"
 msgid "parse error"
 msgstr "ØÛÚÙÙÙ ÙÙÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%s ØÙÙÛÙ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "SSL ÙÙÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ)"
+
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: "
+
 #: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
@@ -2162,7 +2198,7 @@ msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 msgid "Name lookup failed: %s"
 msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/camel-offline-folder.c:198
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÙÙØÙÛÚ Â%s ØÙÙÙ ØÛÚÛØÙØØ ÙÛØÛÙØØØÙØÙ ØÙØÙÙØØ ØØÙÙØÛØØÙØÛ"
@@ -2196,7 +2232,7 @@ msgstr "%s ÙÙ ØÙÙÛÙØÙÙÙØÙ: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙØÛ ØÛØÙÛÙÙÛØØÛØÛØ ÙÛÙÙØÙÙÙØÙ ÙÙÙ."
 
-#: ../camel/camel-provider.c:391 ../camel/camel-session.c:332
+#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÙÛÙÙØÙÙ Â%s ÙÙÚ ØÛÙÙÙÙÙÚÛÚÙØÙ ÙÙÙ"
@@ -2370,7 +2406,7 @@ msgstr "ÙØÙØÙÙØÙØØÙ ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÛØÛÙ
 
 #: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
 #: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1267
+#: ../camel/providers/smtp/camel-smtp-transport.c:1228
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÛØØÙ ØØØØ."
@@ -2441,27 +2477,27 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÙÛÙØÙØÙÙ ØÙÙØØÙÙÙ ØÛÚØÙØÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/camel-service.c:487
+#: ../camel/camel-service.c:526
 #, c-format
 msgid "URL '%s' needs a user component"
 msgstr "URL '%s' ØÛÚÛÙ ØÙØ ØÙØÙÛØÙÛÚÙ ØÛÙÙÙÙ ØÙÙÛØÙ ÙÛØÛÙ"
 
-#: ../camel/camel-service.c:498
+#: ../camel/camel-service.c:537
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ØÛÚÛÙ ØØØØØÙÙ ÙØØÙÙØ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
 
-#: ../camel/camel-service.c:509
+#: ../camel/camel-service.c:548
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ØÛÚÛÙ ÙÙÙ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
 
-#: ../camel/camel-session.c:342
+#: ../camel/camel-session.c:361
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÙÛÙÙØÙÙ Â%s ØÛÚÛÙ ØÛØÙÙØÙÙÚÛÙ GType ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-session.c:853
+#: ../camel/camel-session.c:938
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ."
@@ -2656,55 +2692,59 @@ msgstr "ÙÙØÙÙØÛÚÙØ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙØÛØ ÙÛØÙÛÙ
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ØÙÙÙØØÙØÙØØ: ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/camel-store.c:2087
+#: ../camel/camel-store.c:1814
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:2131
+#: ../camel/camel-store.c:1857
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÙÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2320
+#: ../camel/camel-store.c:2044
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Â%s ØØ ÙÙØÙÛÚÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2332 ../camel/camel-store.c:2342
+#: ../camel/camel-store.c:2056 ../camel/camel-store.c:2066
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ØÛØÙÛØØØÙØ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2335 ../camel/camel-store.c:2346
+#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ØÛØÙÛØ"
 
-#: ../camel/camel-store.c:2797
+#: ../camel/camel-store.c:2521
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s:ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:2811
+#: ../camel/camel-store.c:2535
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2929 ../camel/camel-vee-store.c:346
+#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
 
-#: ../camel/camel-store.c:3072 ../camel/camel-vee-store.c:396
+#: ../camel/camel-store.c:2796 ../camel/camel-vee-store.c:400
 #: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
 
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr "CamelStreamFilter ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
+
 #: ../camel/camel-stream-process.c:265
 #, c-format
 msgid "Connection cancelled"
@@ -2886,17 +2926,18 @@ msgstr "%2$s ÙÙÚØØ  %1$s ØÛÚÛØ ÙÙÙ"
 msgid "Error storing '%s': "
 msgstr "'%s' ÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ "
 
-#: ../camel/camel-vee-store.c:125 ../camel/camel-vee-store.c:130
-#: ../camel/camel-vee-store.c:297
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "ÙØØÙØØÙÙØÙ"
 
-#: ../camel/camel-vee-store.c:372
+#: ../camel/camel-vee-store.c:376
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/camel-vee-store.c:406
+#: ../camel/camel-vee-store.c:410
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
@@ -2960,67 +3001,67 @@ msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙÙÙÚ ØØÛØØÙÙÙÚ ØÙÚÙØÛ %s 
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ OK ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:293
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
 msgstr "ØÛ ÙÙØÙÛÚØÙÙÙ ÙÛÚÙ ØÛØÙÛØÙÙ ØØØÙÙ ØÛÙØÛØ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:368
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÙÛÙØÛØÙØÛ %s ÙÛØÛØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:391
+#: ../camel/providers/imap/camel-imap-folder.c:393
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ÙÙÚ ØÛØÛÙØÙØÙÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:4028
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:4007
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ØÙÙÙ ØÛØÚÛØØÙÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3380
+#: ../camel/providers/imap/camel-imap-folder.c:3454
 msgid "Unable to retrieve message: "
 msgstr "ØÛÚÛØÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ. "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3415
-#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#: ../camel/providers/imap/camel-imap-folder.c:3489
+#: ../camel/providers/imapx/camel-imapx-server.c:5280
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÙÙÙÙÙÙÙ %s ØÙÙØØÙ ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3416
-#: ../camel/providers/imapx/camel-imapx-server.c:5359
+#: ../camel/providers/imap/camel-imap-folder.c:3490
+#: ../camel/providers/imapx/camel-imapx-server.c:5281
 msgid "No such message available."
 msgstr "ØÛÙØØÙ ØÛÚÛØ ÙÙÙ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3491
-#: ../camel/providers/imap/camel-imap-folder.c:4391
+#: ../camel/providers/imap/camel-imap-folder.c:3565
+#: ../camel/providers/imap/camel-imap-folder.c:4483
 #: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "ØÛ ØÛÚÛØ ÚØØÙØ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3975
-#: ../camel/providers/imap/camel-imap-folder.c:4058
-#: ../camel/providers/imapx/camel-imapx-server.c:3984
-#: ../camel/providers/imapx/camel-imapx-server.c:4126
+#: ../camel/providers/imap/camel-imap-folder.c:4067
+#: ../camel/providers/imap/camel-imap-folder.c:4150
+#: ../camel/providers/imapx/camel-imapx-server.c:3965
+#: ../camel/providers/imapx/camel-imapx-server.c:4115
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ØÙÙÙ ÙÛÚÙ ØÛÚÛØ ØÛÚÛÙ ØÛØÛÙØÙ ØÛÚÛØÙØØ ØÛØÙØÙÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4192
+#: ../camel/providers/imap/camel-imap-folder.c:4284
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÚÛÙÙÙØÙÙÙ ØÛÚÛØÙØØ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4202
+#: ../camel/providers/imap/camel-imap-folder.c:4294
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÙÙÚ UID ØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4431
+#: ../camel/providers/imap/camel-imap-folder.c:4523
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ØØÛØØÙØØ ØÛÚÛØ ÚÛÛØÙØÙ ÙÙÙ."
@@ -3155,81 +3196,73 @@ msgstr ""
 "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ "
 "ØØØÙÙÙÙØÛ."
 
-#: ../camel/providers/imap/camel-imap-store.c:255
-#: ../camel/providers/nntp/camel-nntp-store.c:363
-#: ../camel/providers/pop3/camel-pop3-store.c:138
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s ØÙÙÛÙ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:256
-#: ../camel/providers/nntp/camel-nntp-store.c:364
-#: ../camel/providers/pop3/camel-pop3-store.c:139
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
-msgid "SSL unavailable"
-msgstr "SSL ÙÙÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ)"
-
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/nntp/camel-nntp-store.c:382
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: "
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:222
+#: ../camel/providers/imap/camel-imap-store.c:2587
+#: ../camel/providers/imapx/camel-imapx-store.c:333
+#: ../camel/providers/imapx/camel-imapx-store.c:771
+#: ../camel/providers/local/camel-maildir-folder.c:458
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "ÙÙØÛÙÙØØ ØØÙØÛÙÙ"
 
+#: ../camel/providers/imap/camel-imap-store.c:354
 #: ../camel/providers/imap/camel-imap-store.c:381
 #: ../camel/providers/imap/camel-imap-store.c:408
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/imapx/camel-imapx-server.c:2999
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:382
-#: ../camel/providers/imapx/camel-imapx-server.c:3009
-#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:3000
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-store.c:401
-#: ../camel/providers/imapx/camel-imapx-server.c:3047
-#, fuzzy, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3038
+#, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/imap/camel-imap-store.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "ØÛ ÙØØØÙÙÙØØ SSL ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-store.c:757
-#: ../camel/providers/imapx/camel-imapx-server.c:3131
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3132
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-store.c:768
-#: ../camel/providers/imapx/camel-imapx-server.c:3143
-#: ../camel/providers/smtp/camel-smtp-transport.c:433
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-store.c:779
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "Error creating SASL authentication object."
 msgstr "SASL ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛÚÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/providers/imap/camel-imap-store.c:827
-#: ../camel/providers/imapx/camel-imapx-server.c:3187
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3188
 #, c-format
 msgid "You did not enter a password."
 msgstr "ØÙÙ ÙÙØÚÛØÙÙØÙÚÙØ."
 
-#: ../camel/providers/imap/camel-imap-store.c:868
-#: ../camel/providers/imapx/camel-imapx-server.c:3232
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3233
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3240,83 +3273,69 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:928
-#: ../camel/providers/imapx/camel-imapx-store.c:162
+#: ../camel/providers/imap/camel-imap-store.c:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:931
-#: ../camel/providers/imapx/camel-imapx-store.c:165
+#: ../camel/providers/imap/camel-imap-store.c:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ÙÙÚ %s ØÙÙÙ IMAP ÙÛÙØØÙÙÛØÙØÙ"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1402
-#: ../camel/providers/imap/camel-imap-store.c:2486
-#: ../camel/providers/imapx/camel-imapx-store.c:353
-#: ../camel/providers/imapx/camel-imapx-store.c:772
-#: ../camel/providers/local/camel-maildir-folder.c:434
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:293
-msgid "Inbox"
-msgstr "ÙÙØÛÙÙØØ ØØÙØÛÙÙ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1869
-#: ../camel/providers/imap/camel-imap-store.c:2071
-#: ../camel/providers/imapx/camel-imapx-store.c:329
+#: ../camel/providers/imap/camel-imap-store.c:1962
+#: ../camel/providers/imap/camel-imap-store.c:2164
+#: ../camel/providers/imapx/camel-imapx-store.c:309
 #, c-format
 msgid "No such folder %s"
 msgstr "ÚÛØØÛØ ÙÙØÙÛÚ Â%s ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1883
-#: ../camel/providers/imap/camel-imap-store.c:2330
-#: ../camel/providers/imapx/camel-imapx-store.c:1297
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "ÙÙØÙÛÚ ØØØÙ Â%s ØÙÙØÛÛØØÙØØ ÚÛÙÙÙ ØÛÙÙÚ ØÛØÙÙØÙØÛ Â%c ØÛÚÛÙ ÚÛØÙ ØØØ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1947
-#: ../camel/providers/imap/camel-imap-store.c:2394
-#: ../camel/providers/imapx/camel-imapx-store.c:1318
+#: ../camel/providers/imap/camel-imap-store.c:2040
+#: ../camel/providers/imap/camel-imap-store.c:2495
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ØØØØ ÙÙØÙÛÚ ØØÙØ ÙÙØÙÛÚÙÙÚ ØÙÙÛØÙØØ ÙÙÙ ÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2000
+#: ../camel/providers/imap/camel-imap-store.c:2093
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:409
-#: ../camel/providers/local/camel-mh-store.c:528
+#: ../camel/providers/local/camel-mbox-store.c:416
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2343
-#: ../camel/providers/imapx/camel-imapx-store.c:1308
+#: ../camel/providers/imap/camel-imap-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ØØØØ ÙÙØÙÛÚ ÙØÙÛÙÛÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3179
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3182
+#: ../camel/providers/imap/camel-imap-store.c:3217
 msgid "Server unexpectedly disconnected: "
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "ÙÙØÙÛÚ %s ÚÛÙÙÙØÛ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%s ØÛÙÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
@@ -3349,31 +3368,26 @@ msgstr "ÙÛÚÛÙØÙÙÙ IMAP ØÛØÙØÙ"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1488
+#: ../camel/providers/imapx/camel-imapx-server.c:1476
 msgid "Error writing to cache stream: "
 msgstr "ØÛÙÙÛÙ ØÛÙÙÙÙØØ ÙÛØÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2172
+#: ../camel/providers/imapx/camel-imapx-server.c:2182
 #, c-format
 msgid "Not authenticated"
 msgstr "ØØÙØÚÙÙÙØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2931
-#, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "%s (ØÛØÙØ %s) ØØ ØØØÙÙÙØÙÙÙØÙ: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3414
+#: ../camel/providers/imapx/camel-imapx-server.c:3405
 msgid "Closing tmp stream failed: "
 msgstr "tmp ØÛÙÙÙÙÙÙ ÙÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5504
-#: ../camel/providers/imapx/camel-imapx-server.c:5519
+#: ../camel/providers/imapx/camel-imapx-server.c:5426
+#: ../camel/providers/imapx/camel-imapx-server.c:5441
 msgid "Cannot create spool file: "
 msgstr "spool ÚÛØØÙØÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1093
-#: ../camel/providers/nntp/camel-nntp-store.c:1705
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1704
 #, c-format
 msgid "No such folder: %s"
 msgstr "ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ: %s"
@@ -3404,7 +3418,7 @@ msgstr "ØÛØØØÙ: %s (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:466
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "ØÛÚÛØ ÚÛÛØÙØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙØÛÙØÙØ"
 
@@ -3442,7 +3456,7 @@ msgstr ""
 "ØØØÙÛØÙØÙØØÙ ÙÙØÙÛÚÙØ ÙÛØÙÛÙØÛ."
 
 #: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
 msgstr "ØÛØØØÙ(INBOX) ØÙÙÙ ÙÛÚÙ ØÛØÙÛØÚÛ ØÛØÚÛÚÙÙ ÙÙÙÙØÙ(_A)"
 
@@ -3454,16 +3468,16 @@ msgstr "Maildir ÙÙØÙØØÙØÙÙÙ ØÛØ ÙÛÙØÛØÙØÙÙÙØÙ"
 msgid "For storing local mail in maildir directories."
 msgstr "ÙÛØÙÙÙ ØÛØÙÛØÙÙ maildir ÙÛÙØÛØÙØÙØÙØÛ ØØÙÙØØ ØÛÚÛÙ."
 
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "ÚØÙÛØ ÙÛØÙÙÙ Elm/Pine/Mutt ÙÙØÙØØÙØØ ØØÙÙØ(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:114
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÚÛØØÙØÙ"
 
-#: ../camel/providers/local/camel-local-provider.c:115
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3472,71 +3486,71 @@ msgstr ""
 "ØÙØØØØÙØ ElmØ Pine ÙØÙÙ Mutt ØÛØÙÛØÙØÙÙÙ ÙÛÙØÛØÙØÛ ØØØÙÙ ØÙÙÛØÙÙÙÛ "
 "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÛ"
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÙÛÙØÛØÙØÙØÙ"
 
-#: ../camel/providers/local/camel-local-store.c:177
-#: ../camel/providers/local/camel-local-store.c:322
+#: ../camel/providers/local/camel-local-store.c:92
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "ÙÙØÙÛÚ %s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
+
+#: ../camel/providers/local/camel-local-store.c:204
+#, c-format
+msgid "Local mail file %s"
+msgstr "ÙÛØÙÙÙ ØÛØ ÚÛØØÙØÙ %s"
+
+#: ../camel/providers/local/camel-local-store.c:235
+#: ../camel/providers/local/camel-local-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:519
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-spool-store.c:571
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛØÙÛÙ ÙÙÙ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:186
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛÙØÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:197
-#: ../camel/providers/local/camel-local-store.c:207
-#: ../camel/providers/local/camel-local-store.c:335
+#: ../camel/providers/local/camel-local-store.c:255
+#: ../camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:390
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÙÛØÙÙÙ ØØÙÙÙØÛÚØØ inbox ÙÙÙ"
 
-#: ../camel/providers/local/camel-local-store.c:284
-#, c-format
-msgid "Local mail file %s"
-msgstr "ÙÛØÙÙÙ ØÛØ ÚÛØØÙØÙ %s"
-
-#: ../camel/providers/local/camel-local-store.c:396
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ÙÙØÙÛÚ %s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
-
-#: ../camel/providers/local/camel-local-store.c:470
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ"
-
-#: ../camel/providers/local/camel-local-store.c:501
-#: ../camel/providers/local/camel-mbox-store.c:688
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÙÙØÙÛÚ ØÙÙØÛÙØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-local-store.c:529
-#: ../camel/providers/local/camel-mbox-store.c:717
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ÙÙØÙÛÚ ÙÛØØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
+#: ../camel/providers/local/camel-local-store.c:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ"
+
 #: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ØÛÚÛØÙÙ ÙÙØÙÙÚÛ ÙÛØÙÛÙØØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: ØÛÛÛØÙ ÙØÙÛÙÛÙ"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-maildir-folder.c:333
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:325
 #: ../camel/providers/local/camel-mh-folder.c:156
@@ -3575,22 +3589,22 @@ msgstr "ÙÙØÙÛÚ %s ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:398
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ÙÙØÙÛÚ ÙÛØØÙÙÙØÙ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:343
-#: ../camel/providers/local/camel-mh-store.c:488
+#: ../camel/providers/local/camel-mbox-store.c:350
+#: ../camel/providers/local/camel-mh-store.c:502
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:353
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mbox-store.c:360
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ ØÛÙÛØ."
@@ -3602,7 +3616,7 @@ msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: maildir ÙÛÙØ
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:606
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ: %s"
@@ -3613,8 +3627,8 @@ msgstr "maildir ÙÛÙØÛØÙØÙØÙ ØÛÙÛØ"
 
 #: ../camel/providers/local/camel-maildir-store.c:510
 #: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:144
-#: ../camel/providers/local/camel-spool-store.c:160
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÙØÛØÛÙÙÙØÙ: %s"
@@ -3641,8 +3655,8 @@ msgstr "ÙÛÚÙ ØÛÚÛØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:699
-#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-mbox-summary.c:844
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ÙÙØÙÛÚÙØ ØØÙÙØÛØØÙØÛ"
@@ -3662,39 +3676,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÙÙØÙÛÚ ØÛØÙÙÚÛ ÙÛÙØÛØÚÙÙÙ ØÙÙÙÙØÛØÛÙ ØÛØÙØÙØÛ ØÛØÛÙÛÙØÛ."
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:71
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ØÛÚÛÙ ÙÙØÙÛÚÙÙÚ ÙÛÙÛÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mbox-store.c:527
+#: ../camel/providers/local/camel-mbox-store.c:372
+#: ../camel/providers/local/camel-mbox-store.c:542
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ØÛ ØØØÙÙ ØÙØÙÙØÙÙ ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:402
+#: ../camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:543
+#: ../camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:559
+#: ../camel/providers/local/camel-mbox-store.c:574
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:561
+#: ../camel/providers/local/camel-mbox-store.c:576
 msgid "Folder already exists"
 msgstr "ÙÙØÙÛÚ ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
-#: ../camel/providers/local/camel-mbox-store.c:602
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:644
+#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:661
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3703,33 +3717,33 @@ msgstr ""
 "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:625
+#: ../camel/providers/local/camel-mbox-store.c:642
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ÙÛÙØÙØÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:634
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÙÙØÙÛÚ '%s' ÙÛØÛÙ ØÛÙÛØ. ØÛÚÛØÛÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:660
-#: ../camel/providers/local/camel-mbox-store.c:674
+#: ../camel/providers/local/camel-mbox-store.c:678
+#: ../camel/providers/local/camel-mbox-store.c:693
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÙÙØÙÛÚÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:753
+#: ../camel/providers/local/camel-mbox-store.c:775
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÙÛÚÙ ÙÙØÙÛÚ ØØØÙ ØÙØØØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:768
+#: ../camel/providers/local/camel-mbox-store.c:791
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ Â%s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:851
+#: ../camel/providers/local/camel-mbox-store.c:874
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
@@ -3749,43 +3763,43 @@ msgstr "ÙÙØÙÛÚ %2$s ÙÙÚ %1$s ØÛØØØÙÙØØ ØÛØÙØ ØÛÚÙÙÙ
 msgid "Cannot check folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-mbox-summary.c:713
+#: ../camel/providers/local/camel-mbox-summary.c:853
 #: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÚÛØØÛØÙÙ ØØÚØÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:727
 #: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-mbox-summary.c:964
+#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:969
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÙÛÙØÛ ÙÙØÙÛÚÙ %s ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:755
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÛØÙÙØÙÙÙ ÙÙØÙÛÚ ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:767
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:862
-#: ../camel/providers/local/camel-mbox-summary.c:1129
+#: ../camel/providers/local/camel-mbox-summary.c:867
+#: ../camel/providers/local/camel-mbox-summary.c:1134
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:901
-#: ../camel/providers/local/camel-mbox-summary.c:1160
+#: ../camel/providers/local/camel-mbox-summary.c:906
+#: ../camel/providers/local/camel-mbox-summary.c:1165
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3794,25 +3808,25 @@ msgstr ""
 "MBOX ÚÛØØÙØÙ ØÛØÛÙÛÙØÛØ ØÛØÙØÙÚ.(From ØÛÚÛÙ ÙÛØ ØÙÙÛØÙ ÙÛØÛÙ ØÙØÙØ ØÙØØÙ ÙÙÙ "
 "ØÙÙÛÙ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:910
-#: ../camel/providers/local/camel-mbox-summary.c:1169
+#: ../camel/providers/local/camel-mbox-summary.c:915
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÙÛØÛÙØØØÙÙØØÙ ØÙÙØÙÙÛØ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ØÙÙÛÙ ÙÛÙØÛØÙØÛ ÙØØÙØØÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:1080
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1239
-#: ../camel/providers/local/camel-mbox-summary.c:1269
+#: ../camel/providers/local/camel-mbox-summary.c:1244
+#: ../camel/providers/local/camel-mbox-summary.c:1274
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1258
+#: ../camel/providers/local/camel-mbox-summary.c:1263
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
@@ -3822,12 +3836,12 @@ msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ÙÙØÙÛÚÙØØ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:507
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:521
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØÛØÙØÛ ØÛÙÛØ."
@@ -3837,22 +3851,22 @@ msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØÛØÙØ
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ÙÛÙØÛØÙØÙØÙÙÙÚ ÙÙÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:314
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool ØÛØÙ ÚÛØØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:315
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool ÙÙØÙÛÚÙ ØÛØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:352
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÙÙØÙÛÚ '%s/%s' ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3861,12 +3875,12 @@ msgstr ""
 "ÙÙØÙÛÚ Â%s ÙÙ ØØÚØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:370
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÙÙØÙÛÚ '%s' ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:377
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3875,32 +3889,32 @@ msgstr ""
 "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:387
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ØÛØ ØØÙØÛÙÙ(mailbox) ÚÛØØÙØÙ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "INBOX ÙØ ØØÙÙØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-spool-store.c:437
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ÙÙØÙÛÚÙÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-store.c:452
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ÙÙØÙÛÚÙÙÙÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-store.c:516
+#: ../camel/providers/local/camel-spool-store.c:580
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Spool '%s' ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:530
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Spool '%s' ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
@@ -3938,7 +3952,7 @@ msgstr "ØÙÚÙÙ ØØØØÙÙÙ: UID ÙÙÚ ÙÙØÙØØÙ ØÙÙØÛÛØØÙ
 #: ../camel/providers/nntp/camel-nntp-folder.c:241
 #: ../camel/providers/nntp/camel-nntp-folder.c:245
 #: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:681
+#: ../camel/providers/pop3/camel-pop3-folder.c:692
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ %s: %s"
@@ -4007,32 +4021,32 @@ msgstr ""
 "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ NNTP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙ "
 "ØÙØÙÙØÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:85
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÛÙ ÙÙÙÙÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:97
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØØÙØÚÙÙÙØÙÙÙ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:395
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ØÙÙ ÙÛÙÚÛÙ ØØÙØÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:408
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØØØØÙÙÙ ÙÙØÙ %d ÙØÙØÙÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:608
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ØØØÙÙÙÙÙ ÙÛÙÚÛÙ USENET ØÛÛÛØÙÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1115
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4043,7 +4057,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1230
+#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "News store ÙÙÚ ØÙÚÙÚÛ ÙÛÚÙ ÙÙØÙÛÚ ÙÛØØÙÙØÙØÙØ: ÙÛØØÛØÙ ØÙÙÛÚ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÛÙØÙØ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚÙÙ ÚÙÙÙØÙÛÛØÛÙÙÛÙØÙØ. ÙÛØØÛØÙ ØÙÙÙÙØÙÚÙØÙØ "
+"ØÙÙÙØÛ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4054,7 +4085,7 @@ msgstr ""
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÙÙ. ØØÙÙØÙØÙÙÙ ØÛÙÙÙÙ ØØØØ ÙÙØÙÛÚ ØÙÙÛØÙ ÙÛÙÙÙÙ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1272
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4065,28 +4096,11 @@ msgstr ""
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1305
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "News store ÙÙÚ ØÙÚÙÚÛ ÙÛÚÙ ÙÙØÙÛÚ ÙÛØØÙÙØÙØÙØ: ÙÛØØÛØÙ ØÙÙÛÚ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1321
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÛÙØÙØ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1338
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚÙÙ ÚÙÙÙØÙÛÛØÛÙÙÛÙØÙØ. ÙÛØØÛØÙ ØÙÙÙÙØÙÚÙØÙØ "
-"ØÙÙÙØÛ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1574
+#: ../camel/providers/nntp/camel-nntp-store.c:1573
 msgid "NNTP Command failed: "
 msgstr "NNTP ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1648
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 #, c-format
 msgid "Not connected."
 msgstr "ØØØÙØÙÙÙØØÙ."
@@ -4132,21 +4146,21 @@ msgid "Retrieving POP summary"
 msgstr "POP ÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙÙÙÙ ØÙÙÛÛØØÙØÛ"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:485
-#, fuzzy
-#| msgid "Cannot get POP summary: %s"
 msgid "Cannot get POP summary: "
-msgstr "POP ÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙÙØØ ØÛØÙØÙÙÙÙ ØÙÙÙÙØÙ: %s"
+msgstr "POP ÙÙÚ ØÛØÛÙØÙØÙÚÛ ØÛØÙØÛÙÙÙØÙ: %s "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "ÙÙÙØ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:556
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 msgid "Expunging deleted messages"
 msgstr "ØÛÚÛØÛÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#, fuzzy
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "ØÛÚÛØ ØØÙÙÙØÛÚ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
@@ -4204,43 +4218,42 @@ msgstr ""
 "ØÙØÙÛØÙÛÚÙÙÛØ ØÙØÙÙØÛÙÙÛØÙÙÙÙ ÙÛÙÙÙÙ."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØÙÙØÛÛØÙÙÙ ØØÙØÙÙÙ ØÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:201
-#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:202
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "ÙÛÙØØÙÙÛØÙØ STLS ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:220
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØ (mode%s) ØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:233
-#, fuzzy, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
-msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "ØÛ ÙØØØÙÙÙØØ TLS ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:329
-#: ../camel/providers/pop3/camel-pop3-store.c:502
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4250,22 +4263,22 @@ msgstr ""
 "ÙÛØØÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "SASL '%s' ØÙØÙÙØÙÙ POP ÙÛÙØØÙÙÛØÙØ %s%s ØØ ÙÙØÛÙÙÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙØØ ÙÙØÚÙÙÙ ØÙÙÙÙØÙ%s: SASL ÙÛÙÙØÙÙÙ ØØØØ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:396
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4275,20 +4288,17 @@ msgstr ""
 "ØØÙØÛØÛÛØÙØÙ. ÙÙÙØØÙØÙØØÙ ÚÛØÛÙ ØÛÙ ÙØØØØÙØ ØÙÙÙØÛ. ØØØÙÛØØÛÚÙ ØÙÙÛÙ ØØÙØÙÛ "
 "ÙÙÙÙÚ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:515
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:427
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
 msgstr ""
 "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
-"ØÙÙÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
+"ØÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ "
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4298,7 +4308,7 @@ msgstr ""
 "ØÙØÙÛØÙÛÚÙ ØØØÙ %s ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4307,27 +4317,27 @@ msgstr ""
 "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
 "ØÙÙ %s ÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:580
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:583
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s ÙÙÚ %s ØÙÙÙ POP3 ÙÛÙØØÙÙÛØÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:714
+#: ../camel/providers/pop3/camel-pop3-store.c:626
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙÙÙØÙÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:741
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "`%s' ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:758
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ØØÙÙÙØÛÚÙØØ ÙÙØÙÛÚ ÙÛØÛÙÙÙØÙ ÙÙÙ"
@@ -4410,46 +4420,45 @@ msgstr ""
 "SMTP ÙÙ ØÙØÙÙØÙÙØ ÙÙØØÙØÙÙÙ mailhub ØØ ØØØÙÙÙÙÙØ ØÛØÙÛØÙÙ ÙÛØÙÛØÛØ ØÛÚÛÙ "
 "ØÙØÙÙØÙÙÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 msgstr "ÙÛØÚØØØ ØÛÚÛÙ ØØÛØØ ØØØØ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:286
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:249
-#: ../camel/providers/smtp/camel-smtp-transport.c:262
-#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:279
-#, fuzzy, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
-msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:366
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ØÛØÙÙØÙÙÙ %s ØØØÙÙÙÙ ÙÛØÙÛØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:421
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:523
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4460,187 +4469,187 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:639
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØØÙÙÛØÙÛ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:646
+#: ../camel/providers/smtp/camel-smtp-transport.c:561
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÛÛØÙÛÚÙÙÙÚ ØØØØÛØÙ ØÙÙØÛÛØØÙØ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
 msgid "Sending message"
 msgstr "ØÛÚÛØ ÙÙÙÙØÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:675
+#: ../camel/providers/smtp/camel-smtp-transport.c:590
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØØÙØÛØÛÙ ØØÙØÛÚÙ ÙÙÙ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:688
+#: ../camel/providers/smtp/camel-smtp-transport.c:603
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙ ØÛÚÛÙØÛ ØÙØ ØØÙØÛØÛÛØÙØÛÚÙ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "ÚØØÙÙØØÙÙÙÙÙÙ ØØØØÙÙÙØ ØÛÙØÛÙ ÙØØÙÙÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "ÙØØØÙÛØÙØØØ ÙØÙÙ ØØÙÙØÙÙÙØØ ÚØØÙÙØØÙÙØ ØØØØÙÙÙÙ ØØØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "ØÛÙØÛÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "ØÛÙØÛÙ ÙØØØÙÛØÙØÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "ØÙØØÛÙØ ÚØÙÙØÙ ÙØÙÙ ØÙØØÛÙØ ÙØØØÙÙÙÙÙÚ ØØÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "ÙØØØÛÙ ØÛÚÛØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "ÙÛÙØØÙÙÛØ ØÛÙÙØØ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØ ÙÙÙÙØØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛØ ÙÛØÙÛØÛØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ÙÙØÙØÙ ØØÙØÙÙØÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:765
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØ: <forward-path> ØØ ÙÙÙÙÙÙÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr ""
 "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÙØØÛØÛÙ ÙÙÙÙØ ØÛØÙØÙÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "User not local; please try <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØØ <forward-path> ÙÙ ØÙÙØÙ ÙÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÙØØÛÙØ ØØÙÙÙØÛÚÙØÙ ÙÛØÙØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:777
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÛÙØÙÙÙÛÙÚÛÙ ØØÙÙØØ ØØØÙØÙØÙØÙÙ ØÛØÙÙ "
 "ÙÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:779
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙ ØØØÙØØ ØÛØØÛØ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:781
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ØÛØ ÙÙØÚÛØÛØÙÙ ØØØÙØÚ. ØØØÙØÙØØØÛØÛØ ØÛÚÛÙ <CRLF>.<CRLF> ÙÙ ÙÙØÚÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:783
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "ØÙØØÛØÛÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:787
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "ØÙÙ ØÛØÚÛØØÙØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:789
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÙ ØØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:791
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÚÛÙ ØÙÙÙØÙØØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:793
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "ÛØÙÙØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1043
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "SMTP ØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1070
-#: ../camel/providers/smtp/camel-smtp-transport.c:1087
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "HELO command failed: "
 msgstr "HELO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1164
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "SMTP ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1183
-#: ../camel/providers/smtp/camel-smtp-transport.c:1194
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "AUTH command failed: "
 msgstr "AUTH ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1338
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1365
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1381
-#: ../camel/providers/smtp/camel-smtp-transport.c:1390
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1432
-#: ../camel/providers/smtp/camel-smtp-transport.c:1442
-#: ../camel/providers/smtp/camel-smtp-transport.c:1452
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1543
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1491
+#: ../camel/providers/smtp/camel-smtp-transport.c:1504
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
 msgid "DATA command failed: "
 msgstr "DATA ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1576
-#: ../camel/providers/smtp/camel-smtp-transport.c:1590
-#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 msgid "RSET command failed: "
 msgstr "RSET ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1623
-#: ../camel/providers/smtp/camel-smtp-transport.c:1637
-#: ../camel/providers/smtp/camel-smtp-transport.c:1644
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
 msgid "QUIT command failed: "
 msgstr "QUIT ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
@@ -4756,107 +4765,112 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ØØÙÙØÛØØÙØÛ"
 
-#: ../libedataserver/e-client.c:106
+#: ../libedataserver/e-client.c:109
 msgctxt "ClientError"
 msgid "Invalid argument"
 msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
 
-#: ../libedataserver/e-client.c:108
+#: ../libedataserver/e-client.c:111
 msgctxt "ClientError"
 msgid "Backend is busy"
 msgstr "Backend ØØÙØÙØØØ"
 
-#: ../libedataserver/e-client.c:110
+#: ../libedataserver/e-client.c:113
 msgctxt "ClientError"
 msgid "Source not loaded"
 msgstr "ÙÛÙØÛ ØÙÙÛÙÙÙØØÙ"
 
-#: ../libedataserver/e-client.c:112
+#: ../libedataserver/e-client.c:115
 msgctxt "ClientError"
 msgid "Source already loaded"
 msgstr "ÙÛÙØÛ ØØÙÙÙÙØÚØÙ ØÙÙÛÙØØÙ"
 
-#: ../libedataserver/e-client.c:114
+#: ../libedataserver/e-client.c:117
 msgctxt "ClientError"
 msgid "Authentication failed"
 msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../libedataserver/e-client.c:116
+#: ../libedataserver/e-client.c:119
 msgctxt "ClientError"
 msgid "Authentication required"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
 
-#: ../libedataserver/e-client.c:118
+#: ../libedataserver/e-client.c:121
 msgctxt "ClientError"
 msgid "Repository offline"
 msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
 
-#: ../libedataserver/e-client.c:120
+#: ../libedataserver/e-client.c:123
 msgctxt "ClientError"
 msgid "Offline unavailable"
 msgstr "ØÙØØÙØ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:125
 msgctxt "ClientError"
 msgid "Permission denied"
 msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:127
 msgctxt "ClientError"
 msgid "Cancelled"
 msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../libedataserver/e-client.c:126
+#: ../libedataserver/e-client.c:129
 msgctxt "ClientError"
 msgid "Could not cancel"
 msgstr "ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../libedataserver/e-client.c:128
+#: ../libedataserver/e-client.c:131
 msgctxt "ClientError"
 msgid "Not supported"
 msgstr "ÙÙÙÙÙÙØÙØÛ"
 
-#: ../libedataserver/e-client.c:130
+#: ../libedataserver/e-client.c:133
 msgctxt "ClientError"
 msgid "Unsupported authentication method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
 
-#: ../libedataserver/e-client.c:132
+#: ../libedataserver/e-client.c:135
 msgctxt "ClientError"
 msgid "TLS not available"
 msgstr "TLS ÙÙÙ"
 
-#: ../libedataserver/e-client.c:134
+#: ../libedataserver/e-client.c:137
 msgctxt "ClientError"
 msgid "Search size limit exceeded"
 msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../libedataserver/e-client.c:136
+#: ../libedataserver/e-client.c:139
 msgctxt "ClientError"
 msgid "Search time limit exceeded"
 msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../libedataserver/e-client.c:138
+#: ../libedataserver/e-client.c:141
 msgctxt "ClientError"
 msgid "Invalid query"
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
 
-#: ../libedataserver/e-client.c:140
+#: ../libedataserver/e-client.c:143
 msgctxt "ClientError"
 msgid "Query refused"
 msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../libedataserver/e-client.c:142
+#: ../libedataserver/e-client.c:145
 msgctxt "ClientError"
 msgid "D-Bus error"
 msgstr "D-Bus ØØØØÙÙÙÙ"
 
-#: ../libedataserver/e-client.c:144
+#: ../libedataserver/e-client.c:147
 msgctxt "ClientError"
 msgid "Other error"
 msgstr "ØØØÙØ ØØØØÙÙÙ"
 
-#: ../libedataserver/e-client.c:147
+#: ../libedataserver/e-client.c:149
+msgctxt "ClientError"
+msgid "Backend is not opened yet"
+msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
+
+#: ../libedataserver/e-client.c:152
 msgctxt "ClientError"
 msgid "Unknown error"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
@@ -4989,13 +5003,13 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:98
-#: ../libedataserverui/e-book-auth-util.c:661
+#: ../libedataserverui/e-book-auth-util.c:94
+#: ../libedataserverui/e-book-auth-util.c:651
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÙ ØÙÙØØØÙØÙØ ØÙÙØØÛØ ÙÙÙÙÛØØÙØÛ"
 
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:422
+#: ../libedataserverui/e-book-auth-util.c:191
+#: ../libedataserverui/e-book-auth-util.c:412
 msgid "Failed to authenticate.\n"
 msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
 
@@ -5047,7 +5061,7 @@ msgid ""
 "name"
 msgstr "ØÛÙÙÙÙÙØÛ Â%s ØÛÚÛÙ ÙØØÛÚÙØÙÙÛ ØØØ ØÙÙÛÙ. ØØØÙØ ØØØ ØÙØÙÙØÙÚ."
 
-#: ../libedataserverui/e-client-utils.c:756
+#: ../libedataserverui/e-client-utils.c:793
 #, c-format
 msgid ""
 "Enter password for %s (user %s)\n"
@@ -5056,11 +5070,11 @@ msgstr ""
 "%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
 "ØÛÛÛØÙ: %s"
 
-#: ../libedataserverui/e-client-utils.c:850
+#: ../libedataserverui/e-client-utils.c:887
 msgid "Enter Passphrase"
 msgstr "ØÙÙ ØÛÙÙÙØÙ ÙÙØÚÛØÛÚ"
 
-#: ../libedataserverui/e-client-utils.c:852
+#: ../libedataserverui/e-client-utils.c:889
 msgid "Enter Password"
 msgstr "ØÙÙ ÙÙØÚÛØÛÚ"
 
@@ -5187,6 +5201,9 @@ msgstr "ÙÙØØÙÙÙ ØØÙÙØØ"
 msgid "_Destination"
 msgstr "ÙÙØØÙ(_D)"
 
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%s (ØÛØÙØ %s) ØØ ØØØÙÙÙØÙÙÙØÙ: "
+
 #~ msgid "No stream available"
 #~ msgstr "ØÛÙÙÙ ÙÙÙ"
 



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