[evolution-data-server/gnome-3-6] Updated Uyghur translation



commit b782bf7c6f23ca9021d7c5fbda4c2c0fc9f57746
Author: Gheyret Kenji <gheyret gmail com>
Date:   Sat Jan 5 15:11:03 2013 +0900

    Updated Uyghur translation
    
    Signed-off-by: Gheyret Kenji <gheyret gmail com>

 po/ug.po | 3974 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2202 insertions(+), 1772 deletions(-)
---
diff --git a/po/ug.po b/po/ug.po
index c1b4e80..2ebb867 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,1080 +8,1168 @@ msgid ""
 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: 2012-02-17 15:28+0000\n"
+"POT-Creation-Date: 2012-11-06 18:01+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "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:125
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4879
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:950
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:432
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
-#: ../calendar/backends/http/e-cal-backend-http.c:437
-#: ../calendar/libecal/e-cal.c:4597 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:515
-#: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:161
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
+#: ../calendar/libecal/e-cal.c:4048 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:525
+#: ../camel/providers/imap/camel-imap-store.c:469
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:150
+#: ../addressbook/backends/file/e-book-backend-file.c:142
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to remove file '%s': %s"
 msgstr "ÚÛØØÛØ â%sâ ÙÙ ÚÙÙÙØÙÛÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:173
+#: ../addressbook/backends/file/e-book-backend-file.c:166
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:627
 #, c-format
-#| msgid "Could not create directory %s: %s"
 msgid "Failed to make directory %s: %s"
 msgstr "ÙÛÙØÛØÙØÛ %s ÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:468
+#: ../addressbook/backends/file/e-book-backend-file.c:466
 #, c-format
-#| msgid "Failed to create child process '%s': %s"
 msgid "Failed to create hardlink for resource '%s': %s"
-msgstr ""
+msgstr "ÙÛÙØÛ â%sâ ØØ ÙØØØÙÙ ØÛÙÙÙÙØ ÙØØØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/file/e-book-backend-file.c:1125
+#: ../addressbook/backends/file/e-book-backend-file.c:568
+#: ../addressbook/backends/file/e-book-backend-file.c:1138
 msgid "No UID in the contact"
-msgstr ""
+msgstr "ØØÙØÙÛØØØØØ UID ÙÙÙ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1559
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
+#: ../addressbook/backends/file/e-book-backend-file.c:1587
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:519
 msgid "Loading..."
-msgstr "ÙÛÙÙÛÛØØÙØÛâ"
+msgstr "ØÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1562
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4866
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
+#: ../addressbook/backends/file/e-book-backend-file.c:1590
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4981
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:521
 msgid "Searching..."
 msgstr "ØÙØØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#: ../addressbook/backends/file/e-book-backend-file.c:2141
 #, c-format
 msgid "Failed to build summary for an address book %s"
-msgstr ""
+msgstr "ØØØØÛØ ØÛÙØÙØÙ %s ÙÙÚ ÙÙØÙÙÚÛ ØÛÙØØÙØÙÙÙ ÚØØÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:831
+#: ../addressbook/backends/google/e-book-backend-google.c:648
 msgid "Querying for updated contactsâ"
 msgstr "ÙÛÚÙÙØÙØØÙ ØØÙØÙÛØØØÙØØÙÙ ØÛØÛØØÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:880
-#: ../addressbook/libebook/e-book.c:3529 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1915
-msgid "Personal"
-msgstr "ØÛØØÙÙ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:882
-msgid "Friends"
-msgstr "ØÙØØÙØØ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:884
-msgid "Family"
-msgstr "ØÛÙÛØÙÙ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:886
-msgid "Coworkers"
-msgstr "ØÙØÙÛØØØØÙØØ"
-
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:970
+#: ../addressbook/backends/google/e-book-backend-google.c:785
 msgid "Querying for updated groupsâ"
 msgstr "ÙÛÚÙÙØÙØØÙ ÚÛØÛÙÙÙÙØØÙÙ ØÛØÛØØÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+#: ../addressbook/backends/google/e-book-backend-google.c:1211
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1670
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:290
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:327
 msgid "The backend does not support bulk additions"
-msgstr ""
+msgstr "ØØØÙØ ØÛÚ ØÙÙ ÙÙØÛØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1389
+#: ../addressbook/backends/google/e-book-backend-google.c:1243
 msgid "Creating new contactâ"
 msgstr "ÙÛÚÙ ØØÙØÙÛØØØ ÙÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1476
+#: ../addressbook/backends/google/e-book-backend-google.c:1334
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:431
-#| msgid "Calendar doesn't support Free/Busy"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:441
 msgid "The backend does not support bulk removals"
-msgstr ""
+msgstr "ØØØÙØ ØÛÚ ØÙÙ ØÛÚÛØÛØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1504
+#: ../addressbook/backends/google/e-book-backend-google.c:1362
 msgid "Deleting contactâ"
 msgstr "ØØÙØÙÛØØØÙÙ ØÛÚÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1749
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
+#: ../addressbook/backends/google/e-book-backend-google.c:1616
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2349
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:373
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:500
 msgid "The backend does not support bulk modifications"
-msgstr ""
+msgstr "ØØØÙØ ØÛÚ ØÙÙ ØÛØÚÛØØÙØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1782
+#: ../addressbook/backends/google/e-book-backend-google.c:1654
 msgid "Modifying contactâ"
 msgstr "ØØÙØÙÛØØØÙÙ ØÛØÙØÙÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1983
+#: ../addressbook/backends/google/e-book-backend-google.c:1825
 msgid "Loadingâ"
 msgstr "ÙÛÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2108
-msgid "Authenticating with the serverâ"
-msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÛØØÙØÛâ"
+#: ../addressbook/backends/google/e-book-google-utils.c:1568
+#: ../data/sources/system-address-book.source.in.h:1
+#: ../data/sources/system-calendar.source.in.h:1
+#: ../data/sources/system-memo-list.source.in.h:1
+#: ../data/sources/system-task-list.source.in.h:1
+msgid "Personal"
+msgstr "ØÛØØÙÙ"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1569
+msgid "Friends"
+msgstr "ØÙØØÙØØ"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1570
+msgid "Family"
+msgstr "ØÛÙÛØÙÙ"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1571
+msgid "Coworkers"
+msgstr "ØÙØÙÛØØØØÙØØ"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "ØØØÙØÙÙÙØØÙ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:795
 msgid "Using Distinguished Name (DN)"
 msgstr "ÙÛØÙÙÙÙ ØØØ ØÙØÙÙØÙØ(DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:798
 msgid "Using Email Address"
 msgstr "ØÛÙØÛØ ØØØØÛØÙ ØÙØÙÙØÙØ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr "v2 ÙØÙÙ v3 ØÛØÙÙÙ ØÙØÙÙØÙÙ ØØØÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
 msgid "Reconnecting to LDAP server..."
 msgstr "LADP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØÙØÙÛ ÙÛÚÙØÙÙ ÚØØÙØÙÙÙÙÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1220
 msgid "Invalid DN syntax"
 msgstr "DN ÚØØÙÙØØÙÙÙØÙ ØÙÙØÛÛØØÙØ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1236
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4878
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr "LDAP ØØØØÙÙÙÙ 0x%x (%s)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1770
 msgid "Adding contact to LDAP server..."
 msgstr "ØØÙØÙÛØØØÙØØÙÙ LDAP ÙÛÙØØÙÙÛØÙØÙØØ ÙÙØÛÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1908
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2050
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2445
+#, c-format
+msgid "%s: NULL returned from ldap_first_entry"
+msgstr "%s : ldap_first_entry ÙÙÚØÙÙ NULL ÙØÙØÙÙ ÙÛÙØÙ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2302
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2502
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr "%s: ÙÛØÙØÛ ØÙÙÙ %d ÙÙ ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2371
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØÛØÚÛØØÙÛØØÙØÛâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2731
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2951
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr "%s: ØÙØØÛØ ÙÛØÙØÙØÙÙÙÚ ØÙÙÙ %d ÙÙ ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4827
 msgid "Receiving LDAP search results..."
 msgstr "LADP - ØÙØØÛØ ÙÛØÙØÙØÙ ÙÙØÛÙ ÙÙÙÙÙÙÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5003
 msgid "Error performing search"
 msgstr "ØÙØØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5126
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ(%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5656
+#, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Failed to get the DN for user '%s'"
+msgstr "ØÙØÙÛØÙÛÚÙ â%sâ ÙÙÚ DN ÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:656
+#, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Failed to open addressbook at '%s': %s"
+msgstr "â%sâ ØÙÙÙ ØØØØÛØ ØÛÙØÙØÙÙÙ ØÛÚÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:358
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÙÛÙØÛ Â%s ÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ. ØÛ ÚØØØÙÙÙ HTTP ÚØÙÙØÙ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3196
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:457
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: GConf ØØ ØØÙÙØÙØØÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "DELETE failed with HTTP status %d"
+msgstr "DELETE ÙÛØÙÛÙ ØÙÙØÙ. HTTP ÚØÙÙØÙ: %d"
 
-#: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1910
-msgid "On This Computer"
-msgstr "ØÛ ÙÙÙÙÙÛØÛØØØ"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:521
+msgid "Contact on server changed -> not modifying"
+msgstr "ÙÛÙØØÙÙÛØÙØØÙÙÙ ØØÙØÙÛØØØ ->ØÛØÚÛØØÙÙÙÙØÙ ØØ ØÛØÚÛØØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book.c:3638
-#: ../addressbook/libebook/e-book-client.c:699
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "ØØØØÛØ ØÛÙØÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:530
+#, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "ØØÙØÙÛØØØÙÙ ØÛØÚÛØØÙØ ÙÛØÙÛÙ ØÙÙØÙ. HTTP ÚØÙÙØÙ: %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:929
+#| msgid "Error loading address book: %s"
+msgid "Loading Addressbook summary..."
+msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙÚ ØØØØØÙÙ ÙÛØÙÛÙÙÙÙ ØÙÙÛÛØØÙØÛâ"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:947
+#, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr "webdav ØÙÙÙ PROPFIND ÙÛØÙÛÙ ØÙÙØÙ. HTTP ÚØÙÙØÙ: %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:968
+msgid "No response body in webdav PROPFIND result"
+msgstr "webdav ØÙÙÙ PROPFIND ÙØÙØÛØØØÙ ÙÛØÙØÙØÛ ØØÛØØ ÚÛÛØÙØÙ(response body) ÙÙÙ"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1000
+#, c-format
+#| msgid "Downloading contacts (%d)... "
+msgid "Loading Contacts (%d%%)"
+msgstr "ØØÙØÙÛØØØÙØØÙÙ ØÙÙÛÛØØÙØÛ (%d%%)"
 
-#: ../addressbook/libebook/e-book-client.c:92
-#| msgctxt "BookClientError"
-#| msgid "No such book"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1307
+msgid "Cannot transform SoupURI to string"
+msgstr "SoupURI ÙÙ ØÛÙÙØØ(string) ÙÛ ØØÙÙØÙØÛØØÙÙÙ ØÙÙÙÙØÙ"
+
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ØÛÙØØÙ ÙÙØØØ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "ØØÙØÙÛØØØ ØÛÙÙÙÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "ØØÙØÙÛØØØ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
 
-#: ../addressbook/libebook/e-book-client.c:98
-#| msgctxt "BookClientError"
-#| msgid "No such source"
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "ØÛÙØØÙ ÙÛÙØÛ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ØÙØÙÛÙ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:512
+#: ../addressbook/libebook/e-book-client.c:489
 msgid "Failed to run book factory"
 msgstr "ÙÙØØØ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:522
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "ÙÛÙØÛ ØÙÙØÛÛØØÙØ"
-
-#: ../addressbook/libebook/e-book-client.c:624
-#: ../calendar/libecal/e-cal-client.c:725
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "uri Â%s ØØØØ"
-
-#: ../addressbook/libebook/e-book-client.c:662
-msgid "Failed to find system book"
-msgstr "ØÙØØÛÙØ ÙÙØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../addressbook/libebook/e-book-client.c:771
-#: ../calendar/libecal/e-cal-client.c:878
-#, c-format
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "ÙÛÙØÛ ØÙØÙÙÙØÙÙÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
-
-#: ../addressbook/libebook/e-book-client.c:2563
-#: ../calendar/libecal/e-cal-client.c:4480
+#: ../addressbook/libebook/e-book-client.c:2264
+#: ../calendar/libecal/e-cal-client.c:4632
 msgid "Cannot get connection to view"
 msgstr "ÙÛØÙØÙØØÙ ØØØÙÙÙÙØÙØØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "ØÙØØÙÙØÙØ ÙÙÙÙÙÙ"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:120
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:122
-msgid "Book URI"
-msgstr "ÙÙØØØ URI"
+#: ../addressbook/libebook/e-contact.c:128
+#| msgid "Book URI"
+msgid "Book UID"
+msgstr "ÙÙØØØÙÙÚ UID ØÙ"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
 msgstr "ØÙÙÛÙ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "ØÛØÙÙÚÛÙ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
-msgstr "ØÛÚØØØ"
+msgstr "ØÛÚØØ"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ØÛØÛÙÙÛØ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "ØÛÙØÛØ 1"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "ØÛÙØÛØ 2"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "ØÛÙØÛØ 3"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "ØÛÙØÛØ 4"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "ØÛØÚÙ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "ØÙÙ ØØØØÛØÙ ØÛÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ØÙØÙÛØ ØØØØÛØÙ ØÛÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ØØØÙØ ØØØØÛØ ØÛÙÙ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ÙØØØÛÙÚÙÙÙÚ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
 msgstr "ØÙØÙÛØ ÙØÙÙØ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "ÙØÙØÛØÛÙ ÚØÙÙØØØÙ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ÙØØÙÙØ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "ØÛÙ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "ØÙÙ ØÛÙÛÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "ØÙÙ ÙØÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "ÙØÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ØØØÙØ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ØØØÙØ ÙØÙÙØ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "ÚØÙÙØØÛ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "ØØØÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "ØÛÙÛÚØØÙÙØ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ØÙØÚØÙ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "ØÙØØØÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "ØÙØØØÙØ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "ÙØÛØÛ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "ØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ØØØÙÛØØÛ"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ÙØØØÛÙÚÙ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "ØØØ ØÛØÙÙÚ URL"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ØÙÙÚ ØÙØ ØØØØÛØÙ(URL)"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:182
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ÙØØÛÚÙØÙÙÛ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "ÙÙÙÙØÙÙÙÙÚ URI ØÙ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ØÙÙØØ/ØØÙØÙØØØ URL"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS ÙÙÙÙØÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "ØÙÙ ÙÙØÙÙÙÙÙÚ URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ÚÛÙØØÚÙÙÙÚ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "ØÙØØÚØØ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ØÛÚ ØØØÙØÙÙ ØÛØÙØÙÙÙÛ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ØØØÙ ÙØÙÙ ØÛØÙÙÙÙ"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ØØØØÛØÙØØ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "ØÛÙ ØØØØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "ØÙØÙÛØ ØØØØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ØØØÙØ ØØØØÛØ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "ÙØØÛÚÙØÙÙÛ ØÙØÙÙÙ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "ØÛØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "ØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "ØÛÙØÛØ ØÙØÙÙÙ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "AIM ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "GroupWise ID ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "Jabber ID ÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "MSN ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ICQ ID ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "HTML ØÛØÙÙÙ ØØØØÛ ÙÙÙÙØÛ"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "ØÙØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:263
-msgid "List Show Addresses"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+#| msgid "List Show Addresses"
+msgid "List Shows Addresses"
 msgstr "ØØØØÛØÙØØÙÙ ÙÛØØÙØÙØÙØØÙ ØÙØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ"
 
-#: ../addressbook/libebook/e-contact.c:266
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "ØØØÙØÛ ÙÛÙ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 ØÙØÙØØÙØØ"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
-msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 1"
+msgstr "Gadu-Gadu ØÛÙ  ID 1"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
-msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 2"
+msgstr "Gadu-Gadu ØÛÙ  ID 2"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
-msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 3"
+msgstr "Gadu-Gadu ØÛÙ  ID 3"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
-msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 1"
+msgstr "Gadu-Gadu ØÙØÙÛØ  ID 1"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 2"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
-msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 3"
+msgstr "Gadu-Gadu ØÙØÙÛØ  ID 3"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
-msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID ÙÙØÙ"
+msgstr "Gadu-Gadu ID ØÙØÙÙÙ"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ØÛØØØÙÙÙÙÙÙÙ ØÛÚÛØ"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "Skype ØÛÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "Skype ØÛÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "Skype ØÛÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Skype ØØØ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP ØØØØÛØÙ"
 
-#: ../addressbook/libebook/e-contact.c:294
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk ØÛÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:295
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk ØÛÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:296
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk ØÛÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:297
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk ØÙØÙÛØ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:298
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk ØÙØÙÛØ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:299
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk ØÙØÙÛØ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:300
-#| msgid "Skype Name List"
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "Google Talk ØØØ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:1601
+#: ../addressbook/libebook/e-contact.c:320
+#| msgid "Skype Name List"
+msgid "Twitter Name List"
+msgstr "Twitter ØØØ ØÙØÙÙÙ"
+
+#: ../addressbook/libebook/e-contact.c:1641
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ÙØÙØÙØ ØÙØÙÙ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙØØØ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:87
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÙØÙÛÙÛÙ ÙÙØØØ ØØØÙÙÙÙ Â%sÂ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÙÙØØØ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ØÛØÙÛÙ ÙÛØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1135
 #, c-format
-#| msgid "Contact not found"
 msgid "Contact '%s' not found"
-msgstr ""
+msgstr "ØØÙØÙÛØØØ â%sâ ØÛÙÙÙÙÙØÙ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
-msgstr "ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ"
+msgstr "ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ ØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4016 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
-msgstr "Backend ØØÙØÙØØØ"
+msgstr "ØØØÙØ ØÛÚ ØØÙØÙØØØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:134
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4030 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ"
+msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÙØ ØÛÙÙÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "TLS ÙÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "ØØØØÛØ ØÛÙØÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "ÙÙØØØ ÚÙÙÙØÙÛÛØÙÙÚÛÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "ØÙØØØ ÙÙÙ ÚØÙÛØØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 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:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "ÙÛÙØØÙÙÛØÙØ ÙÛØØÙ ØÙÙØÛÛØØÙØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:4014 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
-msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
+msgstr "ØÙÙØÛÛØØÙØ ØØØÚÛÙÛÙØ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4053 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ÙÙÙÙÙÙØÙØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:620
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "ØØØÙØ ØØØØÙÙÙ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "ØØÙØÙÛØØØÙØ ØÛØÙØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "ÙÛØÛÙ ØÛØÛØØÛØÛØ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "ØØÙØÙÛØØØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
-#| msgid "Cannot modify contact: "
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
-msgstr ""
+msgstr "ØØÙØÙÛØØØÙØØÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-msgid "Cannot authenticate user: "
-msgstr "ØÙØÙÛØÙÛÚÙÙÙÚ ØØÙØÚÙÙÙØÙÙÙ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "ÙÙØØØÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "ÙÙØØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÛÚØÙÚÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙØØ ØÛØÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙÙÙÚ uids ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+#| msgid "No backend factory for '%s' of '%s'"
+msgid "No backend name in source '%s'"
+msgstr "ÙÛÙØÛ â%sâ ÙÙÚØØ ØØØÙØ ØÛÚ ØØØÙ ÙÙÙ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, c-format
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "ÙÛÙØÛ â%2sâ ÙÙÚØÙÙÙ ØØØÙØ ØÛÚ ØØØÙ â%1sâ ØÙÙØÛÛØØÙØ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+#| msgid "POP Source UID"
+msgid "Missing source UID"
+msgstr "ÙÛÙØÛÙÙÚ ÙÙÙÙÙÙÙ(UID) ÙÙÙ ØÛØÙØÛ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
-msgid "Empty URI"
-msgstr "ÙÛØÛÙ URI"
+#| msgid "No such source"
+msgid "No such source for UID '%s'"
+msgstr "ÙÙÙÙÙÙÙ(UID) â%sâ ØÙÙØØÙ ÙÛÙØÛ ÙÙÙ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:572
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "ÙÛÙØØÙÙÛØÙØØØ SSL ÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:623
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ %d ØÛÚÛÙ HTTP ÚØÙÛØ ÙÙØÙ ÙØÙØÛØÛÙØÙ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:642
+#| msgid "Backend is not opened yet"
+msgid "CalDAV backend is not loaded yet"
+msgstr "ØØØÙØ ØÛÚ CalDAV ØÛØÙ ØÙÙÛÙÙÙØÙ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1031
+#| msgid "Invalid server URI"
+msgid "Invalid Redirect URL"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2390
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2755
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1089,73 +1177,100 @@ msgid ""
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛØ ÙÙÙÙØÙÛ ØÙÙÛØÙÙÙØ ØÙÙÙØÙØØÙ ÚØÙÛØØÛ ØÛÚÙÙØÙ.\n"
 "ØØØØÙÙÙ ØÛÚÛØ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2696
+#| msgid "Cannot create calendar object: "
+msgid "Cannot create local store"
+msgstr "ÙÛØÙÙÙ ØØÙÙÙØÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2705
+#, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot create local cache folder '%s'"
+msgstr "ÙÙØÙÛÚ â%sâ ØÛÚÛÙ ÙÛØÙÙÙ ØÛÙÙÛÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2716
+#| msgid "Could not create cache file"
+msgid "Could not create synch slave thread"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3711
+msgid "CalDAV does not support bulk additions"
+msgstr "ØÙÙÙØÙ ÙÙØÛØÙÙ CalDAV ØØ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3813
+msgid "CalDAV does not support bulk modifications"
+msgstr "ØÙÙÙØÙ ØÛØÚÛØØÙØÙÙ CalDAV ØØ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3981
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "CalDAV does not support bulk removals"
+msgstr "ØÙÙÙØÙ ØÛÚÛØÛØÙÙ CalDAV ØØ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4640
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÙÙÙÙØÙÛ ØÙÙØØ/ØØÙØÙØØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr "ØØØØÛØ  ØÛÙØÙØÙ%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
-"ØÛÛÛØ: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4648
+msgid "Schedule outbox url not found"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "ØØØØÛØ  ØÛÙØÙØÙ%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4747
+msgid "Unexpected result in schedule-response"
+msgstr ""
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ØØØÙØÛ ÙÛÙ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÙÙÙÙØÙÛ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ: URI ØÙØØØ ØÛÙÛØ"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:256
-#: ../calendar/backends/file/e-cal-backend-file.c:262
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "ÙÙÙÙØÙÛ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:418
+#: ../calendar/backends/http/e-cal-backend-http.c:483
+#, c-format
+#| msgid "Malformed signature"
+msgid "Malformed URI: %s"
+msgstr "ØÙÙÙÙØÛØ URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:544
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ØÙÙØÛÛØØÙØ URI ØØ ØÛØÙ ØÛØØÙØÙ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:459
+#: ../calendar/backends/http/e-cal-backend-http.c:581
+#, c-format
 msgid "Bad file format."
 msgstr "ÚÛØØÛØ ÙÙØÙØØÙ ØØØØ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:467
+#: ../calendar/backends/http/e-cal-backend-http.c:591
+#, c-format
 msgid "Not a calendar."
 msgstr "ÙÙÙÙØÙÛ ØÛÙÛØ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:793
-#: ../calendar/backends/http/e-cal-backend-http.c:794
-#: ../calendar/backends/weather/e-cal-backend-weather.c:522
+#: ../calendar/backends/http/e-cal-backend-http.c:888
+#: ../calendar/backends/http/e-cal-backend-http.c:893
+#: ../calendar/backends/weather/e-cal-backend-weather.c:512
 msgid "Could not create cache file"
 msgstr "ØÛÙÙÛÙ ÚÛØØÙØÙ ÙÛØØÙÙÙØÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:181
+#: ../calendar/backends/weather/e-cal-backend-weather.c:172
 msgid "Could not retrieve weather data"
-msgstr "ÚØÛØØØÙÙ ØØÙÙÙÙ ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙÛÙØÙÙÙØÙ"
+msgstr "ÚØÛØØØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙÛÙØÙÙÙØÙ"
 
 #: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
@@ -1193,536 +1308,513 @@ msgstr "ÚØÛØØØÙÙ: ÚØÛØ ØÙÚÛÙ"
 msgid "Weather: Thunderstorms"
 msgstr "ÚØÛØØØÙÙ: ÚÛÙØÛØÙØÙÙÙÙÙ ÙØÙØÛØ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:433
+#: ../calendar/backends/weather/e-cal-backend-weather.c:409
 msgid "Forecast"
 msgstr "ØØÙØÙÙ ÙÛÙÛÙØØ"
 
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:906
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
-
-#: ../calendar/libecal/e-cal.c:4567
+#: ../calendar/libecal/e-cal.c:4018
 msgid "Repository is offline"
 msgstr "ØÛØÙÙÛ ØÙØØØ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4020 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4022 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4024 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4026
 msgid "URI not loaded"
 msgstr "URI ØÙÙÛÙÙÙØØÙ"
 
-#: ../calendar/libecal/e-cal.c:4577
+#: ../calendar/libecal/e-cal.c:4028
 msgid "URI already loaded"
 msgstr "URI ØÙÙÛÙØØÙ"
 
-#: ../calendar/libecal/e-cal.c:4581
+#: ../calendar/libecal/e-cal.c:4032
 msgid "Unknown User"
 msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
 
-#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4034 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
-msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
+msgstr "ÙÛÚ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4036
 msgid "Protocol not supported"
 msgstr "ÙÛÙÙØÙÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4038
 msgid "Operation has been canceled"
 msgstr "ÙÛØØÛÙØØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4589
+#: ../calendar/libecal/e-cal.c:4040
 msgid "Could not cancel operation"
 msgstr "ÙÛØØÛÙØØØÙÙ ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4042 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
-msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4593
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:4044
+#: ../camel/providers/smtp/camel-smtp-transport.c:857
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
 
-#: ../calendar/libecal/e-cal.c:4595
+#: ../calendar/libecal/e-cal.c:4046
 msgid "A D-Bus exception has occurred"
 msgstr "ØÙØ D-Bus ÙÛØØÛØÙØ ÙÛØÛÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4599
+#: ../calendar/libecal/e-cal.c:4050
 msgid "No error"
 msgstr "ØØØØÙÙÙ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "ØÙÙØÛÛØØÙØ ØØØÙØÛ"
 
-#: ../calendar/libecal/e-cal-client.c:600
+#: ../calendar/libecal/e-cal-client.c:611
 msgid "Failed to run calendar factory"
 msgstr "ÙÙÙÙØÙÛ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:765
-msgid "Failed to find system calendar"
-msgstr "ØÙØØÛÙØ ÙÙÙÙØÙÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "ÙÙÙÙØÙÛ ÙÛÛØÛØ ØÛÙÛØ"
-
-#: ../calendar/libecal/e-cal-client.c:919
-msgid "Invalid source type"
-msgstr "ÙÛÙØÛ ØÙÙÙ ØÙÙØÛÛØØÙØ"
-
-#: ../calendar/libecal/e-cal-component.c:1362
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "ÙØÛØÛØÙØ ØÛÙÙØÙÛ"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
 msgctxt "Priority"
 msgid "High"
 msgstr "ÙÛÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÙÙØÙØÙ"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
 msgctxt "Priority"
 msgid "Low"
 msgstr "ØÛÛÛÙ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ØÛÙÙÙÙÙÙÙØÙØ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙÙÙØÙÛ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:142
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%sÂ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:159
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:807
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:829
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:944
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:975
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1175
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1205
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:990
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1260
 #, c-format
 msgid "\"%s\" expects no arguments"
-msgstr "\"%s\" ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÙØÛ"
+msgstr "Â%s ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1246
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1302
 #, c-format
 msgid "\"%s\" expects one argument"
-msgstr "\"%s\" ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:874
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
-msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÚÛØÙØ/ÛØÙÙØ ØÛÙÙØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÚÛØÙØ/ÛØÙÙØ ØÛÙÙØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1010
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:562
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1058
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "%s\" ØÙÙÙÙ ØØØÚÛÙÛÙØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1016
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1252
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:417
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:569
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1309
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
-msgstr "%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÙÛØÛÙ ØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÙÛØÛÙ ØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:410
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects two or three arguments"
 msgstr "Â%s ØÙÙÙÙ ÙØÙÙ ØÛÚ ØØØÚÛÙÛÙØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1024
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:426
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:579
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:436
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "Â%s ØÛÚÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:498
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects none or two arguments"
-msgstr ""
+msgstr "Â%s ØØØÚÛÙÛÙØÙÙÚ ÙÙÙ ØÙÙÛØÙÙÙ ÙØÙÙ ØÙÙÙÙ ØØØÚÛÙÛÙØÙÙÚ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:926
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
-msgstr "\"%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:957
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
-msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ \"any\"Ø \"summary\"Ø ÙØÙÙ \"description\"Ø ÙØÙÙ \"location\"Ø ÙØÙÙ \"attendee\"Ø  ÙØÙÙ \"organizer\", ÙØÙÙ \"classification\" ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ \"any\"Ø \"summary\"Ø ÙØÙÙ \"description\"Ø ÙØÙÙ \"location\"Ø ÙØÙÙ \"attendee\"Ø  ÙØÙÙ \"organizer\"Ø ÙØÙÙ \"classification\" ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
 #, c-format
 msgid "\"%s\" expects at least one argument"
-msgstr "\"%s\" ØØØ ØÛÚÛÙØÙÙÛ ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØØØ ØÛÚÛÙØÙÙÛ ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1141
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
-msgstr "\"%s\" ØØØÙÙÙ ÙØØØÙÛØÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ ÙØÙÙ ØÙØ ÛÛ ÙÛÙÛØ ØÙØÙØ ÙØØØÙÛØÙØÙÙÚ boolean ØÙÙÛØÙ ÛÛ ÙÙÙÙÙØÙÙÙÚ false (#f) ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+msgstr "Â%s ØØØÙÙÙ ÙØØØÙÛØÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ ÙØÙÙ ØÙØ ÛÛ ÙÛÙÛØ ØÙØÙØ ÙØØØÙÛØÙØÙÙÚ boolean ØÙÙÛØÙ ÛÛ ÙÙÙÙÙØÙÙÙÚ false (#f) ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÛØÛÙ"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "ÙÙÙÙØÙÛ ÙÛÛØÛØ ØÛÙÛØ"
+
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../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:987
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÙÙÙÙØÙÙÙÙÚ ØÙÙØØ/ØØÙØÙØØØ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÙÙØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "ÙÙØÛÙÙÙÙÙÚ uris ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "ØÛØÙÛØØÙÛÚÙÙ ØØØÙÙÛÛØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛØÛÙÙÛ ÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "ØÙÙØÛÛØØÙØ ÚØÙÙØÙØ"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØÙÙØØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØÛÙØÛØÛØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚÙÙ ØÙØÙÙØÙÙ ØÙÙÙØÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚ ØØØÙÙÙÙÙ ØÙÙÙØØÙØÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØØÚÙÛÚÙÙ ØÙÙÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØØÚÙÛÚÙÙ ØÛÙØÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:800
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "ØÛÚÛØØØ ØÙÙØØ ÙÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:1041
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "ØÛÚÛØ ØÙÙÙØÙØÛØØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:1168
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "ØÛÚÛØÙÙ ØÙÙÙØØÙØÙØÛØØÙØÛ"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ØÛÙÙÛÙ ÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "ØÛÙÙÛÙ ÚÛØØÙØÙ ÙÛØÛÙ"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ØÛÙÙÛÙØÙÙÙ ÙÙØÚÛÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1732,8 +1824,8 @@ msgstr "ØØØÙØÛ ÙÙØÚÛØÙÙÙ ÙØØØÙÙÙ ØÙÙÙÙØÙ: %s\n"
 "ØÛÚÛØ ÙØÙØØ ØØØÙØÙÙÙØÙÚÙØ ØÛÙÙÚØÙÙ ÙÛÙÙÙÙÙ ÙÛØØÛÙØØÙØØ\n"
 "ØØÛØØØÙØ ÙØÙÙØÛ"
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
+#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1743,47 +1835,40 @@ msgstr "Â%s ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ:\n"
 "%s\n"
 "ØÛ ÙÙØÙÛÚÙØ ØÙÙØØÙ ØÛØÚÛØØÙØÙÛØ ÙØÙØØ ÙÛØÛÙØØØÙØÙÙØÙØÛ."
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
 msgid "Resynchronizing with server"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÛÙ ÙØÙØØ ÙÛØÛÙØØØÙØØ"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:412
+#: ../camel/camel-disco-folder.c:420
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ Â%s ÙÙ ØÛÙÙØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
 msgid "Copy folder content locally for _offline operation"
-msgstr ""
-
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:527
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-#: ../camel/providers/pop3/camel-pop3-folder.c:840
-#: ../camel/providers/pop3/camel-pop3-folder.c:1038
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+msgstr "ØÙØØÙØ ÙÛØØÛÙØØ ØÛÚÛÙ ÙÙØÙÛÚ ÙÛØÙÛÙÙÙÙ ÙÛØÙÙÙØÛ ÙÛÚÛØØÛÙ(_O)"
+
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
+#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
+#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:615
+#: ../camel/camel-imapx-folder.c:649 ../camel/camel-imapx-folder.c:689
+#: ../camel/camel-imapx-folder.c:725 ../camel/camel-imapx-store.c:276
+#: ../camel/camel-imapx-store.c:1399 ../camel/camel-imapx-store.c:1488
+#: ../camel/camel-imapx-store.c:1537
+#: ../camel/providers/imap/camel-imap-store.c:1270
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imap/camel-imap-store.c:3289
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:424
+#: ../camel/providers/pop3/camel-pop3-store.c:849
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ØÙØØØ ØÛÙØÙÙÙØØ ØÛ ÙÛØØÛÙØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
@@ -1791,66 +1876,66 @@ msgstr "ØÙØØØ ØÛÙØÙÙÙØØ ØÛ ÙÛØØÛÙØØÙÙ ÙÙÙØÙÙÙ 
 #: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
-msgstr "ÛØØ ÙÛÚØÙ"
+msgstr "ÙØÙØÛØÛÛÛØÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "'%s' ØØØÙØÙ ØÙØØØ ÙÛØØÙÙÙØÙ: %s"
+msgstr "â%sâ ØØØÙØÙ ØÙØØØ ÙÛØØÙÙÙØÙ: %s"
 
-#: ../camel/camel-filter-driver.c:937
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ÙÙÚØÙÙ ØÙÙØÛÛØØÙØ ØÛÚÛØ ØÛÙÙÙÙ ØØÙØÛØÛÛØÙØÙ: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "ÙÙØÙÛÚÙØØÙÙ ÙÛØÛÙØØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
+#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ØÛØÚÛÚÙÙ ØÛÚÙÙÙ ÙÙÙÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ØÛØÚÛÚÙÙ ØÙØØØ ÙÙÙÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ØÙØØÙÙÙÙ ÙÙØÙÛÚÙÙ ØØÚØÙÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ØÙØØÙÙÙÙ ÙÙØÙÛÚÙÙ ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ØÛÚÛØ %d ÙÙ ØÙÙÛÛØØÙØÛ (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
 #, c-format
 msgid "Failed on message %d"
 msgstr "ØÛÚÛØ %d ØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
 msgid "Syncing folder"
 msgstr "ÙÙØÙÛÚÙÙ ÙÛØÛÙØØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
 msgid "Complete"
 msgstr "ØÙÙÛÙ"
 
-#: ../camel/camel-filter-driver.c:1495
+#: ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ØÛÚÛØ %d / %d ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1513
+#: ../camel/camel-filter-driver.c:1547
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ØÛÚÛØ %d / %d ØØ ÙÛØÙÛÙ ØÙÙØÙ"
@@ -1867,55 +1952,66 @@ msgstr "(system-flag) ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØ
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag)ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
+#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ØÛØÚÛÚÙÛÙ ØÙØØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-folder.c:258
+#: ../camel/camel-folder.c:270
 #, 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:298
+#: ../camel/camel-folder.c:310
 #, 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:346
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "'%s' ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙ ØÛØÛÛØØÙØÛ"
+msgstr[0] "â%sâ ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙ ØÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:914
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "ØÛÚÛØÙØØ ÙÛØÙÙÙÙÛØØÙØÛ."
 
-#: ../camel/camel-folder.c:917
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ØÛÚÛØÙØØ ÙÛÚÛØÛÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:1229
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ØØ ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-folder.c:3535
+#: ../camel/camel-folder.c:3372
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Expunging folder '%s'"
+msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÛØØÙØÛ"
+
+#: ../camel/camel-folder.c:3604
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ØÛÚÛØ Â%s ÙÙ %s ØÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:3681
+#: ../camel/camel-folder.c:3755
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Â%s  ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
-#: ../camel/camel-folder-search.c:661
+#: ../camel/camel-folder.c:3987
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Refreshing folder '%s'"
+msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛÚÙÙØÛØØÙØÛ"
+
+#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1923,8 +2019,7 @@ msgid ""
 msgstr "ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
-#: ../camel/camel-folder-search.c:673
+#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1933,47 +2028,47 @@ msgstr "ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÙØØØ ÙÙÙÙØØØ ØØØØÙÙ
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ØØ ÙÙÚÙÙÙÙÙÙ ÙÛØÙØÛ ÙÛØÛÙ"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:991
+#: ../camel/camel-folder-search.c:932
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÙÙ %s ÙÙÚ ØÙÚÙØÛ ØÙØÙÙØÙØÙÛ ØÙÙÙØÙØÛ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:998 ../camel/camel-folder-search.c:1006
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ØØ ØÙØØÛØ ØÙÙÙÙÙ ÙÛØØÙØÙÙ ØÛØÙØÙØØÙ ØÛÙÙØØ ÙÛØÛÙ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1034
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ØÙØÙÙ ÙØÙØÛØÛØÙÙ ØØØØÛ ÙÙÙÙØÛ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1044
+#: ../camel/camel-folder-search.c:985
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ØØ ÙÙØÙÛÚ ØÙÙÙÙÙÙ ÙÛØÛÙ"
 
-#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
-#: ../camel/camel-gpg-context.c:1323
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1331
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/camel-gpg-context.c:664
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:860
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1983,17 +2078,17 @@ msgstr "GnuPG ÙÙÚ ØÛØÙÙØÙØÛ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÚØÙ
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:765
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg ØÙØÙÛØÙÛÚÙ ÙÙÙÙÙÙÙÙÙÚ ÙÛØØÛØÙÙØÙÙÙ ØÛÚÙÙÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg ÙÙÚ ØÙÙ ØÛÙÙÙÙÙÙ ØÛÚÙÙÙ ÙÙÙÙØØØ ÙÛØÙÛÙ ØÛÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:826
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2001,7 +2096,7 @@ msgid ""
 msgstr "ØÙØÙÙØÙÛØØÙØÙ SmartCard ÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
 "PIN ÙÙØÙ ØÛØÛØ: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2009,88 +2104,359 @@ msgid ""
 msgstr "ØÙØÙÛØÙÛÚÙÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
 "ØÙÙ ØÛØÛØ: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Â%s ØØ ÙÙØØÛØÛÙ GnuPG ÙÙÚØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØÛÙÛÙ ØØÙØÛØÛÛØÙØÙ"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:852
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 
-#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../camel/camel-gpg-context.c:896
+#: ../camel/camel-gpg-context.c:904
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÙÛØÙÙÙ ØØÚÙÛÚÙÙ ÙÛÙÛÙØÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: 3 ØØÙÛ ØÙÙ ÚÛÙÙÙØÙ ØØØØ."
 
-#: ../camel/camel-gpg-context.c:909
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ÙÙÚØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØØÛØØ ØØÙØÛØÛÛØÙØÙ: %s"
 
-#: ../camel/camel-gpg-context.c:1040
+#: ../camel/camel-gpg-context.c:1048
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ØÙÙÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: ØÙØØØ ØÙÙØØÙ ØØÙØÛØÛÛØÙØÛÚÙÙØØ ØÛÙÙØÙÙÙÙÚÛÙ."
 
-#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
 msgid "Could not generate signing data: "
 msgstr "ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
-#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
-#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
+#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
+#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
 msgid "Failed to execute gpg."
 msgstr "gpg ÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
-#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
+#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
+#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
+#: ../camel/camel-smime-context.c:982
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ØÛÚÛØÙÙÚ ØÙÙØØØÙÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: ØÛÚÛØ ÙÙØÙØØÙ ØÙØØØ ØÛÙÛØ"
 
-#: ../camel/camel-gpg-context.c:1793
+#: ../camel/camel-gpg-context.c:1801
 msgid "Cannot verify message signature: "
 msgstr "ØÛÚÛØÙÙÚ ØÙÙØØØÙÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/camel-gpg-context.c:1916
+#: ../camel/camel-gpg-context.c:1924
 msgid "Could not generate encrypting data: "
 msgstr "ØÙÙÙØÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙØØÙÙ ÚØØÙÙ ÙÙÙØÙÙÙØÙ. "
 
-#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1977
 msgid "This is a digitally encrypted message part"
 msgstr "ØÛ ØÛÙÛÙÙÙÙ ØÙÙÙØÙØÙØØÙ ØÛÚÛØ ÙØØÚÙØÙ"
 
-#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2059
+#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
+#: ../camel/camel-gpg-context.c:2067
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ØÛÚÛØÙÙÚ ÙÛØÙÙÙÙ ØÙÙÙÙØÙ: ØÛÚÛØ ÙÙØÙØØÙ ØÙØØØ ØÛÙÛØ"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2055
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ÙØØÚÙØÙÙÙ ØÙÙÙØØÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: ÙÛÙÙØÙÙ ØØØØ"
 
-#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "CamelHttpStream ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
+#: ../camel/camel-imapx-folder.c:104
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "ÙÙØÙÛÚ %s ÚÛÙÙÙØÛ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
+
+#: ../camel/camel-imapx-folder.c:112
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "%s ØÛÙÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
+
+#: ../camel/camel-imapx-folder.c:795
+#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+msgid "Apply message _filters to this folder"
+msgstr "ØÛÚÛØ ØÛØÚÛÚÙÙØÙÙÙ ÙÛØÙÛØ ÙÙØÙÛÚÙØ ÙÙÙÙØÙØÛÙ(_F)"
+
+#: ../camel/camel-imapx-server.c:1184
+msgid "Server disconnected"
+msgstr "ÙÛÙØØÙÙÛØÙØ ØÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:1647
+msgid "Error writing to cache stream: "
+msgstr "ØÛÙÙÛÙ ØÛÙÙÙÙØØ ÙÛØÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: "
+
+#: ../camel/camel-imapx-server.c:2643
+#, c-format
+msgid "Not authenticated"
+msgstr "ØØÙØÚÙÙÙØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
+
+#: ../camel/camel-imapx-server.c:2720
+msgid "Error performing IDLE"
+msgstr "IDLE ÙÛØØÛÙØØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:3621
+#: ../camel/providers/imap/camel-imap-store.c:414
+#: ../camel/providers/imap/camel-imap-store.c:468
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+
+#: ../camel/camel-imapx-server.c:3622
+#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
+msgid "STARTTLS not supported"
+msgstr "STARTTLS ÙÙ ÙÙÙÙÙÙØÙØÛ"
+
+#: ../camel/camel-imapx-server.c:3661
+#: ../camel/providers/imap/camel-imap-store.c:440
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
+
+#: ../camel/camel-imapx-server.c:3741
+#: ../camel/providers/imap/camel-imap-store.c:749
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:3752 ../camel/camel-session.c:494
+#: ../camel/providers/imap/camel-imap-store.c:1174
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:604
+#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#, c-format
+msgid "No support for %s authentication"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:3771
+#: ../camel/providers/imap/camel-imap-store.c:1142
+#: ../camel/providers/nntp/camel-nntp-store.c:502
+msgid "Cannot authenticate without a username"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:3780
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:511
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+msgid "Authentication password not available"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:3982
+msgid "Error fetching message"
+msgstr "ØÛÚÛØÙØØÙÙ ØÛÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4064
+#| msgid "Failed to cache %s: "
+msgid "Failed to copy the tmp file"
+msgstr "ÚÛØØÛØ tmp ÙÙ ÙÛÚÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4078
+#| msgid "Failed to encode data"
+msgid "Failed to close the tmp stream"
+msgstr "ØÛÙÙÙ tmp ÙÙ ÙÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4176
+msgid "Error copying messages"
+msgstr "ØÛÚÛØÙØØÙÙ ÙÛÚÛØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4311
+msgid "Error appending message"
+msgstr "ØÛÚÛØÙØØÙÙ ÙÛØÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4494
+msgid "Error fetching message headers"
+msgstr "ØÛÚÛØÙÙÚ ÙØØÙÙØÙÙÙ(headers) ÙÛÚÛØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:4631
+msgid "Error retrieving message"
+msgstr "ØÛÚÛØÙÙ ÚØÙÙØÙØØØ ØØØØÙÙÙ ÙÛØ ØÛØØÙ"
+
+#: ../camel/camel-imapx-server.c:4753 ../camel/camel-imapx-server.c:4949
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "â%sâ ÙÙÚ ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙÙÙÙ ØÛÙÙÛØØÙØÛ"
+
+#: ../camel/camel-imapx-server.c:4804
+#, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "â%sâ ÙÙÚØÙÙÙ ØÛÚÛØÙØØÙÙÚ ØÛØÚÙØÙØÙÙÙ ØÛÙØÛØÛÛØØÙØÛ"
+
+#: ../camel/camel-imapx-server.c:4848
+msgid "Error fetching new messages"
+msgstr "ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5040
+msgid "Error while fetching messages"
+msgstr "ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5048 ../camel/camel-imapx-server.c:5084
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] ""
+
+#: ../camel/camel-imapx-server.c:5210 ../camel/camel-imapx-server.c:5246
+msgid "Error refreshing folder"
+msgstr "ÙÙØÙÛÚÙÙ ÙÛÚÙÙØØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5342
+msgid "Error expunging message"
+msgstr ""
+
+#: ../camel/camel-imapx-server.c:5439
+msgid "Error fetching folders"
+msgstr "ÙÙØÙÛÚÙØØÙÙ ØÛÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5518
+msgid "Error subscribing to folder"
+msgstr "ÙÙØÙÛÚÙØ ÙÛØØÛØÙ ØÙÙÛØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5579
+msgid "Error creating folder"
+msgstr "ÙÙØÙÛÚ ÙÛØÛØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5628
+msgid "Error deleting folder"
+msgstr "ÙÙØÙÛÚ ØÛÚÛØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5689
+msgid "Error renaming folder"
+msgstr "ÙÙØÙÛÚÙÙÚ ØØØÙÙÙ ØÛØÚÛØØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5750
+msgid "Error performing NOOP"
+msgstr "NOOP ÙÛØØÛÙØØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:5846
+msgid "Error syncing changes"
+msgstr "ØÛØÚÛØØÙØÙÛØÙÙ ÙÛØÛÙØØØÙØØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#: ../camel/camel-imapx-server.c:6617
+#: ../camel/providers/imap/camel-imap-folder.c:3531
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ÙÙÙÙÙÙÙ %s ØÙÙØØÙ ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ: %s"
+
+#: ../camel/camel-imapx-server.c:6618
+#: ../camel/providers/imap/camel-imap-folder.c:3532
+msgid "No such message available."
+msgstr "ØÛÙØØÙ ØÛÚÛØ ÙÙÙ."
+
+#: ../camel/camel-imapx-server.c:6773 ../camel/camel-imapx-server.c:6788
+msgid "Cannot create spool file: "
+msgstr "spool ÚÛØØÙØÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:827
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:830
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ÙÙÚ %s ØÙÙÙ IMAP ÙÛÙØØÙÙÛØÙØÙ"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "ØÙÙ"
+
+#: ../camel/camel-imapx-store.c:253
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
+
+#: ../camel/camel-imapx-store.c:352
+#: ../camel/providers/imap/camel-imap-store.c:2064
+#: ../camel/providers/imap/camel-imap-store.c:2262
+#, c-format
+msgid "No such folder %s"
+msgstr "ÚÛØØÛØ ÙÙØÙÛÚ Â%s ÙÛÛØÛØ ØÛÙÛØ"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:377 ../camel/camel-imapx-store.c:867
+#: ../camel/providers/imap/camel-imap-store.c:275
+#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../camel/providers/local/camel-maildir-store.c:307
+#: ../camel/providers/local/camel-maildir-store.c:699
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "ÙÙØÛÙÙØØ ØØÙØÛÙÙ"
+
+#: ../camel/camel-imapx-store.c:1100
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr ""
+
+#: ../camel/camel-imapx-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1771
+#, c-format
+msgid "No such folder: %s"
+msgstr "ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ: %s"
+
+#: ../camel/camel-imapx-store.c:1421
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imap/camel-imap-store.c:2524
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ÙÙØÙÛÚ ØØØÙ Â%s ØÙÙØÛÛØØÙØØ ÚÛÙÙÙ ØÛÙÙÚ ØÛØÙÙØÙØÛ Â%c ØÛÚÛÙ ÚÛØÙ ØØØ"
+
+#: ../camel/camel-imapx-store.c:1432
+#: ../camel/providers/imap/camel-imap-store.c:2537
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "ØØØØ ÙÙØÙÛÚ ÙØÙÛÙÛÙ: %s"
+
+#: ../camel/camel-imapx-store.c:1442
+#: ../camel/providers/imap/camel-imap-store.c:2140
+#: ../camel/providers/imap/camel-imap-store.c:2589
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ØØØØ ÙÙØÙÛÚ ØØÙØ ÙÙØÙÛÚÙÙÚ ØÙÙÛØÙØØ ÙÙÙ ÙÙÙÙØÙØÛ"
+
+#: ../camel/camel-imapx-stream.c:98
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ÙÛÙØÛ ØÛÙÙÙÙØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙØÙØÙÙØÙ"
+
+#: ../camel/camel-imapx-stream.c:107
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ÙÛÙØÛ ØÛÙÙÙÙ ÙÙÙ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2181,7 +2547,7 @@ msgstr "ØÛÙØÛØ ÚÛØØÙØÙÙÙ ØÙÙÛÛØØÙØÙØØ ØØØØÙÙÙ
 msgid "Error writing mail temp file: %s"
 msgstr "ØÛØ ÛØÙÙØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛØÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ØÛØ ÛØÙÙØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛÚÛØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
@@ -2228,12 +2594,12 @@ msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 msgid "Name lookup failed: %s"
 msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/camel-network-service.c:112
+#: ../camel/camel-network-service.c:114
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-offline-folder.c:210
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÙÙØÙÛÚ Â%s ØÙÙÙ ØÛÚÛØÙØØ ÙÛØÛÙØØØÙØÙ ØÙØÙÙØØ ØØÙÙØÛØØÙØÛ"
@@ -2251,22 +2617,22 @@ msgstr "ÙÛÛÚÛÙ ÙÙØÙÛÚ ØÛÙØÛØ ØÛÙÙÙÙÙÚÛÚÙ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ØØØÙØ ÙÙØÙÛÚÙØØ ØÙÙÙÙÙÚ ØÛØÛØØÛØÙÙØÙ ØÛÙÙØÙØÛ ØÛØ ØÙÙÛØ"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:258
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙ ÙÛÙÙÛØÙÙ ØÛ ØÙØØÛÙÙØØ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
 
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:267
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ÙÙ ØÙÙÛÙØÙÙÙØÙ: %s"
 
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:276
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙØÛ ØÛØÙÛÙÙÛØØÛØÛØ ÙÛÙÙØÙÙÙØÙ ÙÙÙ."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:406
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÙÛÙÙØÙÙ Â%s ÙÙÚ ØÛÙÙÙÙÙÚÛÚÙØÙ ÙÙÙ"
@@ -2282,7 +2648,7 @@ msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ Ø
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
-msgstr "ØÛÙÙÙÙÙÙÛÙÙÙØÙ."
+msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
 #: ../camel/camel-sasl-anonymous.c:81
 #, c-format
@@ -2308,171 +2674,171 @@ msgid ""
 msgstr "ØÙØÙØØ ØÛÚÛØÙ ØÙÙØÛÛØØÙØ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ CRAM-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ ØÙØÛØÛØ CRAM-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-digest-md5.c:55
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ DIGEST-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ ØÙØÛØÛØ DIGEST-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-digest-md5.c:846
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙ ØÛÙ ÙÙÙ(>2048 octets ØÙÙ ÙÙÙ)"
 
-#: ../camel/camel-sasl-digest-md5.c:857
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙ ØÙÙØÛÛØØÙØ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙØÛ ØÙÙØÛÛØØÙØ ÂØÛÙÛØÙÛ ÙØÙØÙÛØÙÙÙ ÙÙÙÙØÂ(QOP: Quality of Protection) ØÛÙÛÙÚÙØÙ(token) ØØØ"
 
-#: ../camel/camel-sasl-digest-md5.c:898
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÙÙÙÙ-ÙÛÙÛÙØØÙ ÙÙÙ"
 
-#: ../camel/camel-sasl-digest-md5.c:919
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÙÙÙÙ-ÙÛÙÛÙØØÙ ÚØÙØ"
 
-#: ../camel/camel-sasl-digest-md5.c:932
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙ ÙØØ ÙÛÙÙÙØÙ"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ Kerberos 5 ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:130
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "ØÛÙÚÙÙÛÙÚÛÙ ÙÛØØÙÙØÙÙÙØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÙØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ ÙØÙÙ ØÛÙÙÚ ÙØØÙÙÙØÙØØ ØÛÙÙ ØÙÙÛÙØÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:135
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ØÛÙÙÙÙÙÚÛÙ target_name ÙØØØÙÛØÙØÙÙÙÚ ÙÛØÛÙÙÙØÙ ØÙØØØ ØÛÙÛØ ØÙÙÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "ØÛÙÙÙÙÙÚÛÙ target_name ÙØØØÙÛØÙØÙÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ÙØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÙØØÙ ØÙÙØÙÙÙ ØØØ ØØØ"
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr "input_token ØÛØ ØÙÚÙÚÛ ØØÙØØÙ ÙØÙØÙ ØØØÙÙÙÙØÙ ÛÛ input_chan_bindings ÙØØØÙÛØÙØÙ ØÛÙÚÙÙÙÚÛÙ ÙØÙØÙ ØÙØØÙÙØÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token ÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ØÙÙØØ ÙØÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙØÙØÙØØÙ ØÙÙØØ ØØØ"
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙØØ ÙÙÙØÛÙÙØØ ØÛØÙÛÙÙÛØØÛØÛØÙÛ ØÙÙÙÙØÙ ÙØÙÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ØØØÙØ ÚÛÚÙØÙØØÙ ØÙØ ØÙØÙØØÙØÙÙÙÙ ÙÛØØÛØÙÙÚÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ÚÛÚÙØÙØØÙ ØÙØ ØÙÙØÛÛØÙÙÙ ÙÙÙØÛÙÙØØÙÙ ÙÛØØÛØÙÙÚÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "ØÙØÙØØÙØÙÙÙÙÚ ÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ÙØÙØÙÙØÙØØÙ ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÛØÛÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
-#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:575
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÛØØÙ ØØØØ."
 
-#: ../camel/camel-sasl-gssapi.c:406
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÙØØÙ) ØÙØÛØÛØÙÙÙ ÙÛÛÙØÙ."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
-msgstr "ØÙØÙÙØØ ÙÙØ"
+msgstr "ÙÙØÙØ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙ ØÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-login.c:103
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÚØÙÙØÙ ÙØÙÛÙÛÙ."
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:45
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ Windows ØØØØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ NTLM/ ØÙØÛØÛØ ØÙÙ ØØØÙÙÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-plain.c:40
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "SMTP ØÙÙ ØÛØÛÙ POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÙÙ ØØØØØÙØÙÙ ÙÛÙÙÙ ØØÙØÙÙ SMTP ÙÙ ØÙØÙÙØÙØÛ."
 
-#: ../camel/camel-sasl-popb4smtp.c:80
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
 msgstr "POP ÙÛÙØÛ UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØØ ØÛØÛÙÙ ØØØÙÙÙÙÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙÙÙ ØÙØÙÛØ"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ØÙØ %s ÙÛÙØØÙÙÙØÙ ØÙÙÛÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÛ ØÛØÛÙÛØ"
@@ -2482,414 +2848,422 @@ msgstr "ØÙØ %s ÙÛÙØØÙÙÙØÙ ØÙÙÛÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÙÛÙØÙØÙÙ ØÙÙØØÙÙÙ ØÛÚØÙØÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:415
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÙÛÙÙØÙÙ Â%s ØÛÚÛÙ ØÛØÙÙØÙÙÚÛÙ GType ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-session.c:462
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format
-#| msgid "No support for authentication type %s"
-msgid "No support for %s authentication"
-msgstr ""
-
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:509
 #, c-format
-#| msgid "Authentication failed"
 msgid "%s authentication failed"
-msgstr ""
+msgstr "%s ÙÙÚ ÙÙÙÙÙÙÙÙÙ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ."
+
+#: ../camel/camel-session.c:645
+msgid "Forwarding messages is not supported"
+msgstr "ØÛÚÛØÙØØÙÙ ÙÙÙÙØÙ ØÛØÙØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-session.c:1183
+#: ../camel/camel-session.c:1362
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ."
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Â%s ÙÙÚ ØÙØÙØØÙØÙÙØÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ØÙÙØØ ÙÙÙØÛÚÙÙÙÚ ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "ØÙØÙØØÙØÙÛ ØÛÙØÙØÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ØÙÙØØ ÛØÙØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "'%s' ÙÙÚ ØÙÙÙØÙØØ ØÙØÙØØÙØÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
+msgstr "â%sâ ÙÙÚ ØÙÙÙØÙØØ ØÙØÙØØÙØÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ØØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ØØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "ØÙÙÙØÙØØ ØÙØÙØØÙØÙÙØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ØÙÙØØ ÙÙÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "ØÛÙØÛØÛÙÙÙÚÛÙ"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "ÙØØØÙ ØÙÙØØ"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ØÙÙØØ ØØØØ"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "ÙÛØÙÛÙ ÙÙÙÙÙÙÙØ ØÛØÙØÙÙØØ ØÛØÚÛØØÙÙÚÛÙ"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ØÙÙØØÙÙÙ ØÙØÙØØÙØÙÛ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ØÙÙØØÙÙÙ ØÙØÙØØÙØÙÛ ØÙØÛÙÚØÙØ"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ØÙÙØØ ØØÙÚÙØÙØÙÙÙ ÙØÙÛÙÛÙ"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ØÙÙØØ ØØÙÚÙØÙØÙÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ÙÛØÛÙÙÙØÙ ØØØØ ØÙÙØ"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ØÙØØÛØÛÙ ÙÙÙÙØ ØØØØÙÙÙÙ"
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ØÙÙØØØØ ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙÙ"
 
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "ÙÛÙØÙÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØØÙÙÙ Digests ÙÙÙØÙØØÙ"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "digests ÙÙ ÚÛØØØÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ØÛÚÛØ digests ÙÙ ØÛÙÚÙÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ØÙØÙØØÙØÙÙÙÙ ØÙÙÙÙØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ØÛÚÛØÙØØÙÙÙØ ØÙØÙØØÙØÙØÛØ ØÙØÙØØÙØÙÙÙÛØÙÙ ØÛÙØÛØÙÛÙØÛ"
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ØÛÚÛØÙØØØ ØÙÙÙÙØØ ÙÙÙÙÙØØÙ ÛÛ ØÛÙØÛØÛÙÚÛÙ ØÙØÙØØÙØÙÙÙÛØÙÙ ØÙØÙØØÙØÙØÛ"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ØÙÙØØÙÙÚ digests ÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ØÙÙØØ ÙÙÙØÛÚÙ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
 msgid "Cannot create encoder context"
 msgstr "ÙÙØÙÙØÛÚ ÙÛØÙÛÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:850
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ÙÙØÙÙØÛÚÙØ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
 msgid "Failed to encode data"
 msgstr "ØØÙÙÙÙ-ÙÛÙÛÙØØÙØØÙÙ ÙÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
 msgid "Decoder failed"
 msgstr "ÙÙØØÙØÙÙØÛÚ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ØÙØØØÙ ØÙØÙÙØÙØÙØØÙ ØÙÙ ØÙÙÙØÙØØ ØØÙÚÙØÙØÙÙÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1076
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ØÙÙÙØÙØØ ØÙÙ ØØÚÙÛÚÙØØ slot ØÛÙØÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot create CMS Message"
 msgstr "CMS ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ÙÛÙØÙÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1099
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ÙÛÙØÙÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot attach CMS data object"
 msgstr "CMS ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÚÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ØØÙØÛØÛÛØÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ØØÙØÛØÛÛØÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1145
 msgid "Failed to add data to encoder"
 msgstr "ÙÙØÙÙØÛÚÙØ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1255
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ØÙÙÙØØÙØÙØØ: ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
-msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÙÛØØÙØÛ"
+msgstr "ÙÙØÙÛÚ â%sâ ÙÙ ØÛÚÙÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Â%s ØØ ÙÙØÙÛÚÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ØÛØÙÛØØØÙØ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ØÛØÙÛØ"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s:ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:300
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:306
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:788
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
+
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "ØØØÙÙÙÙØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "\"%s\" ØÛÙØÛÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
+msgstr "Â%s ØÛÙØÛÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
+
+#: ../camel/camel-subscribable.c:386
+#, c-format
+#| msgid "Creating folder '%s'"
+msgid "Subscribing to folder '%s'"
+msgstr "ÙÙØÙÛÚ â%sâ ØØ ÙÛØØÛØÙ ØÙÙÛÛØØÙØÛ"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+#| msgid "Opening folder '%s'"
+msgid "Unsubscribing from folder '%s'"
+msgstr "â%sâ ÙÙØÙÛÚÙØ ÙÛØØÛØÙ ØÙÙÛØØÙÙ ÚÛÙÙÙÙÛØØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
-msgstr ""
+msgstr "NSPR ØØØØÙÙÙ ÙÙØÙ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ SOCKS4 ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ ØÙÙØÙÙØØÙÙÙØÙÙ ØÛØ ÙÙÙØÙ: ÙÙØÙ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ SOCKS5 ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:789
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÙÛÛØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr "ØØØÛØØÙÙÙ SOCKS ÙÛÙØØÙÙÛØÙØ ØØØØÙÙÙÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙÙÙÚ ØÛØÛÙÙ ØÛÙÛÙÙÙ ØØØÙÙÙÙØÙØ ØÛØØÛØ ÙÙÙÙÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙØ ÙÛØÛÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØØ ØØÙÙØØØØÙÙ ÙÛØÚÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
 msgstr "ØÛÙÙÙÙØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr "Time-to-live ÙÙÚ ÛØÙØÙ ØÙØÙÛÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:807
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙ ØÛÙØÛÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:808
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙ ØØØØÛØ ØÙÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙØÙÛÙÛÙ ØØØØÙÙÙ ÙÛÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙØÙÛÙÛÙ ØØØØÛØ ØÙÙÙÙÙ ØØÙØÛØÛÛØÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:860
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙÛÙÚÛÙ ÚØÙØ ØØÛØØ"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ØØØ ØØÙÙØØØØ ØØØÙ ØÛÙ ØÛØÛÙ(ØÛÚ ÚÙÚ ØÙÙØØÙØØ 255 ÚÛØÙ ØÙÙÙØÛ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØÙÙØÛÛØØÙØ ØØÛØØ"
 
-#: ../camel/camel-tcp-stream-ssl.c:470
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
-#| msgid ""
-#| "Issuer:            %s\n"
-#| "Subject:           %s\n"
-#| "Fingerprint:       %s\n"
-#| "Signature:         %s"
 msgid ""
 "   Issuer:       %s\n"
 "   Subject:      %s\n"
 "   Fingerprint:  %s\n"
 "   Signature:    %s"
-msgstr ""
+msgstr "   ØØØÙØØÙÛÚÙ:       %s\n"
+"   ÙØÛØÛ:      %s\n"
+"   ØØØÙØÙ ØÙØÙ:  %s\n"
+"   ØÙÙØØ:    %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:509
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:509
 msgid "BAD"
 msgstr "ÙØÚØØ"
 
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:514
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
 "Detailed information about the certificate:\n"
 "%s"
-msgstr ""
+msgstr "â%sâ ÙÙÚ SSL ØÙØÙØØÙØÙÙØÙ ØÙØÛÙÚÙÙÙ ØÛÙÛØ. ÙÙØÛÙ ÙÙÙØÛÚÙØ ØØØÙÛØ\n"
+"\n"
+"ØÙØÙØØÙØÙÛ ÚÛÙÙÙØÙÙÙ ØÛÙØÙÙÙÙ ØÛÚÛØÙØØ ØÛÛÛÙØÙÙÙÚÛ:\n"
+"%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:520
 msgid "_Reject"
 msgstr "ØÛØ ÙÙÙ(_R)"
 
-#: ../camel/camel-tcp-stream-ssl.c:485
+#: ../camel/camel-tcp-stream-ssl.c:521
 msgid "Accept _Temporarily"
-msgstr ""
+msgstr "ÛØÙØÙÙÚÛ ÙÙØÛÙ ÙÙÙ(_T)"
 
-#: ../camel/camel-tcp-stream-ssl.c:486
+#: ../camel/camel-tcp-stream-ssl.c:522
 msgid "_Accept Permanently"
-msgstr ""
+msgstr "ÙÛÚÚÛ ÙÙØÛÙ ÙÙÙ(_A)"
 
-#: ../camel/camel-tcp-stream-ssl.c:544
+#: ../camel/camel-tcp-stream-ssl.c:583
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2897,7 +3271,7 @@ msgid ""
 msgstr "ØÙØÙØØÙØÙÙØÛ ÙÛØÙÙÛ ØØØ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:596
+#: ../camel/camel-tcp-stream-ssl.c:635
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2905,7 +3279,7 @@ msgid ""
 msgstr "ÙØÚØØ ØÙØÙØØÙØÙÛ domain: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:614
+#: ../camel/camel-tcp-stream-ssl.c:653
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2913,7 +3287,7 @@ msgid ""
 msgstr "ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:631
+#: ../camel/camel-tcp-stream-ssl.c:670
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2921,48 +3295,56 @@ msgid ""
 msgstr "ØÙØÙØØÙØÙÙÙÙ ØÛÙÛÙØÙÙ ÙØÙØÛØÛØ ØÙØÙÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "URL Â%s ÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ"
 
-#: ../camel/camel-vee-folder.c:647
+#: ../camel/camel-vee-folder.c:494
 #, c-format
-#| msgid "Storing folder"
-msgid "Updating %s folder"
-msgstr ""
+#| msgid "Creating folder '%s'"
+msgid "Updating folder '%s'"
+msgstr "ÙÛÚÙÙØÛØØÙÙÙÙ ÙÙØÙÛÚ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ØÛÚÛØÙØØÙÙ ÙÛÛÚÛÙ ÙÙØÙÛÚÙØ ÙÛÚÛØÚÙÙÙ ÙØÙÙ ÙÛØÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-vee-folder.c:1354
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ÙÙÚØØ  %1$s ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/camel-vee-folder.c:1422
+#: ../camel/camel-vee-folder.c:941
 #, c-format
 msgid "Error storing '%s': "
-msgstr "'%s' ÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ "
+msgstr "â%sâ ÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ "
+
+#: ../camel/camel-vee-folder.c:1169
+msgid "Automatically _update on change in source folders"
+msgstr ""
 
 #. 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
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "ÙØØÙØØÙÙØÙ"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr ""
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ØÛÚÛØÙØØÙÙ ØÛØÙÛØ ÙÙØÙÛÚÙØØ ÙÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
@@ -2972,33 +3354,30 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ØÛÚÛØÙØØÙÙ ÙÛØÛÙØÙØ ÙÙØÙÛÚÙØØ ÙÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "ÚÙÙÙØÙØ ØÛÙÙÙÙ ÙÙÙ"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "ÙÙØÙØ ØÛÙÙÙÙ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:425
 #, c-format
-#| msgid ""
-#| "Alert from IMAP server %s %s:\n"
-#| "%s"
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
 "%s"
 msgstr ""
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:429
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3006,100 +3385,78 @@ msgid ""
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s %s ØÙÙ ÙÛÙÚÛÙ ØÛÚÛØ:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:512
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØØÛØØ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:524
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:607
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØØÛØØ ØÛÙÙØ ØØÙØÛØ ØØØÙØÙÙØÙÙ ÙÛØØÙ."
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:822
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙÙÙÚ ØØÛØØÙÙÙÚ ØÙÚÙØÛ %s ØÛÚÛÙ ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:860
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ OK ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:344
-#| msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:356
 msgid "Always check for _new mail in this folder"
-msgstr ""
+msgstr "ØÛ ÙÙØÙÛÚØÙÙÙ ÙÛÚÙ ØÛØÙÛØÙÙ ØØØÙÙ ØÛÙØÛØØÛÙ(_N)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:355
-#: ../camel/providers/imapx/camel-imapx-folder.c:747
-#: ../camel/providers/nntp/camel-nntp-folder.c:756
-#| msgid "Cannot copy messages to the Trash folder"
-msgid "Apply message _filters to this folder"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-folder.c:437
+#: ../camel/providers/imap/camel-imap-folder.c:447
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÙÛÙØÛØÙØÛ %s ÙÛØÛØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:458
+#: ../camel/providers/imap/camel-imap-folder.c:468
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ÙÙÚ ØÛØÛÙØÙØÙÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1116
-#: ../camel/providers/imapx/camel-imapx-server.c:3949
+#: ../camel/providers/imap/camel-imap-folder.c:1137
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ØÙÙÙ ØÛØÚÛØØÙÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3473
+#: ../camel/providers/imap/camel-imap-folder.c:3494
 msgid "Unable to retrieve message: "
 msgstr "ØÛÚÛØÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ. "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3510
-#: ../camel/providers/imapx/camel-imapx-server.c:5511
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "ÙÙÙÙÙÙÙ %s ØÙÙØØÙ ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3511
-#: ../camel/providers/imapx/camel-imapx-server.c:5512
-msgid "No such message available."
-msgstr "ØÛÙØØÙ ØÛÚÛØ ÙÙÙ."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3586
-#: ../camel/providers/imap/camel-imap-folder.c:4464
-#: ../camel/providers/nntp/camel-nntp-folder.c:511
+#: ../camel/providers/imap/camel-imap-folder.c:3620
+#: ../camel/providers/imap/camel-imap-folder.c:4512
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "ØÛ ØÛÚÛØ ÚØØÙØ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4045
-#: ../camel/providers/imap/camel-imap-folder.c:4128
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:4085
+#: ../camel/providers/imap/camel-imap-folder.c:4167
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ØÙÙÙ ÙÛÚÙ ØÛÚÛØ ØÛÚÛÙ ØÛØÛÙØÙ ØÛÚÛØÙØØ ØÛØÙØÙÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4262
+#: ../camel/providers/imap/camel-imap-folder.c:4299
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÚÛÙÙÙØÙÙÙ ØÛÚÛØÙØØ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4272
+#: ../camel/providers/imap/camel-imap-folder.c:4309
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÙÙÚ UID ØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4504
+#: ../camel/providers/imap/camel-imap-folder.c:4549
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ØØÛØØÙØØ ØÛÚÛØ ÚÛÛØÙØÙ ÙÙÙ."
@@ -3125,433 +3482,157 @@ msgid "Failed to cache %s: "
 msgstr "%s ÙÙ ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "ÙÛÚÙ ØÛÙØÛØ ØÛÙØÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "ÚÛÙÙÛ ÙÙØÙÛÚØÙÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØ(_H)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ØÛØÙÛÙÚÛÙ ÙÙØÙÛÚÙØØÙÙÚ ØÛÚÙØÙÙÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØ(_E)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙÙØ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙÙØ ØÛÚÛÙ ØÙØØÙÙØØÙÙ ØÛÙØÛÙ ØÙØÙÛØ(_U)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "ØÛÙØÛÙ(_M):"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
-msgstr "ÙÙØÙÛÚ"
+msgstr "ÙÙØÙÛÚÙØØ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "ØÛØÙÛÙÚÛÙ ÙÙØÙÛÚÙØØÙÙ ÙÛØØÛØ(_S)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÛÙÙÙÙÙÚÛÙ ÙÙØÙÛÚ ØØØ ØÙØÙÛÙÙÙÙ ÙØÙÙØ(_V)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "ØØØ ØÙØÙÛÙÙ(_P)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ØØÙÙØÙÙØ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
-#| msgid "_Apply filters to new messages in INBOX"
 msgid "Apply _filters to new messages in all folders"
-msgstr ""
+msgstr "ØÛØÚÛÚÙÙ ØØØÙÙÙ ÙÙØÙÛÚØÙÙÙ ÙÛÚÙ ØÛÚÛØÙØØØØ ÙÙÙÙØÙØÛÙ(_F)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "ØÛ ÙÛÙØØÙÙÛØÙØØÙÙÙ ÙÙØÛÙÙØØ ØØÙØÛÙÙØØ ÙÛÚÙ ØÛÚÛØÙØØØØ ØÛØÚÛÚ ÙÙÙÙØÙ(_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-#| msgid "Check new messages for Jun_k contents"
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ÙÛÚÙ ØÛÚÛØÙØØØÙÙ ØÛØÙÛØ ÙÛØÙÛÙÙØØÙÙ ØÛÙØÛØ(_J)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ÙÛÙÛØ INBOX ÙÙØÙÛÚÙØÙÙÙ ØÛÚÛØÙØØ ÙÛØÛÙØÙØÙÛ ØÛÙÛØÙÛ ØÛÙØÛØ(_B)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÙÙØØÙØÙÙÙ ØÛØÙÛØÙÙ ÙÛØÙÙÙÙÛ ØØÙØÙÙØØÙÙ ÙÛØÛÙØØØÙØ(_Z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "IMAP ÙÛÚÛÙØÙÙÙ ØÛØÙØ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "SSL ØÛØØÙØÙÙÙ IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØØ ØÛØÙÛØÙÙ ØÙÙÛØ ÛÛ ØØÙÙØØ ØÛÚÛÙ."
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:118
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid "Password"
-msgstr "ØÙÙ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:109
-#: ../camel/providers/imapx/camel-imapx-provider.c:120
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "ÙÙØÛÙÙØØ ØØÙØÛÙÙ"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#, 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:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "STARTTLS ÙÙ ÙÙÙÙÙÙØÙØÛ"
-
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2868
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-#| msgid "IMAP server %s does not support requested authentication type %s"
-msgid "IMAP server %s does not support %s authentication"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s ÙÙÚ %s ØÙÙÙ IMAP ÙÛÙØØÙÙÛØÙØÙ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1111
-#: ../camel/providers/imapx/camel-imapx-server.c:2965
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate without a username"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-store.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:2974
-#: ../camel/providers/nntp/camel-nntp-store.c:514
-#: ../camel/providers/pop3/camel-pop3-store.c:491
-#: ../camel/providers/pop3/camel-pop3-store.c:511
-#| msgid "Authentication Failed"
-msgid "Authentication password not available"
-msgstr ""
-
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imap/camel-imap-store.c:2269
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#, c-format
-msgid "No such folder %s"
-msgstr "ÚÛØØÛØ ÙÙØÙÛÚ Â%s ÙÛÛØÛØ ØÛÙÛØ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "ÙÙØÙÛÚ ØØØÙ Â%s ØÙÙØÛÛØØÙØØ ÚÛÙÙÙ ØÛÙÙÚ ØÛØÙÙØÙØÛ Â%c ØÛÚÛÙ ÚÛØÙ ØØØ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ØØØØ ÙÙØÙÛÚ ØØÙØ ÙÙØÙÛÚÙÙÚ ØÙÙÛØÙØØ ÙÙÙ ÙÙÙÙØÙØÛ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
-#: ../camel/providers/local/camel-maildir-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:421
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../camel/providers/imap/camel-imap-store.c:2191
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
+#: ../camel/providers/imap/camel-imap-store.c:2984
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "ØØØØ ÙÙØÙÛÚ ÙØÙÛÙÛÙ: %s"
+#| msgid "Retrieving quota information for '%s'"
+msgid "Retrieving list of folders at '%s'"
+msgstr "ØÙØÛÙ â%sâ ØÙÙÙ ÙÙØÙÛÚÙØØÙÙÚ ØÙØÙÙÙÙ ØÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3326
+#: ../camel/providers/imap/camel-imap-store.c:3334
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3338
 msgid "Server unexpectedly disconnected: "
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "ÙÙØÙÛÚ %s ÚÛÙÙÙØÛ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "%s ØÛÙÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ØÛÚÛØ ÙÛÙØØÙÙÛØÙØ ÙÙÙÙÙØØ _Quick Resync ÙÙ ØÙØÙÛØ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "ØÛÙØÛÙ:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "ØÙØÙÙØÙØÙØØÙ ØÛÙÙÛÙÚÛÙ ØØØÙØÙÙØ ØØÙÙ"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "ØØØ ØÙØÙÛÙÙ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
 msgstr "ÙÛÚÛÙØÙÙÙ IMAP ØÛØÙØÙ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-#| msgid "Server unexpectedly disconnected"
-msgid "Server disconnected"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-msgid "Error writing to cache stream: "
-msgstr "ØÛÙÙÛÙ ØÛÙÙÙÙØØ ÙÛØÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "ØØÙØÚÙÙÙØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2005
-#| msgid "Error performing search"
-msgid "Error performing IDLE"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3160
-#| msgid "Encrypting message"
-msgid "Error fetching message"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
-msgid "Closing tmp stream failed: "
-msgstr "tmp ØÛÙÙÙÙÙÙ ÙÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3327
-#| msgid "Copying messages"
-msgid "Error copying messages"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3457
-#| msgid "Sending message"
-msgid "Error appending message"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3637
-msgid "Error fetching message headers"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3778
-#| msgid ""
-#| "Error retrieving newsgroups:\n"
-#| "\n"
-#| "%s"
-msgid "Error retrieving message"
-msgstr "ØÛÚÛØÙÙ ÚØÙÙØÙØØØ ØØØØÙÙÙ ÙÛØ ØÛØØÙ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
-#| msgid "Checking for new messages"
-msgid "Error fetching new messages"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4174
-msgid "Error while fetching messages"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4182
-#: ../camel/providers/imapx/camel-imapx-server.c:4212
-#, c-format
-#| msgid "Fetching summary information for new messages in %s"
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4334
-#: ../camel/providers/imapx/camel-imapx-server.c:4368
-#| msgid "Error performing search"
-msgid "Error refreshing folder"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4457
-#| msgid "Expunging old messages"
-msgid "Error expunging message"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4542
-#| msgid "Creating folder '%s'"
-msgid "Error fetching folders"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4616
-#| msgid "_Show only subscribed folders"
-msgid "Error subscribing to folder"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4669
-#| msgid "Storing folder"
-msgid "Error creating folder"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4714
-#| msgid "Storing folder"
-msgid "Error deleting folder"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4764
-#| msgid "Storing folder"
-msgid "Error renaming folder"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4815
-#| msgid "Error performing search"
-msgid "Error performing NOOP"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4910
-msgid "Error syncing changes"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5666
-#: ../camel/providers/imapx/camel-imapx-server.c:5681
-msgid "Cannot create spool file: "
-msgstr "spool ÚÛØØÙØÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: "
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format
-#| msgid "Retrieving quota information for '%s'"
-msgid "Retrieving folder list for %s"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
-#, c-format
-msgid "No such folder: %s"
-msgstr "ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ: %s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "ÙÛÙØÛ ØÛÙÙÙÙØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙØÙØÙÙØÙ"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "ÙÛÙØÛ ØÛÙÙÙÙ ÙÙÙ"
-
-#: ../camel/providers/local/camel-local-folder.c:187
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:197
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ØÛØØØÙ: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:215
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:479
-#| msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
-msgstr ""
+msgstr "ØÛÚÛØ ÚÛÛØÙØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙØÛÙØÙØ(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:710
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3559,58 +3640,57 @@ msgid ""
 msgstr "ØÛÚÛØ %s ÙÙ ÙÙØÙÛÚ %s ØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "'.folders' ØÛÚÛÙ ÙÙØÙÛÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÚÛØØÙØÙ(exmh)ÙÙ ØÙØÙÛØ(_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-format ØÛØ ÙÛÙØÛØÙØÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ÙÛØÙÙÙ ØÛØÙÛØÙÙ MH-like ØÛØ ÙÛÙØÛØÙØÙÙÙØÙØÛ ØØÙÙØØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ÙÛØÙÙÙØÛ ÙÛØÙÛØ"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr "ÙÛØÙÙÙ ØÛØÙÙ ØØØÛØØÙÙÙ mbox ÙÙÚÙÙÙØÙÙÙ ØÙØØÙØ ÙÙØÙÛÚØÙÙ ØÛØÙØÙÙ Evolution ØØØÙÛØÙØÙØØÙ ÙÙØÙÛÚÙØ ÙÛØÙÛÙØÛ."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "_Apply filters to new messages in Inbox"
-msgstr ""
+msgstr "ØÛØÚÛÚÙÙ Inbox ØÙÙÙ ØØØÙÙÙ ØÛØÙÛØÚÛ ÙÙÙÙØÙØÛÙ(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir ÙÙØÙØØÙØÙÙÙ ØÛØ ÙÛÙØÛØÙØÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "ÙÛØÙÙÙ ØÛØÙÛØÙÙ maildir ÙÛÙØÛØÙØÙØÙØÛ ØØÙÙØØ ØÛÚÛÙ."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "ÚØÙÛØ ÙÛØÙÙÙ Elm/Pine/Mutt ÙÙØÙØØÙØØ ØØÙÙØ(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÚÛØØÙØÙ"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "ØÙØØÙÙ ØØØÛØØÙÙÙ mbox ØÙØØÙØ ÚÛØØÛØØÙÙÙ ÙÛØÙÙÙ ØÛØÙÙ ØÙÙÛØ ÛÛ ØØÙÙØØ ØÙØØØØÙØ ElmØ Pine ÙØÙÙ Mutt ØÛØÙÛØÙØÙÙÙ ÙÛÙØÛØÙØÛ ØØØÙÙ ØÙÙÛØÙÙÙÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÛ"
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÙÛÙØÛØÙØÙØÙ"
 
@@ -3619,169 +3699,168 @@ msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÙÛÙØÛØÙØÙØÙ"
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ÙÙØÙÛÚ %s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:180
 #, c-format
 msgid "Local mail file %s"
 msgstr "ÙÛØÙÙÙ ØÛØ ÚÛØØÙØÙ %s"
 
-#: ../camel/providers/local/camel-local-store.c:218
-#: ../camel/providers/local/camel-local-store.c:375
-#: ../camel/providers/local/camel-maildir-store.c:101
-#: ../camel/providers/local/camel-mbox-store.c:555
-#: ../camel/providers/local/camel-spool-store.c:86
+#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:383
+#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛØÙÛÙ ÙÙÙ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:227
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛÙØÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:239
-#: ../camel/providers/local/camel-local-store.c:249
-#: ../camel/providers/local/camel-local-store.c:388
-#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:254
+#: ../camel/providers/local/camel-local-store.c:396
+#: ../camel/providers/local/camel-maildir-store.c:137
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:286
+#: ../camel/providers/local/camel-local-store.c:291
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÙÛØÙÙÙ ØØÙÙÙØÛÚØØ inbox ÙÙÙ"
 
-#: ../camel/providers/local/camel-local-store.c:445
-#: ../camel/providers/local/camel-mbox-store.c:722
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÙÙØÙÛÚ ØÙÙØÛÙØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-local-store.c:473
-#: ../camel/providers/local/camel-mbox-store.c:752
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ÙÙØÙÛÚ ÙÛØØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-local-store.c:581
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
 #, 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:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "ØÛÚÛØ ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ÙÙØÙÛÚÙØØ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ØÛÚÛØ %s ÙÙ ÙÙØÙÛÚ %s ØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ØÛÚÛØÙÙ ÙÙØØÙ ÙÙØÙÛÚÙØ ÙÛØÙÛØÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:112
 #, c-format
-#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-msgstr ""
+msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s: ÙÙØÙÛÚ ØØØÙ ØÛØÙÙØÙØÛ ÚÛÙÙØ ØÙÙØØ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÙÙØÙÛÚ %s ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
-#: ../camel/providers/local/camel-maildir-store.c:215
-#: ../camel/providers/local/camel-maildir-store.c:246
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:252
 #: ../camel/providers/local/camel-mbox-store.c:403
+#: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "'%s' ÙÙØÙÛÚ ÙÛØØÙÙÙØÙ: %s"
+msgstr "â%sâ ÙÙØÙÛÚ ÙÛØØÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-mbox-store.c:355
-#: ../camel/providers/local/camel-mh-store.c:516
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mh-store.c:531
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-maildir-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:269
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: maildir ÙÛÙØÛØÙØÙØÙ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-maildir-store.c:329
-#: ../camel/providers/local/camel-maildir-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:670
+#: ../camel/providers/local/camel-maildir-store.c:338
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-mh-store.c:682
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:340
 msgid "not a maildir directory"
 msgstr "maildir ÙÛÙØÛØÙØÙØÙ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
-#: ../camel/providers/local/camel-spool-store.c:209
-#: ../camel/providers/local/camel-spool-store.c:228
+#: ../camel/providers/local/camel-maildir-store.c:589
+#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÙØÛØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:773
+#: ../camel/providers/local/camel-maildir-store.c:797
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s :ÙÙØÙÛÚ ØØØÙØØ ÚÛÙÙØ ØÙÙØØ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:413
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ÙÛÙØÛØÙØÙØÙÙÙÚ ÙÙÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:537
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ÙÙØÙÛÚÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:630
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ÙÛÚÙ ØÛÚÛØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "ÙÙØÙÛÚÙØ ØØÙÙØÛØØÙØÛ"
 
@@ -3800,39 +3879,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÙÙØÙÛÚ ØÛØÙÙÚÛ ÙÛÙØÛØÚÙÙÙ ØÙÙÙÙØÛØÛÙ ØÛØÙØÙØÛ ØÛØÛÙÛÙØÛ."
 
 #: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ØÛÚÛÙ ÙÙØÙÛÚÙÙÚ ÙÛÙÛÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:563
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ØÛ ØØØÙÙ ØÙØÙÙØÙÙ ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:414
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:617
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:593
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "ÙÙØÙÛÚ ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
-#: ../camel/providers/local/camel-mbox-store.c:633
-#: ../camel/providers/local/camel-mbox-store.c:646
-#: ../camel/providers/local/camel-mbox-store.c:675
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3840,33 +3919,33 @@ msgid ""
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:656
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "'%s' is not a regular file."
-msgstr "'%s' ÙÛÙØÙØÙÙ ÚÛØØÛØ ØÛÙÛØ."
+msgstr "â%sâ ÙÛÙØÙØÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:665
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "ÙÙØÙÛÚ '%s' ÙÛØÛÙ ØÛÙÛØ. ØÛÚÛØÛÙÙÙØÙ."
+msgstr "ÙÙØÙÛÚ â%sâ ÙÛØÛÙ ØÛÙÛØ. ØÛÚÛØÛÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:692
-#: ../camel/providers/local/camel-mbox-store.c:707
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÙÙØÙÛÚÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:789
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÙÛÚÙ ÙÙØÙÛÚ ØØØÙ ØÙØØØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:805
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ Â%s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:888
+#: ../camel/providers/local/camel-mbox-store.c:915
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
@@ -3881,128 +3960,127 @@ msgstr "ÙÙØÙÛÚÙÙ ØØÚØÙÙÙØÙ: %s: %s"
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÙÙØÙÛÚ %2$s ÙÙÚ %1$s ØÛØØØÙÙØØ ØÛØÙØ ØÛÚÙÙÙ ÙÙÙÙØ ØØØØÙÙÙÙ ÙÛØ ØÛØØÙ."
 
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÚÛØØÛØÙÙ ØØÚØÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÙÛÙØÛ ÙÙØÙÛÚÙ %s ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÛØÙÙØÙÙÙ ÙÙØÙÛÚ ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1123
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr "MBOX ÚÛØØÙØÙ ØÛØÛÙÛÙØÛØ ØÛØÙØÙÚ.(From ØÛÚÛÙ ÙÛØ ØÙÙÛØÙ ÙÛØÛÙ ØÙØÙØ ØÙØØÙ ÙÙÙ ØÙÙÛÙ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1136
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÙÛØÛÙØØØÙÙØØÙ ØÙÙØÙÙÛØ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ØÙÙÛÙ ÙÛÙØÛØÙØÛ ÙØØÙØØÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1194
+#: ../camel/providers/local/camel-mbox-summary.c:1224
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ÙÙØÙÛÚÙØØ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:535
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:551
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØÛØÙØÛ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mh-summary.c:224
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ÙÛÙØÛØÙØÙØÙÙÙÚ ÙÙÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:94
+#: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Spool '%s' ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
+msgstr "Spool â%sâ ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:108
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "Spool '%s' ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
+msgstr "Spool â%sâ ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool ØÛØÙ ÚÛØØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:420
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool ÙÙØÙÛÚÙ ØÛØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:423
-#| msgid "Invalid source"
+#: ../camel/providers/local/camel-spool-store.c:432
 msgid "Invalid spool"
-msgstr ""
+msgstr "ØÙÙØÛÛØØÙØ spool"
 
-#: ../camel/providers/local/camel-spool-store.c:480
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÙÙØÙÛÚ '%s/%s' ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:493
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4010,12 +4088,12 @@ msgid ""
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÚØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:499
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
 msgid "Folder '%s' does not exist."
-msgstr "ÙÙØÙÛÚ '%s' ÙÛÛØÛØ ØÛÙÛØ."
+msgstr "ÙÙØÙÛÚ â%sâ ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4023,41 +4101,41 @@ msgid ""
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:520
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
 msgid "'%s' is not a mailbox file."
-msgstr "'%s' ØÛØ ØØÙØÛÙÙ(mailbox) ÚÛØØÙØÙ ØÛÙÛØ."
+msgstr "â%sâ ØÛØ ØØÙØÛÙÙ(mailbox) ÚÛØØÙØÙ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:584
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "INBOX ÙØ ØØÙÙØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-spool-store.c:603
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ÙÙØÙÛÚÙÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-store.c:618
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ÙÙØÙÛÚÙÙÙÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÛØÙÙØÙÙÙ ÙÙØÙÛÚ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:212
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "spool ÙÙØÙÛÚÙ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -4065,47 +4143,47 @@ msgid ""
 msgstr "spool ÙÙØÙÛÚÙ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s\n"
 "ÙÙØÙÛÚ ØÛØÛÙØØÙØÛÙ ÙÙÙÙØÛØ ØÛ Â%s ØØ ØØÙÙØÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:286
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:497
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ØÙÚÙÙ ØØØØÙÙÙ: UID ÙÙÚ ÙÙØÙØØÙ ØÙÙØÛÛØØÙØ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:336
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/pop3/camel-pop3-folder.c:613
-#: ../camel/providers/pop3/camel-pop3-folder.c:997
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:347
-#: ../camel/providers/nntp/camel-nntp-folder.c:522
-#: ../camel/providers/pop3/camel-pop3-folder.c:551
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#: ../camel/providers/pop3/camel-pop3-folder.c:622
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ØÛÚÛØ %s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:581
-#: ../camel/providers/nntp/camel-nntp-folder.c:587
-#: ../camel/providers/nntp/camel-nntp-folder.c:634
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÙÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
-msgstr "ÙÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s "
+msgstr "ÙÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:658
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ NNTP ØÛÚÛØÙÙÙ ØÛÛÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:678
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ÙÙØÙÛÚÙØÙÙ ØÛÚÛØÙØØÙÙ ÙÛÚÛØÚÙÙÙ ØÙÙÙØÙØÛ"
@@ -4115,48 +4193,48 @@ msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ÙÙØÙÛÚÙØØÙÙ ÙÙØÙØØØÙÙ ÙÛØØÛØ(_S)(comp.os.linux ÙÙ c.o.linux ØÛÙÙÙØÛ )"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:50
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ÙÛØØÛØÙ ØÛØÙÛØÙÛØÙØÛ ÙÛÙØØÙÛÛØÙÙÙ ÙÙØÙÛÚ ØØØÙÙØÙÙÙ ÙÛØØÛØ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "ÙÛÚÛÙØÙÙÙ NNTP ØÛØÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
 msgstr "SSL ØÛØØÙØÙÙÙ NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET ØÛÛÛØÙÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:65
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ØÛ USENET ØÛÛÛØ ÚÛØÛÙÙÙØÙØÙÙ ØÙÙÛØ ÛÛ ØÛÙÙÚ ØÛÛÛØÙØ ØÙÙØÙØØØÙÙÙ ØÛÙÙÙÙÛÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:86
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ NNTP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙ ØÙØÙÙØÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:286
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ØÙÙ ÙÛÙÚÛÙ ØØÙØÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:298
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØØØØÙÙÙ ÙÙØÙ %d ÙØÙØÙÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:463
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ØØØÙÙÙÙÙ ÙÛÙÚÛÙ USENET ØÛÛÛØÙÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4166,22 +4244,22 @@ msgstr "ØÛÛÛØ ÚÛØÛÙÙÙØÙÙÙ ØÙÙÛØØØ ØØØØÙÙÙ ÙÛØÛ
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "News store ÙÙÚ ØÙÚÙÚÛ ÙÛÚÙ ÙÙØÙÛÚ ÙÛØØÙÙØÙØÙØ: ÙÛØØÛØÙ ØÙÙÛÚ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1168
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÛÙØÙØ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1191
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚÙÙ ÚÙÙÙØÙÛÛØÛÙÙÛÙØÙØ. ÙÛØØÛØÙ ØÙÙÙÙØÙÚÙØÙØ ØÙÙÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1390
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4191,7 +4269,7 @@ msgstr "ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ Ø
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÙÙ. ØØÙÙØÙØÙÙÙ ØÛÙÙÙÙ ØØØØ ÙÙØÙÛÚ ØÙÙÛØÙ ÙÛÙÙÙÙ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1438
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4201,69 +4279,72 @@ msgstr "ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ Ø
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1628
 msgid "NNTP Command failed: "
 msgstr "NNTP ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
 msgid "Not connected."
 msgstr "ØØØÙØÙÙÙØØÙ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:195
-#: ../camel/providers/nntp/camel-nntp-summary.c:322
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÙÛÚÙ ØÛÚÛØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:213
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ØÙÙ  ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÙÛÙØØÙÙÛØÙØÙ ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ØÙÙ  ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÙÛÙØØÙÙÛØÙØÙ ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:387
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÙÛØØÛÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:519
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÙÙÙÙÙÙÙ %s ØÙÙØØÙ ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:535
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ØÛÚÛØÙ %d ÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:614
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "ÙØÙÛÙÛÙ ØÛÛÛØ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "POP ÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙÙÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 msgid "Cannot get POP summary: "
 msgstr "POP ÙÙÚ ØÛØÛÙØÙØÙÚÛ ØÛØÙØÛÙÙÙØÙ: %s "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:825
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "ÙÙÙØ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:845
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "ØÛÚÛØÛÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "ØÛÚÛØ ØØÙÙÙØÛÚ"
 
@@ -4271,43 +4352,44 @@ msgstr "ØÛÚÛØ ØØÙÙÙØÛÚ"
 msgid "_Leave messages on server"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØÛÚÛØÙÙ ÙØÙØÛØÛÙ ÙÙÙ(_L)"
 
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s ÙÛÙØÙÙ ÙÛÙÙÙ ØÛÚÛØ(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr "ÙÛØÙÙÙ ÙÙØÛÙÙØØ ØØÙØÛÙÙØÙÙ ÙÙØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙØØÙ ØÛØÙÙ ØÛÚÛØ(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "ØØØÙÙÙ POP3 ÙÛÚÛÙØÙÙÙÙÙÙØÙÙÙ ÙÙÙÙØØÙÙ ÚÛÙÙÛ(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
 msgstr "ÙÛÚÛÙØÙÙÙ POP3 ØÛØÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
 msgstr "SSL ØÛØØÙØÙÙÙ POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ØØØÙÙÙÙÙ ØÛØÙÛØÙÙ POP ÙÛÙØØÙÙÛØÙØÙØÙÙ ÚÛØÛØÛØ ØÛÚÛÙ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ. ØÛ ÙÛØØÛÙÙÙØØÙ POP ÙÛÙØØÙÙÛØÙØÙÙØÙØØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØØÙÙ ØÙØ ØØÙÙØÙÙØ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:94
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4319,59 +4401,60 @@ msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØ
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/pop3/camel-pop3-store.c:144
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØÙÙØÛÛØÙÙÙ ØØÙØÙÙÙ ØÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:153
+#: ../camel/providers/pop3/camel-pop3-store.c:159
 #, 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:154
+#: ../camel/providers/pop3/camel-pop3-store.c:160
 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:172
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, 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:185
+#: ../camel/providers/pop3/camel-pop3-store.c:194
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:288
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙØØ ÙÙØÚÙÙÙ ØÙÙÙÙØÙ%s: SASL ÙÛÙÙØÙÙÙ ØØØØ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:310
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:390
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s ÙÙÚ %s ØÙÙÙ POP3 ÙÛÙØØÙÙÛØÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ. ØÙÙØÛÛØØÙØ APOP ÙÙÙÙÙÙÙÙÙ ØØÙØÛØÛÛØÙØÙ. ÙÙÙØØÙØÙØØÙ ÚÛØÛÙ ØÛÙ ÙØØØØÙØ ØÙÙÙØÛ. ØØØÙÛØØÛÚÙ ØÙÙÛÙ ØØÙØÙÛ ÙÙÙÙÚ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4381,7 +4464,7 @@ msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:630
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4389,22 +4472,23 @@ msgid ""
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
 "ØÙØÙÛØÙÛÚÙ ØØØÙ %s ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:690
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙÙÙØÙÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:718
 #, c-format
 msgid "No such folder '%s'."
 msgstr "`%s' ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:735
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ØØÙÙÙØÛÚÙØØ ÙÙØÙÛÚ ÙÛØÛÙÙÙØÙ ÙÙÙ"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../data/sources/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4422,36 +4506,36 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ÙØÙÚØØÙÙÙØÙ ØØØÙÙÙÙÙ ØÛØ ÙÛØÙÛØÛØ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "ÙÙØÛÙ ÙÙÙØÛÚÙÙØØÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ØØ pipe ÙÛØØÙÙÙØÙ: %s: ØÛØ ØÛÛÛØÙÙÙÙØÙ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ÙÙ ØØÚÙÙÙÙØÙÙÙØÙ: %s: ØÛØ ØÛÛÛØÙÙÙÙØÙ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not send message: "
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙÙØÙÙÙØÙ: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ÙØÙÚØØÙÙÙØÙ %s ØÛÚÛÙ ØÙÚÙØÙ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ÙÙ ØÙØØØ ÙÙÙØÙÙÙØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ÙØÙÚØØÙÙÙØÙ %d ØÛÚÛÙ ÚØÙÛØ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
@@ -4476,367 +4560,618 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ÙÙ ØÙØÙÙØÙÙØ ÙÙØØÙØÙÙÙ mailhub ØØ ØØØÙÙÙÙÙØ ØÛØÙÛØÙÙ ÙÛØÙÛØÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Welcome response error: "
 msgstr "ÙÛØÚØØØ ØÛÚÛÙ ØØÛØØ ØØØØ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 #, 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:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:304
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ØÛØÙÙØÙÙÙ %s ØØØÙÙÙÙ ÙÛØÙÛØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:378
 #, c-format
-#| msgid "SMTP server %s does not support requested authentication type %s."
 msgid "SMTP server %s does not support %s authentication"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:499
+#: ../camel/providers/smtp/camel-smtp-transport.c:512
 msgid "AUTH command failed: "
 msgstr "AUTH ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØØÙÙÛØÙÛ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÛÛØÙÛÚÙÙÙÚ ØØØØÛØÙ ØÙÙØÛÛØØÙØ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Sending message"
 msgstr "ØÛÚÛØ ÙÙÙÙØÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:690
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØØÙØÛØÛÙ ØØÙØÛÚÙ ÙÙÙ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙ ØÛÚÛÙØÛ ØÙØ ØØÙØÛØÛÛØÙØÛÚÙ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Syntax error, command unrecognized"
 msgstr "ÚØØÙÙØØÙÙÙÙÙÙ ØØØØÙÙÙØ ØÛÙØÛÙ ÙØØÙÙÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Syntax error in parameters or arguments"
 msgstr "ÙØØØÙÛØÙØØØ ÙØÙÙ ØØÙÙØÙÙÙØØ ÚØØÙÙØØÙÙØ ØØØØÙÙÙÙ ØØØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Command not implemented"
 msgstr "ØÛÙØÛÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Command parameter not implemented"
 msgstr "ØÛÙØÛÙ ÙØØØÙÛØÙØÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "System status, or system help reply"
 msgstr "ØÙØØÛÙØ ÚØÙÙØÙ ÙØÙÙ ØÙØØÛÙØ ÙØØØÙÙÙÙÙÚ ØØÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Help message"
 msgstr "ÙØØØÛÙ ØÛÚÛØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Service ready"
 msgstr "ÙÛÙØØÙÙÛØ ØÛÙÙØØ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Service closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØ ÙÙÙÙØØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "Service not available, closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛØ ÙÛØÙÛØÛØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested mail action okay, completed"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ÙÙØÙØÙ ØØÙØÙÙØÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "User not local; will forward to <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØ: <forward-path> ØØ ÙÙÙÙÙÙÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Requested action aborted: error in processing"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÙØØÛØÛÙ ÙÙÙÙØ ØÛØÙØÙÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:835
 msgid "User not local; please try <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØØ <forward-path> ÙÙ ØÙÙØÙ ÙÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÙØØÛÙØ ØØÙÙÙØÛÚÙØÙ ÙÛØÙØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÛÙØÙÙÙÛÙÚÛÙ ØØÙÙØØ ØØØÙØÙØÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙ ØØØÙØØ ØÛØØÛØ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ØÛØ ÙÙØÚÛØÛØÙÙ ØØØÙØÚ. ØØØÙØÙØØØÛØÛØ ØÛÚÛÙ <CRLF>.<CRLF> ÙÙ ÙÙØÚÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
 msgid "Transaction failed"
 msgstr "ØÙØØÛØÛÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "A password transition is needed"
 msgstr "ØÙÙ ØÛØÚÛØØÙØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:851
 msgid "Authentication mechanism is too weak"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÙ ØØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:853
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÚÛÙ ØÙÙÙØÙØØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:855
 msgid "Temporary authentication failure"
 msgstr "ÛØÙÙØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "SMTP Greeting"
 msgstr "SMTP ØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
 #: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#: ../camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "HELO command failed: "
 msgstr "HELO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1240
+#: ../camel/providers/smtp/camel-smtp-transport.c:1255
+#: ../camel/providers/smtp/camel-smtp-transport.c:1265
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1292
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1349
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1362
+#: ../camel/providers/smtp/camel-smtp-transport.c:1373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1443
+#: ../camel/providers/smtp/camel-smtp-transport.c:1463
+#: ../camel/providers/smtp/camel-smtp-transport.c:1477
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
 msgid "DATA command failed: "
 msgstr "DATA ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1535
 msgid "RSET command failed: "
 msgstr "RSET ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1574
+#: ../camel/providers/smtp/camel-smtp-transport.c:1581
 msgid "QUIT command failed: "
 msgstr "QUIT ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+#| msgid "Contact ID already exists"
+msgid "Contact UID of a user"
+msgstr "ØÙØÙÛØÙÛÚÙÙÙÚ ØØÙØÙÙÙÙØÙØ ÙÙÙÙÙÙ(UID)"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "ØÛØÛÙØØÙ ÙÛÙ ÛÛ ØØØÙØÛ ÙÛÙ ØÛØÙÛØØÙÛÚ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "ØÛØÛÙØØÙ ÙÛÙ ÛÛ ØØØÙØÛ ÙÛÙ ØÛØÙÛØØÙÛÚ ÙÙÙÙÙØÙ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "ØÛØÛÙØØÙ ÙÛÙ ÛÛ ØØØÙØÛ ÙÛÙ ØÛØÙÛØØÙÛÚ ØÙØÙÙÙÙ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+
+#: ../data/sources/birthdays.source.in.h:1
+msgid "Birthdays & Anniversaries"
+msgstr "ØÛØÛÙØØÙ ÙÛÙ ÛÛ ØØØÙØÛ ÙÛÙÙÛØ"
+
+#: ../data/sources/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../data/sources/contacts-stub.source.in.h:1
+#: ../libedataserverui/e-name-selector-dialog.c:427
+#: ../modules/google-backend/module-google-backend.c:183
+msgid "Contacts"
+msgstr "ØØÙØÙÛØØØÙØØ"
+
+#: ../data/sources/google-stub.source.in.h:1
+msgid "Google"
+msgstr "ÚÛÚÙÙ(Google)"
+
+#: ../data/sources/ldap-stub.source.in.h:1
+#| msgid "IMAP server %s"
+msgid "On LDAP Servers"
+msgstr "LDAP ÙÛÙØØÙÙÛØÙØÙÙØÙØØ"
+
+#: ../data/sources/local.source.in.h:1
+#: ../data/sources/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "ØÛ ÙÙÙÙÙÛØÛØØØ"
+
+#: ../data/sources/vfolder.source.in.h:1
+#| msgid "Folders"
+msgid "Search Folders"
+msgstr "ÙÙØÙÛÚ ØÙØØÛ"
+
+#: ../data/sources/weather-stub.source.in.h:1
+#| msgid "Weather: Fog"
+msgid "Weather"
+msgstr "ÚØÛØ ØØÙÙ"
+
+#: ../data/sources/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr "ØÙØØØ"
+
+#: ../data/sources/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../libebackend/e-authentication-mediator.c:205
+#: ../libebackend/e-authentication-mediator.c:216
+#: ../libebackend/e-authentication-mediator.c:849
+#: ../libebackend/e-authentication-mediator.c:1179
+msgid "Bus name vanished (client terminated?)"
+msgstr ""
+
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+msgstr "ØÛØÙØØØØÙÙ ØÙÙÙØØ ÙÙÙ"
+
+#: ../libebackend/e-authentication-mediator.c:334
+#: ../libebackend/e-authentication-mediator.c:345
+#: ../libebackend/e-authentication-mediator.c:843
+#: ../libebackend/e-authentication-mediator.c:1173
+#| msgid "Could not cancel operation"
+msgid "Client cancelled the operation"
+msgstr "ØÛØÙØØØ ÙÛØØÛÙØØÙÙ ØÛÙÛÙØÙÙ ÙØÙØÛØØÙ"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr ""
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "ÙÛØÙÛØ ØÙÙÙÙ ØØÚÙÛÚ ÚØÙÙÙØÙØØ ØÛØÙÛØÛÛØÙ"
+
+#: ../libebackend/e-authentication-session.c:622
+msgid "Password was incorrect"
+msgstr "ØÙÙ ØÙØØØ ØÛÙÛØ"
+
+#: ../libebackend/e-authentication-session.c:1358
+#: ../libebackend/e-authentication-session.c:1534
+#: ../libebackend/e-authentication-session.c:1717
+#| msgid "Operation cancelled"
+msgid "Keyring operation was cancelled"
+msgstr "ØØÚÙÛÚ ÚØÙÙÙØÙ ÙÛØØÛÙØØÙ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
+
+#: ../libebackend/e-backend.c:190
+#, c-format
+#| msgid "Unsupported authentication method"
+msgid "%s does not support authentication"
+msgstr "ÙÙÙÙÙÙ ØÛÙÙÙÙÛØÙÙ %s ÙÙÙÙÙÙØÙØÛ"
+
+#: ../libebackend/e-collection-backend.c:764
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "ÙÙØØÙØØ ÙÛÙØÛÙÛØÙÙ ÙÛØÛØÙÙ %s ÙÙÙÙÙÙØÙØÛ"
+
+#: ../libebackend/e-collection-backend.c:823
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "ÙÙØØÙØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØÛÚÛØÛØÙÙ %s ÙÙÙÙÙÙØÙØÛ"
+
+#: ../libebackend/e-server-side-source.c:126
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr ""
+
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "ÙÙØØÙØØ ÙÛÙØÛÙÛØÙÙ ÙÛØÛØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÙØÛØÙ â%sâ ÙÙÙÙÙÙØÙØÛ"
+
+#: ../libebackend/e-server-side-source.c:930
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to create the remote resource"
+msgstr ""
+
+#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "ÙÙØØÙØÙÙÙ ÙÛÙØÛÙÛØÙÙ ØÛÚÛØÛØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÙØÛØÙ â%sâ ÙÙÙÙÙÙØÙØÛ"
+
+#: ../libebackend/e-server-side-source.c:972
+#, c-format
+msgid ""
+"Data source '%s' has no collection backend to delete the remote resource"
+msgstr ""
+
+#: ../libebackend/e-server-side-source.c:1285
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "ÚÛØØÛØÙÙÚ ÙÛÚÛÙØÙÛ ØØØÙ ÚÙÙÛÙ â.sourceâ ØÙÙÛØÙ ÙÛØÛÙ."
+
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1535
+#| msgid "Failed to authenticate.\n"
+msgid "The user declined to authenticate"
+msgstr ""
+
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "ÙÙÙÙÙÙ(UID) â%sâ ÙÛÛØÛØ"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ØØØÙØÛ ÙÛÙ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ÙØØØØÙØ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ØÙÙØØÛØ"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ÙÙØÙÛÚ"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ØÙÛØØØ"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ÙÙØØÙ/ÙÛÙØÛØ"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ØÛÙ ØÛÙÙØ ÙÛÙÙ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ØÛÙ ØÛÙÙØ ÙØØØÙÙÙØÙ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ÙÛÙÙÙ ØØÙØÙÛØØØÙØØ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ØÙØÙÙÛ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ØÛÙÙØØØØ"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ÙÛÚÙÙ ØÛØÙØØØ"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ØØØÙÙÙØØ"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ØÛØØÙÙ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ØÛÙÛÙÙÙ ÙÙÙÙØ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "ÚØÙÙØÙ"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ØØÙØÙÙØ"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ØÛÙÙÙÙÙÚÛÚÙ"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ÛØÙÙØ ÛÛ ØÙØØØÛØ"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "ÙÛÚÙÙ ØÛØØ"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
-msgstr "ØØÙÙØÛØØÙØÛ"
+msgstr "ÙÛØÛÛØØÙØÛ"
 
-#: ../libedataserver/e-client.c:122
-#| msgctxt "ClientError"
-#| msgid "Source not loaded"
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ÙÛÙØÛ ØÙÙÛÙÙÙØØÙ"
 
-#: ../libedataserver/e-client.c:124
-#| msgctxt "ClientError"
-#| msgid "Source already loaded"
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ÙÛÙØÛ ØÙÙÛÙØØÙ"
 
-#: ../libedataserver/e-client.c:132
-#| msgctxt "ClientError"
-#| msgid "Offline unavailable"
+#. Translators: This means that the EClient does not support offline mode, or
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "ØÙØØØ ÙÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../libedataserver/e-client.c:154
-#| msgctxt "ClientError"
-#| msgid "D-Bus error"
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "D-Bus ØØØØÙÙÙÙ"
 
+#: ../libedataserver/e-source-authenticator.c:166
+#| msgid "Authentication required"
+msgid "Address book authentication request"
+msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙ ØÛÙÙÙÙÛØ ØÙÙØÙÙØØÙ"
+
+#: ../libedataserver/e-source-authenticator.c:171
+#| msgid "Authentication required"
+msgid "Calendar authentication request"
+msgstr "ÙÙÙÙØÙÛ ØÛÙÙÙÙÛØ ØÙÙØÙÙØØÙ"
+
+#: ../libedataserver/e-source-authenticator.c:175
+#| msgid "Authentication required"
+msgid "Mail authentication request"
+msgstr "ØÛÙØÛØ ØÛÙÙÙÙÛØ ØÙÙØÙÙØØÙ"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+#| msgid "Authentication required"
+msgid "Authentication request"
+msgstr "ØÛÙÙÙÙÛØ ØÙÙØÙÙØØÙ"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ØØØØÛØ ØÛÙØÙØÙ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "ÙÙÙÙØÙÛ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ØÛÙØÛØ ÚÛØØØØØÙ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ØÛÙØÛØ ÙÛØÙÛØÛØ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "ØÛØÙÛØÙÛ ØÙØÙÙÙ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for task list \"%s\"."
+msgstr "ÛÛØÙÙÛ ØÙØÙÙÙ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+#| msgid "Please enter the %s password for %s on host %s."
+msgid "Please enter the password for account \"%s\"."
+msgstr "ÚÛØØØØØ Â%s ØÛÚÛÙ ØÙÙ ÙÙØÚÛØÛÚ."
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr ""
+
+#: ../libedataserver/e-source.c:938
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÙØÛØÙ â%sâ ÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../libedataserver/e-source.c:1020
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÙØÛØÙ â%sâ ÙÙÚØØ ÙØØØÙÙÙ ØÙÙÙØÙØÛ"
+
+#: ../libedataserver/e-source.c:1408
+#| msgid "Unnamed List"
+msgid "Unnamed"
+msgstr "ØØØØÙØ"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ØÙÙØØ ÙÙÙÙØØÙÙØÙ ÚÙÙÛÙ ÙÛØÙÙÙ ÚÛØØÛØ ØÙÙØÛÙ"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -4844,7 +5179,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
@@ -4852,7 +5187,7 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4860,78 +5195,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1928
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
 msgid "%I:%M:%S %p"
 msgstr "%-I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4939,338 +5274,258 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
 msgid "%I:%M %p"
-msgstr "%-I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1886
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1890
 msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "Proxy type to use"
-msgstr ""
+msgstr "ØÙØÙÙØÙØÙØØÙ ÛØÙØÙÛØÚÙÙÙÚ ØÙÙÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
 msgid ""
 "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
 "means manual proxy."
-msgstr ""
+msgstr "ÙØÙØÙ ØÙÙØÙÙÙ ÛØÙØÙÛØÚÙÙÙ ØÙØÙÙØÙØÛ. Â0Â ØÙØØÛÙØØ Â1ÂØ ÛØÙØÙÛØÚÙ ÙÙÙØÂ2Â ÙÙÙØØ ØÛÚØÛÙÚÛÙ ÛØÙØÙÛØÚÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
 msgid "Whether to use http-proxy"
-msgstr ""
+msgstr "ØÛ http-proxy ÙÙ ØÙØÙÛØØÛÙÙÛ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
 msgid "Whether to use proxy for HTTP requests."
-msgstr ""
+msgstr "ØÙØ ØÛØ ÙÛØÛØØÛ(HTTP) ØØ ÛØÙØÙÛØÚÙ ØÙØÙÙØÛÙØÛ ÙÙÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
 msgid "Whether proxy server requires authentication"
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØØ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØ ÙÛØÛÙÙÛ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-#| msgid "Bad authentication response from server."
 msgid "Whether authentication is required to access proxy server."
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØØ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØ ÙÛØÛÙÙÛ ØÛÙÛØÙÛ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
 msgid "Host name for HTTP requests"
-msgstr ""
+msgstr "ØÙØ ØÛØ ÙÛØÛØØÛ(HTTP) ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ ØÙØÙÛØØÛÙÙÛ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
 msgid "Host name to use for HTTP requests."
-msgstr ""
+msgstr "ØÙØ ØÛØ ÙÛØÛØØÛ(HTTP) ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
 msgid "Port number for HTTP requests"
-msgstr ""
+msgstr "ØÙØ ØÛØ ÙÛØÛØØÛ(HTTP) ØÙØÙÙØÙØÙØØÙ ØÛØÙØÙÙÚ ÙÙÙÛØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
 msgid "Port number to use for HTTP requests."
-msgstr ""
+msgstr "ØÙØ ØÛØ ÙÛØÛØØÛ(HTTP) ØÙØÙÙØÙØÙØØÙ ØÛØÙØÙÙÚ ÙÙÙÛØÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Cannot authenticate user: "
 msgid "Proxy authentication user name"
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙÚ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØØÛ ØÙØÙÙØÙØÙØØÙ ØÙØÙÛØÙÛÚÙ ØØØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-#| msgid ""
-#| "Unable to authenticate to IMAP server.\n"
-#| "%s\n"
-#| "\n"
 msgid "User name to use to authenticate against proxy server."
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØØ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØØÛ ØÙØÙÙØÙØÙØØÙ ØÙØÙÛØÙÛÚÙ ØØØÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-#| msgid "Temporary authentication failure"
 msgid "Proxy authentication password"
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙÚ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØØÛ ØÙØÙÙØÙØÙØØÙ ØÙÙÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-#| msgid "Cannot authenticate to server: %s"
 msgid "Password to use to authenticate against proxy server."
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØØ ÙÙÙÙÙÙ ØÛÙÙÙÙÛØØÛ ØÙØÙÙØÙØÙØØÙ ØÙÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
 msgid "List of hosts to connect to without proxy"
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙÙÙ ØÙØÙÛØÙÛÙ ØØØÙÙÙÙØÙØØÙ ÙÙÙÙÙÛØÛØÙØØÙÙÚ ØÙØÙÙÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
 msgid "List of hosts for which do not use proxy."
-msgstr ""
+msgstr "ÛØÙØÙÛØÚÙÙÙ ØÙØÙÛØÙÛÙ ØØØÙÙÙÙØÙØØÙ ÙÙÙÙÙÛØÛØÙØØÙÙÚ ØÙØÙÙÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
 msgid "Host name for HTTPS requests"
-msgstr ""
+msgstr "ØÛ HTTPS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
 msgid "Host name to use for HTTPS requests."
-msgstr ""
+msgstr "ØÛ HTTPS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
 msgid "Port number for HTTPS requests"
-msgstr ""
+msgstr "ØÛ HTTPS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ØÛØÙØ ÙÙÙÛØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
 msgid "Port number to use for HTTPS requests."
-msgstr ""
+msgstr "ØÛ HTTPS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ØÛØÙØ ÙÙÙÛØÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-#| msgid "Host is unreachable from SOCKS server"
 msgid "Host name for SOCKS requests"
-msgstr ""
+msgstr "ØÛ SOCKS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
 msgid "Host name to use for SOCKS requests."
-msgstr ""
+msgstr "ØÛ SOCKS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ÙÙÙÙÙÛØÛØ ØØØÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
 msgid "Port number for SOCKS requests"
-msgstr ""
+msgstr "ØÛ SOCKS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ØÛØÙØ ÙÙÙÛØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
 msgid "Port number to use for SOCKS requests."
-msgstr ""
+msgstr "ØÛ SOCKS ØÙÙØÙÙØØÙØØ ØÙØÙÙØÙØÙØØÙ ØÛØÙØ ÙÙÙÛØÙ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
 msgid "Automatic proxy configuration URL"
-msgstr "ØØÙØÙÙØØÙÙ ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØ ØÛÙÙÙÙÙØÙÙÙÚ URL Ù"
+msgstr "ØØÙØÙÙØØÙÙ ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØ ØÛÙÙÙÙÙØÙÙÙÚ URL ØÙ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
 msgid "Where to read automatic proxy configuration from."
-msgstr ""
+msgstr "ØØÙØÙÙØØÙÙ ÛØÙØÙÛØÚÙ ØÛÙÙÙÙÙØÙÙÙ ØÙÙÛÙØÙØØÙ ÙÛØÙÙÚ ØØØØÛØÙ."
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "ÙÛÙØØÙÙÛØÙØÙÙÙ ØÙÙØØØÙØÙØ ØÙÙØØÛØ ÙÙÙÙÛØØÙØÛ"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ.\n"
-
-#: ../libedataserverui/e-categories-editor.c:224
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "ÚØØÙØ ØÙØÙÙØÙÙÙÛØØÙØÙ ÙØØÛÚÙØÙÙÛÙÛØ(_U):"
 
-#: ../libedataserverui/e-categories-editor.c:233
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØØÙ ÙØØÛÚÙØÙÙÛÙÛØ(_A):"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Icon"
 msgstr "ØÙÙØÛÙÚÛ"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:330
 msgid "Category"
 msgstr "ÙØØÛÚÙØÙÙÛ"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ÙØØÛÚÙØÙÙÛ Â%s ÙÙ ÙÛØÙØÛ"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ÙØØÛÚÙØÙÙÛ ØÙÙØÛÙÚÙØÙ"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "ØÛØÛØ ÙÙÙ(_N)"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
 msgstr "ÙØØÛÚÙØÙÙÛ ØØØÙ(_N)"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "ÙØØÛÚÙØÙÙÛ ØÙÙØÛÙÚÙØÙ(_I)"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ÙØØÛÚÙØÙÙÛ ØØØÙÙÙÙ"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "ØÛÙÙÙÙÙØÛ Â%s ØÛÚÛÙ ÙØØÛÚÙØÙÙÛ ØØØ ØÙÙÛÙ. ØØØÙØ ØØØ ØÙØÙÙØÙÚ."
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr "ÙÙÙÙØÙÛ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
-"ØÛÛÛØ: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for calendar %s (user %s)"
-msgstr "ÙÙÙÙØÙÛ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr "ÛÛØÙÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
-"ØÛÛÛØ: %s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for task list %s (user %s)"
-msgstr "ÛÛØÙÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-#| msgid ""
-#| "Enter password for %s (user %s)\n"
-#| "Reason: %s"
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr "ØÛØÙÛØÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
-"ØÛÛÛØ: %s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for memo list %s (user %s)"
-msgstr "ØÛØÙÛØÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "ØÙÙ ØÛÙÙÙØÙ ÙÙØÚÛØÛÚ"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "ØÙÙ ÙÙØÚÛØÛÚ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÙÛØØÙØÙØ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "ØØØØÛØ ØÛÙØÙØÙ(_O):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
-msgstr "ÙØØÛÚÙØÙÙÛ:"
+#: ../libedataserverui/e-name-selector-dialog.c:310
+#| msgid "Cate_gory:"
+msgid "Cat_egory:"
+msgstr "ÙØØÛÚÙØÙÙÛ(_E):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:332
 msgid "_Search:"
 msgstr "ØÙØØÛ(_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1182
 msgid "Any Category"
 msgstr "ØØÙÙØØÙ ÙØØÛÚÙØÙÙÛ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
+#: ../libedataserverui/e-name-selector-dialog.c:359
 msgid "Co_ntacts"
 msgstr "ØØÙØÙÛØØØÙØØ(_O)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:421
 msgid "Search"
 msgstr "ØÙØØÛ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:424
 msgid "Address Book"
 msgstr "ØØØØÛØ ØÛÙØÙØÙ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
-msgid "Contacts"
-msgstr "ØØÙØÙÛØØØÙØØ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:545
 msgid "Select Contacts from Address Book"
 msgstr "ØØØØÛØ ØÛÙØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØØÙÙØØ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:917
 msgid "_Add"
 msgstr "ÙÙØ(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:921
 msgid "_Remove"
-msgstr "ØÛÚÛØ(_R)"
+msgstr "ÚÙÙÙØÙÛÛØ(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:1097
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙ ØÙÙÛÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2819
+#: ../libedataserverui/e-name-selector-entry.c:3043
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ÙÙ ÙÛØØØ ÙØÙ(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2834
+#: ../libedataserverui/e-name-selector-entry.c:3059
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ÙÙ ÙÛÚÛØ(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2844
+#: ../libedataserverui/e-name-selector-entry.c:3070
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ÙÙ ÙÛØ(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2861
+#: ../libedataserverui/e-name-selector-entry.c:3088
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ÙÙ ØÛÚØÙØÙÛ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:532
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ÙÙ ØÛÚÛØ(_D)"
@@ -5304,25 +5559,212 @@ msgstr "ØÛ ØÙÙÙÙ ØÛØØÛ ØÛØ(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "ØÛ ØÛÚÚÙÙÛ ØÛÚÛÙ ØÛ ØÙÙÙÙ ØÛØØÛ ØÛØ(_R)"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "ÙÙØØÙ(_D)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
 msgid "Select destination"
 msgstr "ÙÙØØÙÙÙ ØØÙÙØØ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
-msgid "_Destination"
-msgstr "ÙÙØØÙ(_D)"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "ÙÙÙÙØÙÛ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:223
+#, c-format
+#| msgid "Unexpected response from IMAP server: %s"
+msgid "Code: %u - Unexpected response from server"
+msgstr "ÙÙØÙ: %u ÙÛÙØØÙÙÛØÙØØÙÙ ØÙÙÙØØÙÙØØÙ ØÙÙÙØØ ÙÛÙØÙ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:244
+#, c-format
+#| msgid "Failed to retrieve message"
+msgid "Failed to parse autodiscover response XML"
+msgstr "autodiscover ÙÙÚ ØØÛØØ XML ÙÙ ØÛÚÙÙÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:253
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Autodiscover element"
+msgstr "Autodiscover ØÛÙÛÙÛÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:265
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Response element"
+msgstr "Response ØÛÙÛÙÛÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:277
+#, c-format
+#| msgid "Failed to find system calendar"
+msgid "Failed to find Account element"
+msgstr "Account ØÛÙÛÙÛÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:291
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "ÛÛØÙÙÙÙÛØ"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
 #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
 msgid "Keep running after the last client is closed"
-msgstr ""
+msgstr "ØÛÚ ØØØÙØÙÙ ØÛØÙØØØ ÙÛÙÙÙØØÙØÙÙ ÙÛÙÙÙÙÛ ØÙØØØ ØÙÙÛÛÛØØÛÙ"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
 #: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
 msgid "Wait running until at least one client is connected"
 msgstr ""
 
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "Evolution ÙÛÙØÛ ÙÛØÚÛ"
+
+#. Translators: The name that is displayed in the user interface
+#: ../tests/libedataserverui/evolution-source-viewer.c:650
+#| msgid "Family Name"
+msgid "Display Name"
+msgstr "ÙÛØØÙØÙØ ØÙØÙÙ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:659
+msgid "Flags"
+msgstr "ØÛÙÚÙÙÛØ"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:711
+msgid "Identity"
+msgstr "ØØÙØÚÙÙÛØ"
+
+#~ msgid "Authenticating with the serverâ"
+#~ msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÛØØÙØÛâ"
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: GConf ØØ ØØÙÙØÙØØÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
+
+#~ msgid "Invalid source"
+#~ msgstr "ÙÛÙØÛ ØÙÙØÛÛØØÙØ"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "uri Â%s ØØØØ"
+
+#~ msgid "Failed to find system book"
+#~ msgstr "ØÙØØÛÙØ ÙÙØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "ÙÛÙØÛ ØÙØÙÙÙØÙÙÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
+
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "ØÙØÙÛØÙÛÚÙÙÙÚ ØØÙØÚÙÙÙØÙÙÙ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ: "
+
+#~ msgid "Empty URI"
+#~ msgstr "ÙÛØÛÙ URI"
+
+#~| msgid ""
+#~| "Enter password for %s (user %s)\n"
+#~| "Reason: %s"
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ØØØØÛØ  ØÛÙØÙØÙ%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
+#~ "ØÛÛÛØ: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "ØØØØÛØ  ØÛÙØÙØÙ%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr ""
+#~ "%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
+
+#~ msgid "Invalid source type"
+#~ msgstr "ÙÛÙØÛ ØÙÙÙ ØÙÙØÛÛØØÙØ"
+
+#~ msgid "Connection to Server"
+#~ msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙÙØ"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙÙØ ØÛÚÛÙ ØÙØØÙÙØØÙÙ ØÛÙØÛÙ ØÙØÙÛØ(_U)"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "ØÛÙØÛÙ(_M):"
+
+#~ msgid "Command:"
+#~ msgstr "ØÛÙØÛÙ:"
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "ØÙØÙÙØÙØÙØØÙ ØÛÙÙÛÙÚÛÙ ØØØÙØÙÙØ ØØÙÙ"
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "tmp ØÛÙÙÙÙÙÙ ÙÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙ"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "ÙÛÙØØÙÙÛØÙØÙÙÙ ØÙÙØØØÙØÙØ ØÙÙØØÛØ ÙÙÙÙÛØØÙØÛ"
+
+#~| msgid ""
+#~| "Enter password for %s (user %s)\n"
+#~| "Reason: %s"
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ÙÙÙÙØÙÛ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
+#~ "ØÛÛÛØ: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "ÙÙÙÙØÙÛ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#~| msgid ""
+#~| "Enter password for %s (user %s)\n"
+#~| "Reason: %s"
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ÛÛØÙÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
+#~ "ØÛÛÛØ: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "ÛÛØÙÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#~| msgid ""
+#~| "Enter password for %s (user %s)\n"
+#~| "Reason: %s"
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "ØÛØÙÛØÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
+#~ "ØÛÛÛØ: %s"
+
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "ØÛØÙÛØÙÛ ØÙØÙÙÙ %s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "ØÙÙ ØÛÙÙÙØÙ ÙÙØÚÛØÛÚ"
+
+#~ msgid "Enter Password"
+#~ msgstr "ØÙÙ ÙÙØÚÛØÛÚ"
+
 #~ msgctxt "BookClientError"
 #~ msgid "Contact not found"
 #~ msgstr "ØØÙØÙÛØØØ ØÛÙÙÙÙÙØÙ"
@@ -5385,9 +5827,6 @@ msgstr ""
 #~ msgid "Invalid URI"
 #~ msgstr "ØÙÙØÛÛØØÙØ URI"
 
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "Â%2$s ØØ ÙÙØØÛØÛÙ Â%1$s ÙÙÚ ØØØÙØ ØÛÚ ØØÛÛØÙ ÙÙÙ"
-
 #~ msgid "Could not instantiate backend"
 #~ msgstr "backend ÙÙÚ ØÛÙÚÙØÙÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
@@ -5541,9 +5980,6 @@ msgstr ""
 #~ msgid "No stream available"
 #~ msgstr "ØÛÙÙÙ ÙÙÙ"
 
-#~ msgid "Operation cancelled"
-#~ msgstr "ÙÛØØÛÙØØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
-
 #~ msgid "SSL negotiations failed"
 #~ msgstr "SSL ÙÛÚÙØÙ ÙÛØÙÛÙ ØÙÙØÙ"
 
@@ -5595,12 +6031,6 @@ msgstr ""
 #~ msgid "Loading items"
 #~ msgstr "ØÛØÙÛØÙÙ ÙÛÙÙÛÛØØÙØÛ"
 
-#~ msgid "Calendar"
-#~ msgstr "ÙÙÙÙØÙÛ"
-
-#~ msgid "Invalid server URI"
-#~ msgstr "ÙÛÙØØÙÙÛØÙØ URI ØÙ ØÙÙØÛÛØØÙØ"
-
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "ØÛÙÙÛÙ ØÙÙØÛØÛØÙØ ØÛØÙØÙ ÙÙØØÙÙÙØÙ"
 



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