[evolution-data-server] Updated Uyghur translation



commit f11f49a8e065e7abe3e068491dda6f28ce3b89d7
Author: Gheyret Kenji <gheyret gmail com>
Date:   Sun Feb 26 11:08:28 2012 +0900

    Updated Uyghur translation

 po/ug.po | 3640 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1987 insertions(+), 1653 deletions(-)
---
diff --git a/po/ug.po b/po/ug.po
index 6a0c4bf..c1b4e80 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,9 +7,8 @@
 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: 2011-08-18 14:25+0000\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"
 "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"
@@ -21,64 +20,129 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-04-11 00:16+0000\n"
 "X-Generator: Launchpad (build 12757)\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:823
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../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
+#: ../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
+msgid "Unknown error"
+msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:150
+#, 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
+#, 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
+#, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/file/e-book-backend-file.c:1125
+msgid "No UID in the contact"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1559
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
 msgid "Loading..."
 msgstr "ÙÛÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:826
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../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
 msgid "Searching..."
 msgstr "ØÙØØÛÛØØÙØÛâ"
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr ""
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:788
+#: ../addressbook/backends/google/e-book-backend-google.c:831
 msgid "Querying for updated contactsâ"
 msgstr "ÙÛÚÙÙØÙØØÙ ØØÙØÙÛØØØÙØØÙÙ ØÛØÛØØÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:839
-#: ../addressbook/libebook/e-book.c:3483 ../calendar/libecal/e-cal.c:1318
-#: ../libedataserver/e-client.c:1851
+#: ../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:841
+#: ../addressbook/backends/google/e-book-backend-google.c:882
 msgid "Friends"
 msgstr "ØÙØØÙØØ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:843
+#: ../addressbook/backends/google/e-book-backend-google.c:884
 msgid "Family"
 msgstr "ØÛÙÛØÙÙ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:845
+#: ../addressbook/backends/google/e-book-backend-google.c:886
 msgid "Coworkers"
 msgstr "ØÙØÙÛØØØØÙØØ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:924
+#: ../addressbook/backends/google/e-book-backend-google.c:970
 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
+msgid "The backend does not support bulk additions"
+msgstr ""
+
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1329
+#: ../addressbook/backends/google/e-book-backend-google.c:1389
 msgid "Creating new contactâ"
 msgstr "ÙÛÚÙ ØØÙØÙÛØØØ ÙÛØÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1433
+#: ../addressbook/backends/google/e-book-backend-google.c:1476
+#: ../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"
+msgid "The backend does not support bulk removals"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1504
 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
+msgid "The backend does not support bulk modifications"
+msgstr ""
+
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1699
+#: ../addressbook/backends/google/e-book-backend-google.c:1782
 msgid "Modifying contactâ"
 msgstr "ØØÙØÙÛØØØÙÙ ØÛØÙØÙÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1892
+#: ../addressbook/backends/google/e-book-backend-google.c:1983
 msgid "Loadingâ"
 msgstr "ÙÛÙÙÛÛØØÙØÛâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2047
+#: ../addressbook/backends/google/e-book-backend-google.c:2108
 msgid "Authenticating with the serverâ"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÛØØÙØÛâ"
 
@@ -87,698 +151,698 @@ msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÛØØÙØÛ
 msgid "Not connected"
 msgstr "ØØØÙØÙÙÙØØÙ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:776
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "ÙÛØÙÙÙÙ ØØØ ØÙØÙÙØÙØ(DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:779
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "ØÛÙØÛØ ØØØØÛØÙ ØÙØÙÙØÙØ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1048
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "LADP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØÙØÙÛ ÙÛÚÙØÙÙ ÚØØÙØÙÙÙÙÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
 msgid "Invalid DN syntax"
 msgstr "DN ÚØØÙÙØØÙÙÙØÙ ØÙÙØÛÛØØÙØ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1688
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
 msgid "Adding contact to LDAP server..."
 msgstr "ØØÙØÙÛØØØÙØØÙÙ LDAP ÙÛÙØØÙÙÛØÙØÙØØ ÙÙØÛÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2250
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØÛØÚÛØØÙÛØØÙØÛâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4559
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
 msgid "Receiving LDAP search results..."
 msgstr "LADP - ØÙØØÛØ ÙÛØÙØÙØÙ ÙÙØÛÙ ÙÙÙÙÙÙÛØØÙØÛ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4729
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
 msgid "Error performing search"
 msgstr "ØÙØØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4849
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ(%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:274
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:880
-#: ../addressbook/libedata-book/e-data-book.c:442
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:520
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
-#: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4420
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imapx/camel-imapx-server.c:2246
-#: ../camel/providers/smtp/camel-smtp-transport.c:439
-msgid "Unknown error"
-msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÙÛÙØÛ Â%s ÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ. ØÛ ÚØØØÙÙÙ HTTP ÚØÙÙØÙ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3158
+#: ../addressbook/libebook/e-book.c:3196
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ØØ ØØÙÙØÙØØÙ UID '%s'  ÙÙÚ ÙÛÙØÛØÙ ÙÙÙ."
 
-#: ../addressbook/libebook/e-book.c:3466 ../calendar/libecal/e-cal.c:1298
-#: ../libedataserver/e-client.c:1846
+#: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1910
 msgid "On This Computer"
 msgstr "ØÛ ÙÙÙÙÙÛØÛØØØ"
 
-#: ../addressbook/libebook/e-book.c:3592
-#: ../addressbook/libebook/e-book-client.c:634
-#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../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/libebook/e-book-client.c:85
-msgctxt "BookClientError"
+#: ../addressbook/libebook/e-book-client.c:92
+#| msgctxt "BookClientError"
+#| msgid "No such book"
 msgid "No such book"
 msgstr "ØÛÙØØÙ ÙÙØØØ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:87
-msgctxt "BookClientError"
+#: ../addressbook/libebook/e-book-client.c:94
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "ØØÙØÙÛØØØ ØÛÙÙÙÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:89
-msgctxt "BookClientError"
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "ØØÙØÙÛØØØ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
 
-#: ../addressbook/libebook/e-book-client.c:91
-msgctxt "BookClientError"
+#: ../addressbook/libebook/e-book-client.c:98
+#| msgctxt "BookClientError"
+#| msgid "No such source"
 msgid "No such source"
-msgstr "ØÛÚÛØ ÙÛÛØÛØ ØÛÙÛØ"
+msgstr "ØÛÙØØÙ ÙÛÙØÛ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:93
-msgctxt "BookClientError"
+#: ../addressbook/libebook/e-book-client.c:100
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "ØÙØÙÛÙ ÙÙÙ"
 
-#: ../addressbook/libebook/e-book-client.c:96
-msgctxt "BookClientError"
-msgid "Unknown error"
-msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
-
-#: ../addressbook/libebook/e-book-client.c:168
-msgid "D-Bus book proxy gone"
-msgstr "D-Bus ÙÙØØØ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
-
-#: ../addressbook/libebook/e-book-client.c:448
+#: ../addressbook/libebook/e-book-client.c:512
 msgid "Failed to run book factory"
 msgstr "ÙÙØØØ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:458
-#: ../addressbook/libedata-book/e-data-book-factory.c:375
-#: ../addressbook/libedata-book/e-data-book-factory.c:433
-#: ../calendar/libecal/e-cal-client.c:564
-#: ../calendar/libedata-cal/e-data-cal-factory.c:395
+#: ../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:559
-#: ../calendar/libecal/e-cal-client.c:677
+#: ../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:597
+#: ../addressbook/libebook/e-book-client.c:662
 msgid "Failed to find system book"
 msgstr "ØÙØØÛÙØ ÙÙØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client.c:704
-#: ../calendar/libecal/e-cal-client.c:825
+#: ../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:2093
-#: ../calendar/libecal/e-cal-client.c:4091
+#: ../addressbook/libebook/e-book-client.c:2563
+#: ../calendar/libecal/e-cal-client.c:4480
 msgid "Cannot get connection to view"
 msgstr "ÙÛØÙØÙØØÙ ØØØÙÙÙÙØÙØØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../addressbook/libebook/e-book-client-view.c:218
-#: ../calendar/libecal/e-cal-client-view.c:456
-msgid "Cannot start view, D-Bus proxy gone"
-msgstr "ÙÛØÛÙÛØÙÙ ØØØÙÙÙØÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
-
-#: ../addressbook/libebook/e-book-client-view.c:247
-#: ../calendar/libecal/e-cal-client-view.c:485
-msgid "Cannot stop view, D-Bus proxy gone"
-msgstr "ÙÛØÛÙÛØÙÙ ØÙØØÙØØÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
-
-#: ../addressbook/libebook/e-book-client-view.c:288
-#: ../calendar/libecal/e-cal-client-view.c:526
-msgid "Cannot set fields of interest, D-Bus proxy gone"
-msgstr "ØÛØÛÙ ØÛØ ØÛÙÙÙÙÙÙ ØÛÙÚÙÙÙÚÙÙÙ ØÙÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
-
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:117
 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:119
+#. *         so we can generate its value if necessary in the getter
+#: ../addressbook/libebook/e-contact.c:120
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Book URI"
 msgstr "ÙÙØØØ URI"
 
 #. 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:127
+#. * 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
 msgid "Full Name"
 msgstr "ØÙÙÛÙ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Given Name"
 msgstr "ØÛØÙÙÚÛÙ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Family Name"
 msgstr "ØÛÚØØØ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Nickname"
 msgstr "ØÛØÛÙÙÛØ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 1"
 msgstr "ØÛÙØÛØ 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 2"
 msgstr "ØÛÙØÛØ 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 3"
 msgstr "ØÛÙØÛØ 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Email 4"
 msgstr "ØÛÙØÛØ 4"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Mailer"
 msgstr "ØÛØÚÙ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Home Address Label"
 msgstr "ØÙÙ ØØØØÛØÙ ØÛÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Work Address Label"
 msgstr "ØÙØÙÛØ ØØØØÛØÙ ØÛÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Other Address Label"
 msgstr "ØØØÙØ ØØØØÛØ ØÛÙÙ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Assistant Phone"
 msgstr "ÙØØØÛÙÚÙÙÙÚ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Phone 2"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Business Fax"
 msgstr "ØÙØÙÛØ ÙØÙÙØ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Callback Phone"
 msgstr "ÙØÙØÛØÛÙ ÚØÙÙØØØÙ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Car Phone"
 msgstr "ÙØØÙÙØ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Company Phone"
 msgstr "ØÙØÙÛØ ØÛÙÛÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone"
 msgstr "ØÛÙ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Phone 2"
 msgstr "ØÙÙ ØÛÙÛÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Home Fax"
 msgstr "ØÙÙ ÙØÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Mobile Phone"
 msgstr "ÙØÙÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Phone"
 msgstr "ØØØÙØ ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Other Fax"
 msgstr "ØØØÙØ ÙØÙÙØ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Pager"
 msgstr "ÚØÙÙØØÛ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Primary Phone"
 msgstr "ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Radio"
 msgstr "ØØØÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Telex"
 msgstr "ØÛÙÛÚØØÙÙØ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organization"
 msgstr "ØÙØÚØÙ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Organizational Unit"
 msgstr "ØÙØØØÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Office"
 msgstr "ØÙØØØÙØ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Title"
 msgstr "ÙØÛØÛ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Role"
 msgstr "ØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Manager"
 msgstr "ØØØÙÛØØÛ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Assistant"
 msgstr "ÙØØØÛÙÚÙ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Homepage URL"
 msgstr "ØØØ ØÛØÙÙÚ URL"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Weblog URL"
-msgstr "ØÙÙÙÚ ØÙØ ØØØØÛØÙ(URL)"
+msgstr "ØÙÙÚ ØÙØ ØØØØÛØÙ(URL)"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ÙØØÛÚÙØÙÙÛ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Calendar URI"
 msgstr "ÙÙÙÙØÙÙÙÙÚ URI ØÙ"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Free/Busy URL"
 msgstr "ØÙÙØØ/ØØÙØÙØØØ URL"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:187
 msgid "ICS Calendar"
 msgstr "ICS ÙÙÙÙØÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Video Conferencing URL"
 msgstr "ØÙÙ ÙÙØÙÙÙÙÙÚ URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Spouse's Name"
 msgstr "ÚÛÙØØÚÙÙÙÚ ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Note"
 msgstr "ØÙØØÚØØ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 1"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 2"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Home Screen Name 3"
 msgstr "AIM ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 1"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 2"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Work Screen Name 3"
 msgstr "AIM ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise ØÛÙ ØÛÙØØÙÙÙÙÚ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise ØÙØÙÛØ ØÛÙØØÙÙÙÙÚ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 1"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 2"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Home ID 3"
 msgstr "Jabber ØÛÙ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 1"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 2"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Work ID 3"
 msgstr "Jabber ØÙØÙÛØ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 1"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 2"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Home Screen Name 3"
 msgstr "MSN ØÛÙ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 1"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 2"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Work Screen Name 3"
 msgstr "MSN ØÙØÙÛØ ØÛÙØØÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 1"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 2"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Home ID 3"
 msgstr "ICQ ØÛÙ ÙÙÙÙÙÙÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 1"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 2"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Work ID 3"
 msgstr "ICQ ØÙØÙÛØ ÙÙÙÙÙÙÙ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Last Revision"
 msgstr "ØÛÚ ØØØÙØÙÙ ØÛØÙØÙÙÙÛ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Name or Org"
 msgstr "ØØØÙ ÙØÙÙ ØÛØÙÙÙÙ"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Address List"
 msgstr "ØØØØÛØÙØØ"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Home Address"
 msgstr "ØÛÙ ØØØØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Work Address"
 msgstr "ØÙØÙÛØ ØØØØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Other Address"
 msgstr "ØØØÙØ ØØØØÛØ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Category List"
 msgstr "ÙØØÛÚÙØÙÙÛ ØÙØÙÙÙ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Photo"
 msgstr "ØÛØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Logo"
 msgstr "ØÛØ"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Name"
 msgstr "ØØØÙ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Email List"
 msgstr "ØÛÙØÛØ ØÙØÙÙÙ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:253
 msgid "AIM Screen Name List"
 msgstr "AIM ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "GroupWise ID List"
 msgstr "GroupWise ID ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Jabber ID List"
 msgstr "Jabber ID ÙÙØÙ"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "MSN Screen Name List"
 msgstr "MSN ØÛÙØØÙ ØØØÙ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:258
 msgid "ICQ ID List"
 msgstr "ICQ ID ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Wants HTML Mail"
 msgstr "HTML ØÛØÙÙÙ ØØØØÛ ÙÙÙÙØÛ"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List"
 msgstr "ØÙØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "List Show Addresses"
 msgstr "ØØØØÛØÙØØÙÙ ÙÛØØÙØÙØÙØØÙ ØÙØÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Birth Date"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:721
+#: ../addressbook/libebook/e-contact.c:266
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
 msgid "Anniversary"
 msgstr "ØØØÙØÛ ÙÛÙ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:269
 msgid "X.509 Certificate"
 msgstr "X.509 ØÙØÙØØÙØØ"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 1"
 msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 2"
 msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Home ID 3"
 msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 1"
 msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 1"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 2"
 msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 2"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Work ID 3"
 msgstr "ÚØØÛ-ÚØØÛ ØÙØÙÛØ  ID 3"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu ID List"
 msgstr "ÚØØÛ-ÚØØÛ ÙØÙØÙ  ID ÙÙØÙ"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Geographic Information"
 msgstr "ØÛØØØÙÙÙÙÙÙÙ ØÛÚÛØ"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Telephone"
 msgstr "ØÛÙÛÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 1"
 msgstr "Skype ØÛÙ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 2"
 msgstr "Skype ØÛÙ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Home Name 3"
 msgstr "Skype ØÛÙ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 1"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 2"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Work Name 3"
 msgstr "Skype ØÙØÙÛØ ØØØÙ 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Name List"
 msgstr "Skype ØØØ ØÙØÙÙÙ"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:292
 msgid "SIP address"
 msgstr "SIP ØØØØÛØÙ"
 
-#: ../addressbook/libebook/e-contact.c:1542
-#: ../addressbook/libebook/e-destination.c:868
+#: ../addressbook/libebook/e-contact.c:294
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "Google Talk ØÛÙ ØØØÙ 1"
+
+#: ../addressbook/libebook/e-contact.c:295
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "Google Talk ØÛÙ ØØØÙ 2"
+
+#: ../addressbook/libebook/e-contact.c:296
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "Google Talk ØÛÙ ØØØÙ 3"
+
+#: ../addressbook/libebook/e-contact.c:297
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "Google Talk ØÙØÙÛØ ØØØÙ 1"
+
+#: ../addressbook/libebook/e-contact.c:298
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "Google Talk ØÙØÙÛØ ØØØÙ 2"
+
+#: ../addressbook/libebook/e-contact.c:299
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "Google Talk ØÙØÙÛØ ØØØÙ 3"
+
+#: ../addressbook/libebook/e-contact.c:300
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Google Talk ØØØ ØÙØÙÙÙ"
+
+#: ../addressbook/libebook/e-contact.c:1601
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ÙØÙØÙØ ØÙØÙÙ"
 
@@ -786,7 +850,7 @@ msgstr "ÙØÙØÙØ ØÙØÙÙ"
 msgid "Cannot process, book backend is opening"
 msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙØØØ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:92
+#: ../addressbook/libedata-book/e-book-backend.c:87
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÙØÙÛÙÛÙ ÙÙØØØ ØØØÙÙÙÙ Â%sÂ"
@@ -796,606 +860,595 @@ msgstr "ÙØÙÛÙÛÙ ÙÙØØØ ØØØÙÙÙÙ Â%sÂ"
 msgid "Cannot change value of book property '%s'"
 msgstr "ÙÙØØØ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:463
-#: ../camel/camel-db.c:470
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ØÛØÙÛÙ ÙÛØÙÙØÙ"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#, c-format
+#| msgid "Contact not found"
+msgid "Contact '%s' not found"
+msgstr ""
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../addressbook/libedata-book/e-data-book.c:209
-#: ../addressbook/libedata-book/e-data-book.c:694
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
 msgid "Invalid query: "
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:299
-#: ../calendar/libedata-cal/e-data-cal.c:414
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "ÙÛÛÛÙÙÛÙÙÙÛØÙÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4388 ../calendar/libedata-cal/e-data-cal.c:415
+#: ../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
 msgid "Backend is busy"
 msgstr "Backend ØØÙØÙØØØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
 msgid "Repository offline"
 msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4402 ../calendar/libedata-cal/e-data-cal.c:417
+#: ../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
 msgid "Permission denied"
 msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:303
-msgid "Contact not found"
-msgstr "ØØÙØÙÛØØØ ØÛÙÙÙÙÙØÙ"
-
-#: ../addressbook/libedata-book/e-data-book.c:304
-msgid "Contact ID already exists"
-msgstr "ØØÙØÙÛØØØ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
-
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÙØ ØÛÙÙÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
 msgid "Unsupported authentication method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
 msgid "TLS not available"
 msgstr "TLS ÙÙÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "ÙÙØØØ ÚÙÙÙØÙÛÛØÙÙÚÛÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "ØÙØØØ ÙÙÙ ÚØÙÛØØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
 msgid "Search size limit exceeded"
 msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
 msgid "Search time limit exceeded"
 msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
 msgid "Invalid query"
 msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
 msgid "Query refused"
 msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
 msgid "Could not cancel"
 msgstr "ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "ÙÛÙØØÙÙÛØÙØ ÙÛØØÙ ØÙÙØÛÛØØÙØ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-msgid "No space"
-msgstr "ØÙØÙÛÙ ÙÙÙ"
-
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4386 ../calendar/libedata-cal/e-data-cal.c:438
+#: ../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
 msgid "Invalid argument"
 msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4425 ../calendar/libedata-cal/e-data-cal.c:440
+#: ../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
 msgid "Not supported"
 msgstr "ÙÙÙÙÙÙØÙØÛ"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:441
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
 msgid "Backend is not opened yet"
 msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
 
-#: ../addressbook/libedata-book/e-data-book.c:332
-#: ../calendar/libecal/e-cal-client.c:572
-#: ../calendar/libedata-cal/e-data-cal.c:449
+#: ../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
 msgid "Other error"
 msgstr "ØØØÙØ ØØØØÙÙÙ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:536
-#: ../addressbook/libedata-book/e-data-book.c:866
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 msgid "Cannot get contact: "
 msgstr "ØØÙØÙÛØØØÙØ ØÛØÙØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
-#: ../addressbook/libedata-book/e-data-book.c:580
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
 msgstr "ÙÛØÛÙ ØÛØÛØØÛØÛØ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:602
-#: ../addressbook/libedata-book/e-data-book.c:932
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot add contact: "
 msgstr "ØØÙØÙÛØØØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:624
-#: ../addressbook/libedata-book/e-data-book.c:951
-msgid "Cannot modify contact: "
-msgstr "ØØÙØÙÛØØØÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#| msgid "Cannot modify contact: "
+msgid "Cannot modify contacts: "
+msgstr ""
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:717
-#: ../calendar/libedata-cal/e-data-cal.c:824
+#: ../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:779
+#: ../addressbook/libedata-book/e-data-book.c:830
 msgid "Cannot open book: "
 msgstr "ÙÙØØØÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:793
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Cannot remove book: "
 msgstr "ÙÙØØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:818
+#: ../addressbook/libedata-book/e-data-book.c:873
 msgid "Cannot refresh address book: "
 msgstr "ØØØØÛØ ØÛÙØÙØÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:834
+#: ../addressbook/libedata-book/e-data-book.c:899
 msgid "Cannot get backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:850
-#: ../calendar/libedata-cal/e-data-cal.c:1001
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 msgid "Cannot set backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÛÚØÙÚÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:881
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙØØ ØÛØÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:905
+#: ../addressbook/libedata-book/e-data-book.c:995
 msgid "Cannot get contact list uids: "
 msgstr "ØØÙØÙÛØØØÙØØ ØÙØÙÙÙÙÙÚ uids ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:969
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
 msgstr "ØØÙØÙÛØØØÙØØÙÙ ÚÙÙÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:359
-#: ../addressbook/libedata-book/e-data-book-factory.c:392
-#: ../calendar/libedata-cal/e-data-cal-factory.c:410
+#: ../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
 #, c-format
 msgid "Empty URI"
 msgstr "ÙÛØÛÙ URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:518
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ %d ØÛÚÛÙ HTTP ÚØÙÛØ ÙÙØÙ ÙØÙØÛØÛÙØÙ(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2133
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2481
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
-msgstr ""
-"ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛØ ÙÙÙÙØÙÛ ØÙÙÛØÙÙÙØ ØÙÙÙØÙØØÙ ÚØÙÛØØÛ "
-"ØÛÚÙÙØÙ.\n"
+msgstr "ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙÙ ØÙÙÙØÙØÛØ ÙÙÙÙØÙÛ ØÙÙÛØÙÙÙØ ØÙÙÙØÙØØÙ ÚØÙÛØØÛ ØÛÚÙÙØÙ.\n"
 "ØØØØÙÙÙ ØÛÚÛØ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4272
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÙÙÙÙØÙÛ ØÙÙØØ/ØØÙØÙØØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../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/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/contacts/e-cal-backend-contacts.c:1059
 msgid "Birthday"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:752
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
 #, c-format
 msgid "Birthday: %s"
 msgstr "ØÛØÛÙØØÙ ÙÛÙ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:776
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ØØØÙØÛ ÙÛÙ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÙÙÙÙØÙÛ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ: URI ØÙØØØ ØÛÙÛØ"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:256
+#: ../calendar/backends/file/e-cal-backend-file.c:262
 msgid "Cannot save calendar data"
 msgstr "ÙÙÙÙØÙÛ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:418
 msgid "Redirected to Invalid URI"
 msgstr "ØÙÙØÛÛØØÙØ URI ØØ ØÛØÙ ØÛØØÙØÙ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:443
+#: ../calendar/backends/http/e-cal-backend-http.c:459
 msgid "Bad file format."
 msgstr "ÚÛØØÛØ ÙÙØÙØØÙ ØØØØ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:450
+#: ../calendar/backends/http/e-cal-backend-http.c:467
 msgid "Not a calendar."
 msgstr "ÙÙÙÙØÙÛ ØÛÙÛØ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:764
-#: ../calendar/backends/http/e-cal-backend-http.c:765
-#: ../calendar/backends/weather/e-cal-backend-weather.c:513
+#: ../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
 msgid "Could not create cache file"
 msgstr "ØÛÙÙÛÙ ÚÛØØÙØÙ ÙÛØØÙÙÙØÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:181
 msgid "Could not retrieve weather data"
 msgstr "ÚØÛØØØÙÙ ØØÙÙÙÙ ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙÛÙØÙÙÙØÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "ÚØÛØØØÙÙ: ØÛÙØÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "ÚØÛØØØÙÙ: ØÛÙÛØÙÛÙ ÙÛÚÛ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "ÚØÛØØØÙÙ: ØÛÙÛØÙÛÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "ÚØÛØØØÙÙ: ØÛÙÛØÙÛÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "ÚØÛØØØÙÙ: ØÛØÙÛÙÚÙ(ÙØØØ ÙØÙØÛØ)"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "ÚØÛØØØÙÙ: ÙØØ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "ÚØÛØØØÙÙ: ØÛÙÛØØÙØ ÙÛÚÛ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "ÚØÛØØØÙÙ: ÚØÛØ ØÙÚÛÙ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "ÚØÛØØØÙÙ: ÚÛÙØÛØÙØÙÙÙÙÙ ÙØÙØÛØ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:439
+#: ../calendar/backends/weather/e-cal-backend-weather.c:433
 msgid "Forecast"
 msgstr "ØØÙØÙÙ ÙÛÙÛÙØØ"
 
-#: ../calendar/libecal/e-cal.c:851 ../libedataserverui/e-book-auth-util.c:198
-#: ../libedataserverui/e-book-auth-util.c:417
-#: ../libedataserverui/e-client-utils.c:795
+#: ../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.
+#. * This password prompt will be prompted rarely. Since the key that is passed to
+#. * the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:865
+#: ../calendar/libecal/e-cal.c:906
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
-msgstr ""
-"%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
+msgstr "%s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÙØ ØÙØÙÛØÙÛÚÙ %s ÙÙÚ ÛØÙØÙÛØÚÙØÙÙÙ ØÙÙØÛÛØÙÙÙ ÙÙÙÙÚ"
 
-#: ../calendar/libecal/e-cal.c:4390
+#: ../calendar/libecal/e-cal.c:4567
 msgid "Repository is offline"
 msgstr "ØÛØÙÙÛ ØÙØØØ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal.c:4392
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
 msgid "No such calendar"
 msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal.c:4394 ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4396 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
 
-#: ../calendar/libecal/e-cal.c:4398
+#: ../calendar/libecal/e-cal.c:4575
 msgid "URI not loaded"
 msgstr "URI ØÙÙÛÙÙÙØØÙ"
 
-#: ../calendar/libecal/e-cal.c:4400
+#: ../calendar/libecal/e-cal.c:4577
 msgid "URI already loaded"
 msgstr "URI ØÙÙÛÙØØÙ"
 
-#: ../calendar/libecal/e-cal.c:4404
+#: ../calendar/libecal/e-cal.c:4581
 msgid "Unknown User"
 msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
 
-#: ../calendar/libecal/e-cal.c:4406 ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
 
-#: ../calendar/libecal/e-cal.c:4408
+#: ../calendar/libecal/e-cal.c:4585
 msgid "Protocol not supported"
 msgstr "ÙÛÙÙØÙÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../calendar/libecal/e-cal.c:4410
+#: ../calendar/libecal/e-cal.c:4587
 msgid "Operation has been canceled"
 msgstr "ÙÛØØÛÙØØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4412
+#: ../calendar/libecal/e-cal.c:4589
 msgid "Could not cancel operation"
 msgstr "ÙÛØØÛÙØØØÙÙ ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4414
+#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
 msgid "Authentication failed"
 msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4416
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../calendar/libecal/e-cal.c:4593
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:128
 msgid "Authentication required"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
 
-#: ../calendar/libecal/e-cal.c:4418
+#: ../calendar/libecal/e-cal.c:4595
 msgid "A D-Bus exception has occurred"
 msgstr "ØÙØ D-Bus ÙÛØØÛØÙØ ÙÛØÛÙØÙ"
 
-#: ../calendar/libecal/e-cal.c:4422
+#: ../calendar/libecal/e-cal.c:4599
 msgid "No error"
 msgstr "ØØØØÙÙÙ ÙÙÙ"
 
-#: ../calendar/libecal/e-cal-client.c:127
-msgctxt "CalClientError"
-msgid "No such calendar"
-msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
-
-#: ../calendar/libecal/e-cal-client.c:129
-msgctxt "CalClientError"
-msgid "Object not found"
-msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
-
-#: ../calendar/libecal/e-cal-client.c:131
-msgctxt "CalClientError"
-msgid "Invalid object"
-msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
-
-#: ../calendar/libecal/e-cal-client.c:133
-msgctxt "CalClientError"
+#: ../calendar/libecal/e-cal-client.c:140
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
 
-#: ../calendar/libecal/e-cal-client.c:135
-msgctxt "CalClientError"
-msgid "Object ID already exists"
-msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
-
-#: ../calendar/libecal/e-cal-client.c:137
-msgctxt "CalClientError"
+#: ../calendar/libecal/e-cal-client.c:144
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "ØÙÙØÛÛØØÙØ ØØØÙØÛ"
 
-#: ../calendar/libecal/e-cal-client.c:140
-msgctxt "CalClientError"
-msgid "Unknown error"
-msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
-
-#: ../calendar/libecal/e-cal-client.c:214
-msgid "D-Bus calendar proxy gone"
-msgstr "D-Bus ÙÙÙÙØÙÛ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
-
-#: ../calendar/libecal/e-cal-client.c:554
+#: ../calendar/libecal/e-cal-client.c:600
 msgid "Failed to run calendar factory"
 msgstr "ÙÙÙÙØÙÛ ØØÛÛØÙÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:716
+#: ../calendar/libecal/e-cal-client.c:765
 msgid "Failed to find system calendar"
 msgstr "ØÙØØÛÙØ ÙÙÙÙØÙÙØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-client.c:754
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../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:864
+#: ../calendar/libecal/e-cal-client.c:919
 msgid "Invalid source type"
 msgstr "ÙÛÙØÛ ØÙÙÙ ØÙÙØÛÛØØÙØ"
 
-#: ../calendar/libecal/e-cal-component.c:1298
+#: ../calendar/libecal/e-cal-component.c:1362
 msgid "Untitled appointment"
 msgstr "ÙØÛØÛØÙØ ØÛÙÙØÙÛ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "1-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "2-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "3-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "4-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "5-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "6-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "7-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "8-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "9-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "10-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "11-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "12-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "13-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "14-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "15-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "16-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "17-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "18-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "19-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "20-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "21-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "22-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "23-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "24-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "25-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "26-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "27-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "28-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "29-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "30-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "31-ÚÛØÙØ"
 
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
 msgctxt "Priority"
 msgid "High"
 msgstr "ÙÛÙÙØÙ"
 
-#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÙÙØÙØÙ"
 
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Low"
 msgstr "ØÛÛÛÙ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:702
+#: ../calendar/libecal/e-cal-util.c:716
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ØÛÙÙÙÙÙÙÙØÙØ"
@@ -1404,229 +1457,219 @@ msgstr "ØÛÙÙÙÙÙÙÙØÙØ"
 msgid "Cannot process, calendar backend is opening"
 msgstr "ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙØ ÙÙÙÙØÙÛ ØØØÙØ ØÛÚÙ ØÙÚÛÙ ØÙÙÛÙ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:207
+#: ../calendar/libedata-cal/e-cal-backend.c:142
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%sÂ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:219
+#: ../calendar/libedata-cal/e-cal-backend.c:159
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÙÙÙÙØÙÛ ØØØÙÙÙÙ Â%s ÙÙÚ ÙÙÙÙÙØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1048
+#: ../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
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../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
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../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
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÚÛØÙØ/ÛØÙÙØ ØÛÙÙØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../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
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "%s\" ØÙÙÙÙ ØØØÚÛÙÛÙØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1092
+#: ../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
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ØÙØÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ÙÛØÛÙ ØØÙ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects two or three arguments"
+msgstr "Â%s ØÙÙÙÙ ÙØÙÙ ØÛÚ ØØØÚÛÙÛÙØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+
+#: ../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
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ time_t ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "Â%s ØÛÚÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects none or two arguments"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ØÙÙÙÙÙÚÙ ØØØÚÛÙÛÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
 #, 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:923
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ØØØ ØÛÚÛÙØÙÙÛ ØÙØ ØØØÚÛÙÛÙØ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
 #, 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) ØÙÙÛØÙÙÙ ØÛÙÛÙ "
-"ÙÙÙÙØÛ"
-
-#: ../calendar/libedata-cal/e-data-cal.c:418
-msgid "Invalid range"
-msgstr "ØÙÙØÛÛØØÙØ ØØØÙØÛ"
+msgstr "\"%s\" ØØØÙÙÙ ÙØØØÙÛØÙØÙÙÚ ØÛÙÙØØ ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ ÙØÙÙ ØÙØ ÛÛ ÙÛÙÛØ ØÙØÙØ ÙØØØÙÛØÙØÙÙÚ boolean ØÙÙÛØÙ ÛÛ ÙÙÙÙÙØÙÙÙÚ false (#f) ØÙÙÛØÙÙÙ ØÛÙÛÙ ÙÙÙÙØÛ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØÛØÛÙ"
 
-#: ../calendar/libedata-cal/e-data-cal.c:429
-msgid "Unknown user"
-msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
-
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:962
 msgid "Cannot open calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:930
+#: ../calendar/libedata-cal/e-data-cal.c:987
 msgid "Cannot remove calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:955
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 msgid "Cannot refresh calendar: "
 msgstr "ÙÙÙÙØÙÙÙÙ ÙÛÚÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:979
+#: ../calendar/libedata-cal/e-data-cal.c:1043
 msgid "Cannot retrieve backend property: "
 msgstr "ØØØÙØ ØÛÚ ØØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1025
+#: ../calendar/libedata-cal/e-data-cal.c:1098
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1050
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙÚ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1157
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÙÙÙÙØÙÙÙÙÚ ØÙÙØØ/ØØÙØÙØØØ ØÙØÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1101
+#: ../calendar/libedata-cal/e-data-cal.c:1188
 msgid "Cannot create calendar object: "
 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:1220
 msgid "Cannot modify calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛØÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1156
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot remove calendar object: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1179
+#: ../calendar/libedata-cal/e-data-cal.c:1281
 msgid "Cannot receive calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ÙÙØÛÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1204
+#: ../calendar/libedata-cal/e-data-cal.c:1312
 msgid "Cannot send calendar objects: "
 msgstr "ÙÙÙÙØÙÛ ÙÛÚÙÙÙ ØÛÛÛØÙÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1231
+#: ../calendar/libedata-cal/e-data-cal.c:1344
 msgid "Could not retrieve attachment uris: "
 msgstr "ÙÙØÛÙÙÙÙÙÚ uris ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1255
+#: ../calendar/libedata-cal/e-data-cal.c:1372
 msgid "Could not discard reminder: "
 msgstr "ØÛØÙÛØØÙÛÚÙÙ ØØØÙÙÛÛØÛÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1279
+#: ../calendar/libedata-cal/e-data-cal.c:1401
 msgid "Could not get calendar view path: "
 msgstr "ÙÙÙÙØÙÛ ÙÛØÛÙÙÛ ÙÙÙÙÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1304
+#: ../calendar/libedata-cal/e-data-cal.c:1431
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1326
+#: ../calendar/libedata-cal/e-data-cal.c:1457
 msgid "Could not add calendar time zone: "
 msgstr "ÙÙÙÙØÙÛ ÛØÙÙØ ØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:383
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
 msgid "Invalid call"
 msgstr "ØÙÙØÛÛØØÙØ ÚØÙÙØÙØ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:424
-#, c-format
-msgid "Invalid URI"
-msgstr "ØÙÙØÛÛØØÙØ URI"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:442
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr "Â%2$s ØØ ÙÙØØÛØÛÙ Â%1$s ÙÙÚ ØØØÙØ ØÛÚ ØØÛÛØÙ ÙÙÙ"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:485
-#, c-format
-msgid "Could not instantiate backend"
-msgstr "backend ÙÙÚ ØÛÙÚÙØÙÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
-
 #: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
@@ -1657,15 +1700,15 @@ msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØØÚÙÛÚÙÙ ØÙÙÙÙØØ ÙÙÙØÙ
 msgid "You may not export keys with this cipher"
 msgstr "ØÛ ØÙÙÙØÙÙØÛÚØØ ØØÚÙÛÚÙÙ ØÛÙØÙÙØØ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:800
 msgid "Signing message"
 msgstr "ØÛÚÛØØØ ØÙÙØØ ÙÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1041
 msgid "Encrypting message"
 msgstr "ØÛÚÛØ ØÙÙÙØÙØÛØØÙØÛ"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1168
 msgid "Decrypting message"
 msgstr "ØÛÚÛØÙÙ ØÙÙÙØØÙØÙØÛØØÙØÛ"
 
@@ -1674,35 +1717,33 @@ msgstr "ØÛÚÛØÙÙ ØÙÙÙØØÙØÙØÛØØÙØÛ"
 msgid "Unable to create cache path"
 msgstr "ØÛÙÙÛÙ ÙÙÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-data-cache.c:495
+#: ../camel/camel-data-cache.c:504
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ØÛÙÙÛÙØÙÙÙ ÙÙØÚÛÙÙ ÚÙÙÙØÙÛÛØÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
-msgstr ""
-"ØØØÙØÛ ÙÙØÚÛØÙÙÙ ÙØØØÙÙÙ ØÙÙÙÙØÙ: %s\n"
+msgstr "ØØØÙØÛ ÙÙØÚÛØÙÙÙ ÙØØØÙÙÙ ØÙÙÙÙØÙ: %s\n"
 "ØÛÚÛØ ÙØÙØØ ØØØÙØÙÙÙØÙÚÙØ ØÛÙÙÚØÙÙ ÙÛÙÙÙÙÙ ÙÛØØÛÙØØÙØØ\n"
 "ØØÛØØØÙØ ÙØÙÙØÛ"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:300
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
-msgstr ""
-"Â%s ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ:\n"
+msgstr "Â%s ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ:\n"
 "%s\n"
 "ØÛ ÙÙØÙÛÚÙØ ØÙÙØØÙ ØÛØÚÛØØÙØÙÛØ ÙØÙØØ ÙÛØÛÙØØØÙØÙÙØÙØÛ."
 
-#: ../camel/camel-disco-diary.c:304
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÛÙ ÙØÙØØ ÙÛØÛÙØØØÙØØ"
 
@@ -1710,339 +1751,344 @@ msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÛÙ ÙØÙØØ ÙÛØÛÙØØØÙØØ"
 msgid "Downloading new messages for offline mode"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ÚÛØÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:412
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ ØÙØÙÙØÙØ ØÛÚÛÙ Â%s ÙÙ ØÛÙÙØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
-msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
+#| msgid "Copy folder content locally for offline operation"
+msgid "Copy folder content locally for _offline operation"
 msgstr ""
-"ØÙØØÙØ ÚØÙÛØØÙÙÙ ÙÛØØÛÙØØØØ ØÙØÙÙØÙØ ØÛÚÛÙ ÙÙØÙÛÚ ÙÛØÙÛÙÙÙÙ ÙÛØÙÙÙÙÛ ÙÛÚÛØÙØÛ"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1153
-#: ../camel/providers/imap/camel-imap-store.c:1925
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imap/camel-imap-store.c:3171
-#: ../camel/providers/imapx/camel-imapx-folder.c:311
-#: ../camel/providers/imapx/camel-imapx-folder.c:344
-#: ../camel/providers/imapx/camel-imapx-folder.c:398
-#: ../camel/providers/imapx/camel-imapx-folder.c:444
-#: ../camel/providers/imapx/camel-imapx-folder.c:478
-#: ../camel/providers/imapx/camel-imapx-folder.c:518
-#: ../camel/providers/imapx/camel-imapx-folder.c:554
-#: ../camel/providers/imapx/camel-imapx-store.c:238
-#: ../camel/providers/imapx/camel-imapx-store.c:1278
-#: ../camel/providers/imapx/camel-imapx-store.c:1366
-#: ../camel/providers/imapx/camel-imapx-store.c:1412
+#: ../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
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ØÙØØØ ØÛÙØÙÙÙØØ ØÛ ÙÛØØÛÙØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-file-utils.c:722
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ÛØØ ÙÛÚØÙ"
 
-#: ../camel/camel-filter-driver.c:818 ../camel/camel-filter-search.c:628
+#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "'%s' ØØØÙØÙ ØÙØØØ ÙÛØØÙÙÙØÙ: %s"
 
-#: ../camel/camel-filter-driver.c:866
+#: ../camel/camel-filter-driver.c:937
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ÙÙÚØÙÙ ØÙÙØÛÛØØÙØ ØÛÚÛØ ØÛÙÙÙÙ ØØÙØÛØÛÛØÙØÙ: %s"
 
-#: ../camel/camel-filter-driver.c:1053 ../camel/camel-filter-driver.c:1062
+#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
 msgid "Syncing folders"
 msgstr "ÙÙØÙÛÚÙØØÙÙ ÙÛØÛÙØØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1150 ../camel/camel-filter-driver.c:1594
+#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ØÛØÚÛÚÙÙ ØÛÚÙÙÙ ÙÙÙÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1161 ../camel/camel-filter-driver.c:1605
+#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ØÛØÚÛÚÙÙ ØÙØØØ ÙÙÙÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258
+#: ../camel/camel-filter-driver.c:1356
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ØÙØØÙÙÙÙ ÙÙØÙÛÚÙÙ ØØÚØÙÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1368
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ØÙØØÙÙÙÙ ÙÙØÙÛÚÙÙ ØÙØ ØÛØÛÙ ÙÙÙØÙÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1386
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ØÛÚÛØ %d ÙÙ ØÙÙÛÛØØÙØÛ (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1294 ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Failed on message %d"
 msgstr "ØÛÚÛØ %d ØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-filter-driver.c:1331 ../camel/camel-filter-driver.c:1432
+#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
 msgid "Syncing folder"
 msgstr "ÙÙØÙÛÚÙÙ ÙÛØÛÙØØØÙØÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1336 ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
 msgid "Complete"
 msgstr "ØÙÙÛÙ"
 
-#: ../camel/camel-filter-driver.c:1396
+#: ../camel/camel-filter-driver.c:1495
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ØÛÚÛØ %d / %d ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-filter-driver.c:1414
+#: ../camel/camel-filter-driver.c:1513
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ØÛÚÛØ %d / %d ØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "ØÛÚÛØÙÙ ØÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-filter-search.c:403
+#: ../camel/camel-filter-search.c:512
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-filter-search.c:418
+#: ../camel/camel-filter-search.c:530
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag)ÚÛ ØÛØÙÙÚÛÙ ÙØØØÙÛØÙØ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-filter-search.c:799 ../camel/camel-filter-search.c:808
+#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ØÛØÚÛÚÙÛÙ ØÙØØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:258
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ spam ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:298
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Â%s ÙÙÚØÙÙÙ ÙÛÚÙ ham ØÛÚÛØÙÙØÙÙÙ ØÛÚÙÙÙÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:346
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ØÙÙÙ ÙÛÚÙ ØÛÚÛØÙÙ ØÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:898
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:914
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ØÛÚÛØÙØØ ÙÛØÙÙÙÙÛØØÙØÛ."
 
-#: ../camel/camel-folder.c:901
+#: ../camel/camel-folder.c:917
 msgid "Copying messages"
 msgstr "ØÛÚÛØÙØØ ÙÛÚÛØÛÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:1156
+#: ../camel/camel-folder.c:1229
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ØØ ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-folder.c:3265
+#: ../camel/camel-folder.c:3535
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ØÛÚÛØ Â%s ÙÙ %s ØÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder.c:3390
+#: ../camel/camel-folder.c:3681
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Â%s  ÙÙØÙØ ØÛÚÛØÙÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
+#: ../camel/camel-folder-search.c:661
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
-msgstr ""
-"ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ: %s:\n"
+msgstr "ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:673
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
-msgstr ""
-"ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÙØØØ ÙÙÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s:\n"
+msgstr "ØÙØØÛØ ØÙÙØØÙØÙÙÙ ØÙØØØ ÙÙÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s:\n"
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:844 ../camel/camel-folder-search.c:887
+#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
 #, 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:941
+#: ../camel/camel-folder-search.c:991
 #, 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:948 ../camel/camel-folder-search.c:956
+#: ../camel/camel-folder-search.c:998 ../camel/camel-folder-search.c:1006
 #, 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:984
+#: ../camel/camel-folder-search.c:1034
 #, 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:994
+#: ../camel/camel-folder-search.c:1044
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ØØ ÙÙØÙÛÚ ØÙÙÙÙÙÙ ÙÛØÛÙ"
 
-#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
-#: ../camel/camel-gpg-context.c:1272
+#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
+#: ../camel/camel-gpg-context.c:1323
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg ÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/camel-gpg-context.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "ÙØÙÛÙÛÙ"
 
-#: ../camel/camel-gpg-context.c:711
+#: ../camel/camel-gpg-context.c:729
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
-msgstr ""
-"GnuPG ÙÙÚ ØÛØÙÙØÙØÛ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÚØÙÛØ ØÛÚÛØÙ ØØØ:\n"
+msgstr "GnuPG ÙÙÚ ØÛØÙÙØÙØÛ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÚØÙÛØ ØÛÚÛØÙ ØØØ:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:728
+#: ../camel/camel-gpg-context.c:765
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg ØÙØÙÛØÙÛÚÙ ÙÙÙÙÙÙÙÙÙÚ ÙÛØØÛØÙÙØÙÙÙ ØÛÚÙÙÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg ÙÙÚ ØÙÙ ØÛÙÙÙÙÙÙ ØÛÚÙÙÙ ÙÙÙÙØØØ ÙÛØÙÛÙ ØÛÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:789
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
-msgstr ""
-"ØÙØÙÙØÙÛØØÙØÙ SmartCard ÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
+msgstr "ØÙØÙÙØÙÛØØÙØÙ SmartCard ÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
 "PIN ÙÙØÙ ØÛØÛØ: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
-msgstr ""
-"ØÙØÙÛØÙÛÚÙÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
+msgstr "ØÙØÙÛØÙÛÚÙÙÙ ÙÛÙÛÙØÙØÙØØ ØÛÚÛÙ\n"
 "ØÙÙ ØÛØÛØ: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Â%s ØØ ÙÙØØÛØÛÙ GnuPG ÙÙÚØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØÛÙÛÙ ØØÙØÛØÛÛØÙØÙ"
 
-#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4951
-#: ../camel/providers/imapx/camel-imapx-server.c:4968
-#: ../camel/providers/imapx/camel-imapx-store.c:159
-#: ../camel/providers/nntp/camel-nntp-summary.c:409
-#: ../libedataserverui/e-book-auth-util.c:221
+#: ../camel/camel-gpg-context.c:846
+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-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
 #, c-format
 msgid "Cancelled"
 msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:896
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÙÛØÙÙÙ ØØÚÙÛÚÙÙ ÙÛÙÛÙØÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: 3 ØØÙÛ ØÙÙ ÚÛÙÙÙØÙ ØØØØ."
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:909
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ÙÙÚØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØØÛØØ ØØÙØÛØÛÛØÙØÙ: %s"
 
-#: ../camel/camel-gpg-context.c:989
+#: ../camel/camel-gpg-context.c:1040
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ØÙÙÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: ØÙØØØ ØÙÙØØÙ ØØÙØÛØÛÛØÙØÛÚÙÙØØ ØÛÙÙØÙÙÙÙÚÛÙ."
 
-#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/camel-gpg-context.c:1584 ../camel/camel-gpg-context.c:1788
-#: ../camel/camel-gpg-context.c:1898 ../camel/camel-gpg-context.c:2045
-#: ../camel/camel-gpg-context.c:2145 ../camel/camel-gpg-context.c:2193
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "gpg ÙÙ ØÙØØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-gpg-context.c:1663 ../camel/camel-gpg-context.c:1671
-#: ../camel/camel-gpg-context.c:1679 ../camel/camel-gpg-context.c:1699
-#: ../camel/camel-smime-context.c:950 ../camel/camel-smime-context.c:964
-#: ../camel/camel-smime-context.c:973
+#: ../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
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ØÛÚÛØÙÙÚ ØÙÙØØØÙÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: ØÛÚÛØ ÙÙØÙØØÙ ØÙØØØ ØÛÙÛØ"
 
-#: ../camel/camel-gpg-context.c:1741
+#: ../camel/camel-gpg-context.c:1793
 msgid "Cannot verify message signature: "
 msgstr "ØÛÚÛØÙÙÚ ØÙÙØØØÙÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/camel-gpg-context.c:1864
+#: ../camel/camel-gpg-context.c:1916
 msgid "Could not generate encrypting data: "
 msgstr "ØÙÙÙØÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙØØÙÙ ÚØØÙÙ ÙÙÙØÙÙÙØÙ. "
 
-#: ../camel/camel-gpg-context.c:1917
+#: ../camel/camel-gpg-context.c:1969
 msgid "This is a digitally encrypted message part"
 msgstr "ØÛ ØÛÙÛÙÙÙÙ ØÙÙÙØÙØÙØØÙ ØÛÚÛØ ÙØØÚÙØÙ"
 
-#: ../camel/camel-gpg-context.c:1975 ../camel/camel-gpg-context.c:1984
-#: ../camel/camel-gpg-context.c:2007
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2059
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ØÛÚÛØÙÙÚ ÙÛØÙÙÙÙ ØÙÙÙÙØÙ: ØÛÚÛØ ÙÙØÙØØÙ ØÙØØØ ØÛÙÛØ"
 
-#: ../camel/camel-gpg-context.c:1995
+#: ../camel/camel-gpg-context.c:2047
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME ÙØØÚÙØÙÙÙ ØÙÙÙØØÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ: ÙÛÙÙØÙÙ ØØØØ"
 
-#: ../camel/camel-gpg-context.c:2086 ../camel/camel-smime-context.c:1261
+#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
 
@@ -2054,9 +2100,7 @@ msgstr "%s ÙÙÚ ÙÛÙÛÙ ÚÛØØÙØÙÙÙ ÙÛØØÙÙÙØÙ: %s"
 #: ../camel/camel-lock.c:145
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr ""
-"%s ÙÙÚ ÙÛÙÛÙ ÚÛØØÙØÙÚÛ ØÛØÙØÙØØÛ ÛØÙÙØ ÙÛÚÙÛØØÙÙ ØÛØÙÙ ÙÛØØÙ. ÙÛÙÙÙ ÙØÙØØ "
-"ØÙÙØÚ."
+msgstr "%s ÙÙÚ ÙÛÙÛÙ ÚÛØØÙØÙÚÛ ØÛØÙØÙØØÛ ÛØÙÙØ ÙÛÚÙÛØØÙÙ ØÛØÙÙ ÙÛØØÙ. ÙÛÙÙÙ ÙØÙØØ ØÙÙØÚ."
 
 #: ../camel/camel-lock.c:205
 #, c-format
@@ -2137,73 +2181,64 @@ msgstr "ØÛÙØÛØ ÚÛØØÙØÙÙÙ ØÙÙÛÛØØÙØÙØØ ØØØØÙÙÙ
 msgid "Error writing mail temp file: %s"
 msgstr "ØÛØ ÛØÙÙØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛØÙÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ØÛØ ÛØÙÙØÙÙÙ ÚÛØØÙØÙÙÙ ÙÛÚÛØÛØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ: %s"
 
-#: ../camel/camel-multipart-signed.c:296
+#: ../camel/camel-multipart-signed.c:297
 #, c-format
 msgid "No content available"
 msgstr "ÙÛØÙÛÙ ÙÙÙ"
 
-#: ../camel/camel-multipart-signed.c:304
+#: ../camel/camel-multipart-signed.c:305
 #, c-format
 msgid "No signature available"
 msgstr "ØÙÙØØ ÙÙÙ"
 
-#: ../camel/camel-multipart-signed.c:688
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "ØÛÚÙÙÙ ÙÙÙÙØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s ØÙÙÛÙ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "SSL ÙÙÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ)"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: "
-
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "ÚÛÙ ÙÙÙÙÛØØÙØÛ: %s"
 
-#: ../camel/camel-net-utils.c:718
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "ØØØ ØØÙÙØØØØÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ØØØ ØØÙÙØØØØÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/camel-net-utils.c:845
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "ØØØØÛØÙÙ ÚÛÙ ÙÙÙÙÛØØÙØÛ"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-net-utils.c:872
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ØØØÙÙÙ ØÛÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: "
+
 #: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÙÙØÙÛÚ Â%s ØÙÙÙ ØÛÚÛØÙØØ ÙÛØÛÙØØØÙØÙ ØÙØÙÙØØ ØØÙÙØÛØØÙØÛ"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙÚ ØÙØØÙØ ÚØÙÛØØÙÙÙ ÚÛØÙÙÙÙÙÙ ÙØØØÙÙÙ ØÙÙÙÙØÙ: %s"
@@ -2216,23 +2251,22 @@ msgstr "ÙÛÛÚÛÙ ÙÙØÙÛÚ ØÛÙØÛØ ØÛÙÙÙÙÙÚÛÚÙ"
 msgid "For reading mail as a query of another set of folders"
 msgstr "ØØØÙØ ÙÙØÙÛÚÙØØ ØÙÙÙÙÙÚ ØÛØÛØØÛØÙÙØÙ ØÛÙÙØÙØÛ ØÛØ ØÙÙÛØ"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙ ÙÛÙÙÛØÙÙ ØÛ ØÙØØÛÙÙØØ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
+msgstr "%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙ ÙÛÙÙÛØÙÙ ØÛ ØÙØØÛÙÙØØ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ÙÙ ØÙÙÛÙØÙÙÙØÙ: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:211
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÛÙØÛ ØÛØÙÛÙÙÛØØÛØÛØ ÙÛÙÙØÙÙÙØÙ ÙÙÙ."
 
-#: ../camel/camel-provider.c:391 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÙÛÙÙØÙÙ Â%s ÙÙÚ ØÛÙÙÙÙÙÚÛÚÙØÙ ÙÙÙ"
@@ -2255,8 +2289,7 @@ msgstr "ØÛÙÙÙÙÙÙÛÙÙÙØÙ."
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
-msgstr ""
-"ØÛÙØÛØ ØØØØÛØÙÙÙ ØÙØÙØØ ØÛÚÛØÙ ØÙÙØÛÛØØÙØ:\n"
+msgstr "ØÛÙØÛØ ØØØØÛØÙÙÙ ØÙØÙØØ ØÛÚÛØÙ ØÙÙØÛÛØØÙØ:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:95
@@ -2264,8 +2297,7 @@ msgstr ""
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
-msgstr ""
-"ØÙÙØÛÛØØÙØØ ØÛÙÙØÛ ØÙØÙØØ ØÛÚÛØÙ:\n"
+msgstr "ØÙÙØÛÛØØÙØØ ØÛÙÙØÛ ØÙØÙØØ ØÛÚÛØÙ:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:109
@@ -2273,175 +2305,153 @@ msgstr ""
 msgid ""
 "Invalid trace information:\n"
 "%s"
-msgstr ""
-"ØÙØÙØØ ØÛÚÛØÙ ØÙÙØÛÛØØÙØ:\n"
+msgstr "ØÙØÙØØ ØÛÚÛØÙ ØÙÙØÛÛØØÙØ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:42
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ CRAM-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ "
-"ØÙØÛØÛØ CRAM-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ CRAM-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ ØÙØÛØÛØ CRAM-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:55
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ DIGEST-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ "
-"ØÙØÛØÛØ DIGEST-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ DIGEST-MD5 ÙÙ ÙÙÙÙÙØØØ ÙÛÙØØÙÙÛØÙØØØ ØÙØÛØÛØ DIGEST-MD5 ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:846
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙ ØÛÙ ÙÙÙ(>2048 octets ØÙÙ ÙÙÙ)"
 
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:857
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙ ØÙÙØÛÛØØÙØ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr ""
-"ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙØÛ ØÙÙØÛÛØØÙØ ÂØÛÙÛØÙÛ ÙØÙØÙÛØÙÙÙ ÙÙÙÙØÂ(QOP: Quality of "
-"Protection) ØÛÙÛÙÚÙØÙ(token) ØØØ"
+msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÛÙÙÙÙØÛ ØÙÙØÛÛØØÙØ ÂØÛÙÛØÙÛ ÙØÙØÙÛØÙÙÙ ÙÙÙÙØÂ(QOP: Quality of Protection) ØÛÙÛÙÚÙØÙ(token) ØØØ"
 
-#: ../camel/camel-sasl-digest-md5.c:873
+#: ../camel/camel-sasl-digest-md5.c:898
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÙÙÙÙ-ÙÛÙÛÙØØÙ ÙÙÙ"
 
-#: ../camel/camel-sasl-digest-md5.c:894
+#: ../camel/camel-sasl-digest-md5.c:919
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÙÙÙÙ-ÙÛÙÛÙØØÙ ÚØÙØ"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:932
 #, c-format
 msgid "Server response does not match"
 msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØÙÙÙØØÙ ÙØØ ÙÛÙÙÙØÙ"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ Kerberos 5 ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÙ "
-"ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ Kerberos 5 ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:130
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
-msgstr ""
-"ØÛÙÚÙÙÛÙÚÛÙ ÙÛØØÙÙØÙÙÙØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÙØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ ÙØÙÙ "
-"ØÛÙÙÚ ÙØØÙÙÙØÙØØ ØÛÙÙ ØÙÙÛÙØÙØÛ."
+msgstr "ØÛÙÚÙÙÛÙÚÛÙ ÙÛØØÙÙØÙÙÙØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÙØÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ ÙØÙÙ ØÛÙÙÚ ÙØØÙÙÙØÙØØ ØÛÙÙ ØÙÙÛÙØÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:135
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ØÛÙÙÙÙÙÚÛÙ target_name ÙØØØÙÛØÙØÙÙÙÚ ÙÛØÛÙÙÙØÙ ØÙØØØ ØÛÙÛØ ØÙÙÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr ""
-"ØÛÙÙÙÙÙÚÛÙ target_name ÙØØØÙÛØÙØÙÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ÙØÙÙ ØÙØÙÛØÙÙÙÙ "
-"ØÙÙÙØÙØÙØØÙ ØÙÙØÙÙÙ ØØØ ØØØ"
+msgstr "ØÛÙÙÙÙÙÚÛÙ target_name ÙØØØÙÛØÙØÙÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ÙØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÙØØÙ ØÙÙØÙÙÙ ØØØ ØØØ"
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
-msgstr ""
-"input_token ØÛØ ØÙÚÙÚÛ ØØÙØØÙ ÙØÙØÙ ØØØÙÙÙÙØÙ ÛÛ input_chan_bindings "
-"ÙØØØÙÛØÙØÙ ØÛÙÚÙÙÙÚÛÙ ÙØÙØÙ ØÙØØÙÙØÙØÛ."
+msgstr "input_token ØÛØ ØÙÚÙÚÛ ØØÙØØÙ ÙØÙØÙ ØØØÙÙÙÙØÙ ÛÛ input_chan_bindings ÙØØØÙÛØÙØÙ ØÛÙÚÙÙÙÚÛÙ ÙØÙØÙ ØÙØØÙÙØÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:147
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr ""
-"input_token ÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ØÙÙØØ ÙØÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙØÙØÙØØÙ ØÙÙØØ ØØØ"
+msgstr "input_token ÙÙÚ ØÙÚÙØÛ ØÙÙØÛÛØØÙØ ØÙÙØØ ÙØÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙØÙØÙØØÙ ØÙÙØØ ØØØ"
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
-msgstr ""
-"ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙØØ ÙÙÙØÛÙÙØØ ØÛØÙÛÙÙÛØØÛØÛØÙÛ ØÙÙÙÙØÙ ÙØÙÙ "
-"ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ØØØÙØ ÚÛÚÙØÙØØÙ ØÙØ ØÙØÙØØÙØÙÙÙÙ ÙÛØØÛØÙÙÚÛÙ."
+msgstr "ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙØØ ÙÙÙØÛÙÙØØ ØÛØÙÛÙÙÛØØÛØÛØÙÛ ØÙÙÙÙØÙ ÙØÙÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ØØØÙØ ÚÛÚÙØÙØØÙ ØÙØ ØÙØÙØØÙØÙÙÙÙ ÙÛØØÛØÙÙÚÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ÚÛÚÙØÙØØÙ ØÙØ ØÙÙØÛÛØÙÙÙ ÙÙÙØÛÙÙØØÙÙ "
-"ÙÛØØÛØÙÙÚÛÙ."
+msgstr "ØÛÙÙÙÙÛÙÚÛÙ ØÙØÙØØÙØÙÛ ØÛØÙÛØÙ ÚÛÚÙØÙØØÙ ØÙØ ØÙÙØÛÛØÙÙÙ ÙÙÙØÛÙÙØØÙÙ ÙÛØØÛØÙÙÚÛÙ."
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:159
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the credential failed."
 msgstr "ØÙØÙØØÙØÙÙÙÙÚ ÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The referenced credentials have expired."
 msgstr "ÙØÙØÙÙØÙØØÙ ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÛØÛÙØÛ."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
-#: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1228
+#: ../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
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØÛØØÙ ØØØØ."
 
-#: ../camel/camel-sasl-gssapi.c:385
+#: ../camel/camel-sasl-gssapi.c:406
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÙÙÙÙÙÙØÙØÙØØÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÙØØÙ) ØÙØÛØÛØÙÙÙ ÙÛÛÙØÙ."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "ØÙØÙÙØØ ÙÙØ"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
 msgid "This option will connect to the server using a simple password."
 msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ ÙÛÙØØÙÙÛØÙØØØ ØØØØÙÙ ØÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:103
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÚØÙÙØÙ ÙØÙÛÙÛÙ."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:43
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:45
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ Windows ØØØØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ NTLM/ ØÙØÛØÛØ ØÙÙ "
-"ØØØÙÙÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛØ Windows ØØØØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ NTLM/ ØÙØÛØÛØ ØÙÙ ØØØÙÙÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:40
 msgid "PLAIN"
 msgstr "PLAIN"
 
@@ -2451,9 +2461,7 @@ msgstr "SMTP ØÙÙ ØÛØÛÙ POP"
 
 #: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÙÙ ØØØØØÙØÙÙ ÙÛÙÙÙ "
-"ØØÙØÙÙ SMTP ÙÙ ØÙØÙÙØÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÙÙ ØØØØØÙØÙÙ ÙÛÙÙÙ ØØÙØÙÙ SMTP ÙÙ ØÙØÙÙØÙØÛ."
 
 #: ../camel/camel-sasl-popb4smtp.c:80
 msgid "POP Source UID"
@@ -2462,281 +2470,280 @@ msgstr "POP ÙÛÙØÛ UID"
 #: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
-msgstr ""
-"ÙØÙÛÙÛÙ ÙÙÙÙØØ ØÛØÛÙÙ ØØØÙÙÙÙÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙÙÙ "
-"ØÙØÙÛØ"
+msgstr "ÙØÙÛÙÛÙ ÙÙÙÙØØ ØÛØÛÙÙ ØØØÙÙÙÙÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙÙÙ ØÙØÙÛØ"
 
 #: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr ""
-"ØÙØ %s ÙÛÙØØÙÙÙØÙ ØÙÙÛÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÛ ØÛØÛÙÛØ"
+msgstr "ØÙØ %s ÙÛÙØØÙÙÙØÙ ØÙÙÛÙ ÂSMTP ØÙÙ ØÛØÛÙ POPÂ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØÙÛ ØÛØÛÙÛØ"
 
 #: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÙÛÙØÙØÙÙ ØÙÙØØÙÙÙ ØÛÚØÙØÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/camel-service.c:526
-#, c-format
-msgid "URL '%s' needs a user component"
-msgstr "URL '%s' ØÛÚÛÙ ØÙØ ØÙØÙÛØÙÛÚÙ ØÛÙÙÙÙ ØÙÙÛØÙ ÙÛØÛÙ"
-
-#: ../camel/camel-service.c:537
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' ØÛÚÛÙ ØØØØØÙÙ ÙØØÙÙØ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ÙÛÙÙØÙÙ Â%s ØÛÚÛÙ ØÛØÙÙØÙÙÚÛÙ GType ØÙÙØÛÛØØÙØ"
 
-#: ../camel/camel-service.c:548
+#: ../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 "URL '%s' needs a path component"
-msgstr "URL '%s' ØÛÚÛÙ ÙÙÙ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr ""
 
-#: ../camel/camel-session.c:361
+#: ../camel/camel-session.c:477
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "ÙÛÙÙØÙÙ Â%s ØÛÚÛÙ ØÛØÙÙØÙÙÚÛÙ GType ØÙÙØÛÛØØÙØ"
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr ""
 
-#: ../camel/camel-session.c:938
+#: ../camel/camel-session.c:1183
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ."
 
-#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Â%s ÙÙÚ ØÙØÙØØÙØÙÙØÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:372
+#: ../camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "CMS ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "CMS ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:383
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "CMS ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:396
+#: ../camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ØÙÙØØ ÙÙÙØÛÚÙÙÙÚ ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:402
+#: ../camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "ØÙØÙØØÙØÙÛ ØÛÙØÙØÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:408
+#: ../camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ØÙÙØØ ÛØÙØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ÙÙÚ ØÙÙÙØÙØØ ØÙØÙØØÙØÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "SMIMEEncKeyPrefs ØØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "MS SMIMEEncKeyPrefs ØØØÙÙÙÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "ØÙÙÙØÙØØ ØÙØÙØØÙØÙÙØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:473
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ØÙÙØØ ÙÙÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "ØÛÙØÛØÛÙÙÙÚÛÙ"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "ÙØØØÙ ØÙÙØØ"
 
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "ØÙÙØØ ØØØØ"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "ÙÛØÙÛÙ ÙÙÙÙÙÙÙØ ØÛØÙØÙÙØØ ØÛØÚÛØØÙÙÚÛÙ"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "ØÙÙØØÙÙÙ ØÙØÙØØÙØÙÛ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ØÙÙØØÙÙÙ ØÙØÙØØÙØÙÛ ØÙØÛÙÚØÙØ"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "ØÙÙØØ ØØÙÚÙØÙØÙÙÙ ÙØÙÛÙÛÙ"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ØÙÙØØ ØØÙÚÙØÙØÙÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "ÙÛØÛÙÙÙØÙ ØØØØ ØÙÙØ"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "ØÙØØÛØÛÙ ÙÙÙÙØ ØØØØÙÙÙÙ"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "ØÙÙØØØØ ØÙÙØØÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙÙ"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "ÙÛÙØÙÙÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØØÙÙÙ Digests ÙÙÙØÙØØÙ"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "digests ÙÙ ÚÛØØØÙÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "ØÛÚÛØ digests ÙÙ ØÛÙÚÙÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "ØÙØÙØØÙØÙÙÙÙ ØÙÙÙÙØØ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ØÛÚÛØÙØØÙÙÙØ ØÙØÙØØÙØÙØÛØ ØÙØÙØØÙØÙÙÙÛØÙÙ ØÛÙØÛØÙÛÙØÛ"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ØÛÚÛØÙØØØ ØÙÙÙÙØØ ÙÙÙÙÙØØÙ ÛÛ ØÛÙØÛØÛÙÚÛÙ ØÙØÙØØÙØÙÙÙÛØÙÙ ØÙØÙØØÙØÙØÛ"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "ØÙÙØØÙÙÚ digests ÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ØÙÙØØ ÙÙÙØÛÚÙ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1123
+#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
 msgid "Cannot create encoder context"
 msgstr "ÙÙØÙÙØÛÚ ÙÛØÙÛÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:841
+#: ../camel/camel-smime-context.c:844
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ÙÙØÙÙØÛÚÙØ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1140
+#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
 msgid "Failed to encode data"
 msgstr "ØØÙÙÙÙ-ÙÛÙÛÙØØÙØØÙÙ ÙÙØÙØØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:989 ../camel/camel-smime-context.c:1236
+#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
 msgid "Decoder failed"
 msgstr "ÙÙØØÙØÙÙØÛÚ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1058
+#: ../camel/camel-smime-context.c:1061
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ØÙØØØÙ ØÙØÙÙØÙØÙØØÙ ØÙÙ ØÙÙÙØÙØØ ØØÙÚÙØÙØÙÙÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1066
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ØÙÙÙØÙØØ ØÙÙ ØØÚÙÛÚÙØØ slot ØÛÙØÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1077
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot create CMS Message"
 msgstr "CMS ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1083
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS ÙÛÙØÙÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1089
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS ÙÛÙØÙÙØÙØØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1098
 msgid "Cannot attach CMS data object"
 msgstr "CMS ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÛÚÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1104
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS ØØÙØÛØÛÛØÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1112
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS ØØÙØÛØÛÛØÙØÛÚÙ ØÛÚÛØÙÙÙ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:1137
 msgid "Failed to add data to encoder"
 msgstr "ÙÙØÙÙØÛÚÙØ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙÙØÛØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:1246
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ØÙÙÙØØÙØÙØØ: ØÙÙÙØÙØÙØØÙ ÙÛØÙÛÙ ØÛÙÙÙÙÙØÙ"
 
-#: ../camel/camel-store.c:1814
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:1857
+#: ../camel/camel-store.c:1842
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÙÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2044
+#: ../camel/camel-store.c:2027
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Â%s ØØ ÙÙØÙÛÚÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2056 ../camel/camel-store.c:2066
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ØÛØÙÛØØØÙØ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2059 ../camel/camel-store.c:2070
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ØÛØÙÛØ"
 
-#: ../camel/camel-store.c:2521
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s:ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/camel-store.c:2535
+#: ../camel/camel-store.c:2515
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØÛÛØØÙØÛ"
 
-#: ../camel/camel-store.c:2653 ../camel/camel-vee-store.c:350
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
 
-#: ../camel/camel-store.c:2796 ../camel/camel-vee-store.c:400
-#: ../camel/providers/local/camel-maildir-store.c:704
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÙÙØÛÛØØÙØ ÙÛØØÛÙØØ"
@@ -2745,165 +2752,173 @@ msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: Ø
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter ÙØ ØÛØÙÛÙÙÙ ÙÙÙÙÛØÙÛ ØÛØÙÙÚÛ ÙØÙØÛØÛØÙÙ ÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-stream-process.c:265
+#: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
 msgstr "ØØØÙÙÙÙØ ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
 
-#: ../camel/camel-stream-process.c:270
+#: ../camel/camel-stream-process.c:272
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" ØÛÙØÛÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ SOCKS4 ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ ØÙÙØÙÙØØÙÙÙØÙÙ ØÛØ ÙÙÙØÙ: ÙÙØÙ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÛØÙØÙÛØÚÙ ÙØØÙÙØ SOCKS5 ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:879
+#: ../camel/camel-tcp-stream-raw.c:770
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÙÛÛØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙÙÙ ØØÙÙÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "ØØØÛØØÙÙÙ SOCKS ÙÛÙØØÙÙÛØÙØ ØØØØÙÙÙÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙÙÙÚ ØÛØÛÙÙ ØÛÙÛÙÙÙ ØØØÙÙÙÙØÙØ ØÛØØÛØ ÙÙÙÙÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙØ ÙÛØÛÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ØØØ ØØÙÙØØØØÙÙ ÙÛØÚÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:895
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "ØÛÙÙÙÙØ ØÛØ ÙÙÙÙÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "Time-to-live ÙÙÚ ÛØÙØÙ ØÙØÙÛÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙ ØÛÙØÛÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙ ØØØØÛØ ØÙÙÙÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙØÙÛÙÛÙ ØØØØÙÙÙ ÙÛÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙØÙÛÙÛÙ ØØØØÛØ ØÙÙÙÙÙ ØØÙØÛØÛÛØÙØÙ"
 
-#: ../camel/camel-tcp-stream-raw.c:950
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ÙÛÙØØÙÙÛØÙØÙØÙÙ ÙÛÙÚÛÙ ÚØÙØ ØØÛØØ"
 
-#: ../camel/camel-tcp-stream-raw.c:970
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ØØØ ØØÙÙØØØØ ØØØÙ ØÛÙ ØÛØÛÙ(ØÛÚ ÚÙÚ ØÙÙØØÙØØ 255 ÚÛØÙ ØÙÙÙØÛ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØÙÙØÛÛØØÙØ ØØÛØØ"
 
-#: ../camel/camel-tcp-stream-ssl.c:453
+#: ../camel/camel-tcp-stream-ssl.c:470
 #, 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"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"ØØØÙØØÙÛÚÙ:            %s\n"
-"ÙØÛØÛ:           %s\n"
-"ØØØÙØÙ ØÙØÙ:       %s\n"
-"ØÙÙØØ:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "BAD"
 msgstr "ÙØÚØØ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:480
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:484
+msgid "_Reject"
+msgstr "ØÛØ ÙÙÙ(_R)"
+
+#: ../camel/camel-tcp-stream-ssl.c:485
+msgid "Accept _Temporarily"
 msgstr ""
-"%s ÙÙÚ SSL ØÙØÙØØÙØÙÙØÙÙÙ ØÛÙØÛØÙØÛ:\n"
-"\n"
-"%s\n"
-"\n"
-"ÙÙØÛÙØÙØÙØØ"
 
-#: ../camel/camel-tcp-stream-ssl.c:507
+#: ../camel/camel-tcp-stream-ssl.c:486
+msgid "_Accept Permanently"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:544
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
-msgstr ""
-"ØÙØÙØØÙØÙÙØÛ ÙÛØÙÙÛ ØØØ: %s\n"
+msgstr "ØÙØÙØØÙØÙÙØÛ ÙÛØÙÙÛ ØØØ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:559
+#: ../camel/camel-tcp-stream-ssl.c:596
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
-msgstr ""
-"ÙØÚØØ ØÙØÙØØÙØÙÛ domain: %s\n"
+msgstr "ÙØÚØØ ØÙØÙØØÙØÙÛ domain: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:577
+#: ../camel/camel-tcp-stream-ssl.c:614
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
-msgstr ""
-"ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
+msgstr "ØÙØÙØØÙØÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:594
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
-msgstr ""
-"ØÙØÙØØÙØÙÙÙÙ ØÛÙÛÙØÙÙ ÙØÙØÛØÛØ ØÙØÙÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
+msgstr "ØÙØÙØØÙØÙÙÙÙ ØÛÙÛÙØÙÙ ÙØÙØÛØÛØ ØÙØÙÙÙÙÙÚ ÛØÙØÙ ØÙØÙÛÙ: %s\n"
 "ØØØÙØØÙÛÚÙ: %s"
 
 #: ../camel/camel-url.c:330
@@ -2911,33 +2926,39 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "URL Â%s ÙÙ ØÛÚÙÙÙ ÙÙÙØÙÙÙØÙ"
 
-#: ../camel/camel-vee-folder.c:1279 ../camel/camel-vee-folder.c:1442
+#: ../camel/camel-vee-folder.c:647
+#, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr ""
+
+#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ØÛÚÛØÙØØÙÙ ÙÛÛÚÛÙ ÙÙØÙÛÚÙØ ÙÛÚÛØÚÙÙÙ ÙØÙÙ ÙÛØÙÙÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/camel-vee-folder.c:1315
+#: ../camel/camel-vee-folder.c:1354
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ÙÙÚØØ  %1$s ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/camel-vee-folder.c:1383
+#: ../camel/camel-vee-folder.c:1422
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' ÙÙ ØØÙÙØÛØØÙØÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ "
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
-#. all messages not belonging into any other configured search folder
+#. * all messages not belonging into any other configured search folder
 #: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "ÙØØÙØØÙÙØÙ"
 
-#: ../camel/camel-vee-store.c:376
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/camel-vee-store.c:410
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s: ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
@@ -2950,138 +2971,155 @@ msgstr "ØÛÚÛØÙØØÙÙ ØÛØÙÛØ ÙÙØÙÛÚÙØØ ÙÛÚÛØÚÙÙÙ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ØÛÚÛØÙØØÙÙ ÙÛØÛÙØÙØ ÙÙØÙÛÚÙØØ ÙÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "ÚÙÙÙØÙØ ØÛÙÙÙÙ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ÙÙØÙØ ØÛÙÙÙÙ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
 #, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
 msgid ""
-"Alert from IMAP server %s %s:\n"
+"Alert from IMAP server %s %s in folder %s:\n"
 "%s"
 msgstr ""
-"IMAP ÙÛÙØØÙÙÛØÙØÙ %s %s ØÙÙ ÙÛÙÚÛÙ ØÛÚÛØ:\n"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
+#, c-format
+msgid ""
+"Alert from IMAP server %s %s:\n"
+"%s"
+msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙ %s %s ØÙÙ ÙÛÙÚÛÙ ØÛÚÛØ:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ØØÛØØ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÙÛÙØØÙÙÛØÙØØÙÙ ÙÛÙÚÛÙ ØØÛØØ ØÛÙÙØ ØØÙØÛØ ØØØÙØÙÙØÙÙ ÙÛØØÙ."
 
-#: ../camel/providers/imap/camel-imap-command.c:774
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙÙÙÚ ØØÛØØÙÙÙÚ ØÙÚÙØÛ %s ØÛÚÛÙ ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-command.c:812
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØÙÙ ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ OK ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
-msgid "Always check for new mail in this folder"
-msgstr "ØÛ ÙÙØÙÛÚØÙÙÙ ÙÛÚÙ ØÛØÙÛØÙÙ ØØØÙÙ ØÛÙØÛØ"
+#: ../camel/providers/imap/camel-imap-folder.c:344
+#| msgid "Always check for new mail in this folder"
+msgid "Always check for _new mail in this folder"
+msgstr ""
+
+#: ../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:370
+#: ../camel/providers/imap/camel-imap-folder.c:437
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÙÛÙØÛØÙØÛ %s ÙÛØÛØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:393
+#: ../camel/providers/imap/camel-imap-folder.c:458
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ÙÙÚ ØÛØÛÙØÙØÙÙÙ ÙÛÙÙÙÙÛÙÙÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1049
-#: ../camel/providers/imapx/camel-imapx-server.c:4007
+#: ../camel/providers/imap/camel-imap-folder.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:3949
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ØÙÙÙ ØÛØÚÛØØÙÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3454
+#: ../camel/providers/imap/camel-imap-folder.c:3473
 msgid "Unable to retrieve message: "
 msgstr "ØÛÚÛØÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ. "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3489
-#: ../camel/providers/imapx/camel-imapx-server.c:5280
+#: ../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:3490
-#: ../camel/providers/imapx/camel-imapx-server.c:5281
+#: ../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:3565
-#: ../camel/providers/imap/camel-imap-folder.c:4483
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3586
+#: ../camel/providers/imap/camel-imap-folder.c:4464
+#: ../camel/providers/nntp/camel-nntp-folder.c:511
 #, c-format
 msgid "This message is not currently available"
 msgstr "ØÛ ØÛÚÛØ ÚØØÙØ ÙÙÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4067
-#: ../camel/providers/imap/camel-imap-folder.c:4150
-#: ../camel/providers/imapx/camel-imapx-server.c:3965
-#: ../camel/providers/imapx/camel-imapx-server.c:4115
+#: ../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
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ØÙÙÙ ÙÛÚÙ ØÛÚÛØ ØÛÚÛÙ ØÛØÛÙØÙ ØÛÚÛØÙØØ ØÛØÙØÙÛØØÙØÛ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4284
+#: ../camel/providers/imap/camel-imap-folder.c:4262
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÚÛÙÙÙØÙÙÙ ØÛÚÛØÙØØ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4294
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØØÛØØÙ ÚØÙØ: ØÛÚÛØ %d ÙÙÚ UID ØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4523
+#: ../camel/providers/imap/camel-imap-folder.c:4504
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ØØÛØØÙØØ ØÛÚÛØ ÚÛÛØÙØÙ ÙÙÙ."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
 #: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "ØÛÙÙÛÙ ÙÛÙØÛØÙØÙØÙ ØØÚØÙÙÙØÙ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "ØÛÚÛØ %s ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ØÛÚÛØ %s ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:531
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "%s ÙÙ ØÛÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
@@ -3092,12 +3130,12 @@ msgid "Checking for New Mail"
 msgstr "ÙÛÚÙ ØÛÙØÛØ ØÛÙØÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "ÚÛÙÙÛ ÙÙØÙÛÚØÙÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØ(_H)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ØÛØÙÛÙÚÛÙ ÙÙØÙÛÚÙØØÙÙÚ ØÛÚÙØÙÙÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØ(_E)"
 
@@ -3117,7 +3155,7 @@ msgstr "ØÛÙØÛÙ(_M):"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÙÙØÙÛÚ"
 
@@ -3140,213 +3178,198 @@ msgstr "ØØØ ØÙØÙÛÙÙ(_P)"
 #: ../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/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
-msgid "_Apply filters to new messages in Inbox on this server"
+#: ../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 ""
-"ØÛ ÙÛÙØØÙÙÛØÙØØÙÙÙ ÙÙØÛÙÙØØ ØØÙØÛÙÙØØ ÙÛÚÙ ØÛÚÛØÙØØØØ ØÛØÚÛÚ ÙÙÙÙØÙ(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "ÙÛØÛÙØÙØ ÙÛØÙÛÙÙØØ ÙÙØÙÛÚÙØÙÙÙ ÙÛÚÙ ØÛÚÛØÙØØÙÙ ØÛÙØÛØ(_K)"
+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 "Only check for Junk messages in the IN_BOX folder"
-msgstr "ÙÛÙÛØ INBOX ÙÙØÙÛÚÙØÙÙÙ ØÛÚÛØÙØØ ÙÛØÛÙØÙØÙÛ ØÛÙÛØÙÛ ØÛÙØÛØ(_B)"
+#| msgid "Check new messages for Jun_k contents"
+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
+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
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÙÙØØÙØÙÙÙ ØÛØÙÛØÙÙ ÙÛØÙÙÙÙÛ ØØÙØÙÙØØÙÙ ÙÛØÛÙØØØÙØ(_Z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
 msgstr "IMAP ÙÛÚÛÙØÙÙÙ ØÛØÙØ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
 msgstr "SSL ØÛØØÙØÙÙÙ IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ÙÛÙØØÙÙÛØÙØÙØØ ØÛØÙÛØÙÙ ØÙÙÛØ ÛÛ ØØÙÙØØ ØÛÚÛÙ."
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../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:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../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 ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ "
-"ØØØÙÙÙÙØÛ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:222
-#: ../camel/providers/imap/camel-imap-store.c:2587
-#: ../camel/providers/imapx/camel-imapx-store.c:333
-#: ../camel/providers/imapx/camel-imapx-store.c:771
-#: ../camel/providers/local/camel-maildir-folder.c:458
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:325
+#: ../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:354
-#: ../camel/providers/imap/camel-imap-store.c:381
-#: ../camel/providers/imap/camel-imap-store.c:408
-#: ../camel/providers/imapx/camel-imapx-server.c:2999
+#: ../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:355
-#: ../camel/providers/imapx/camel-imapx-server.c:3000
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../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:374
-#: ../camel/providers/imapx/camel-imapx-server.c:3038
+#: ../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:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "ØÛ ÙØØØÙÙÙØØ SSL ÙÙÙ"
-
-#: ../camel/providers/imap/camel-imap-store.c:707
-#: ../camel/providers/imapx/camel-imapx-server.c:3132
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr ""
-"IMAP ÙÛÙØØÙÙÛØÙØÙ %s ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
-
-#: ../camel/providers/imap/camel-imap-store.c:718
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
-#: ../camel/providers/smtp/camel-smtp-transport.c:347
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
-
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛÚÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
-
-#: ../camel/providers/imap/camel-imap-store.c:777
-#: ../camel/providers/imapx/camel-imapx-server.c:3188
-#, c-format
-msgid "You did not enter a password."
-msgstr "ØÙÙ ÙÙØÚÛØÙÙØÙÚÙØ."
-
-#: ../camel/providers/imap/camel-imap-store.c:818
-#: ../camel/providers/imapx/camel-imapx-server.c:3233
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2935
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
 msgstr ""
-"IMAP ÙÛÙØØÙÙÛØÙØÙØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ.\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:874
-#: ../camel/providers/imapx/camel-imapx-store.c:142
+#: ../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:877
-#: ../camel/providers/imapx/camel-imapx-store.c:145
+#: ../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:1962
-#: ../camel/providers/imap/camel-imap-store.c:2164
-#: ../camel/providers/imapx/camel-imapx-store.c:309
+#: ../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:1976
-#: ../camel/providers/imap/camel-imap-store.c:2431
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../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:2040
-#: ../camel/providers/imap/camel-imap-store.c:2495
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../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:2093
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:416
-#: ../camel/providers/local/camel-mh-store.c:547
+#: ../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
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ"
 
-#: ../camel/providers/imap/camel-imap-store.c:2444
-#: ../camel/providers/imapx/camel-imapx-store.c:1310
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ØØØØ ÙÙØÙÛÚ ÙØÙÛÙÛÙ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3214
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3217
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "ÙÛÙØØÙÙÛØÙØ ØÙÙÙÙÙÙØØÙ ÙÛØØÙÙ ØÛØÛÙØÙ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:88
+#: ../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:96
+#: ../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:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ØÛÚÛØ ÙÛÙØØÙÙÛØÙØ ÙÙÙÙÙØØ _Quick Resync ÙÙ ØÙØÙÛØ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "ØÛÚÛØ ÙÛÙØØÙÙÛØÙØ ÙÙÙÙÙØØ I_dle ÙÙ ØÙØÙÛØ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3360,34 +3383,139 @@ msgstr "ØÙØÙÙØÙØÙØØÙ ØÛÙÙÛÙÚÛÙ ØØØÙØÙÙØ ØØÙÙ"
 msgid "Namespace:"
 msgstr "ØØØ ØÙØÙÛÙÙ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "Default IMAP port"
 msgstr "ÙÛÚÛÙØÙÙÙ IMAP ØÛØÙØÙ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1476
+#: ../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:2182
+#: ../camel/providers/imapx/camel-imapx-server.c:1940
 #, c-format
 msgid "Not authenticated"
 msgstr "ØØÙØÚÙÙÙØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3405
+#: ../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:5426
-#: ../camel/providers/imapx/camel-imapx-server.c:5441
+#: ../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:1087
-#: ../camel/providers/nntp/camel-nntp-store.c:1704
+#: ../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"
@@ -3402,33 +3530,33 @@ msgstr "ÙÛÙØÛ ØÛÙÙÙÙØÙÙ ØØÙÙÙÙ-ÙÛÙÛÙØØ ÙØÙØÙÙØ
 msgid "Source stream unavailable"
 msgstr "ÙÛÙØÛ ØÛÙÙÙÙ ÙÙÙ"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
 #: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ØÛØØØÙ: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
-msgid "Index message body data"
-msgstr "ØÛÚÛØ ÚÛÛØÙØÙ ØØÙÙÙÙ-ÙÛÙÛÙØØÙÙØÙÙÙ ØÙÙØÛÙØÙØ"
+#: ../camel/providers/local/camel-local-folder.c:479
+#| msgid "Index message body data"
+msgid "_Index message body data"
+msgstr ""
 
-#: ../camel/providers/local/camel-local-folder.c:700
+#: ../camel/providers/local/camel-local-folder.c:710
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
-msgstr ""
-"ØÛÚÛØ %s ÙÙ ÙÙØÙÛÚ %s ØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ\n"
+msgstr "ØÛÚÛØ %s ÙÙ ÙÙØÙÛÚ %s ØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ\n"
 "%s"
 
 #: ../camel/providers/local/camel-local-provider.c:44
@@ -3451,14 +3579,13 @@ msgstr "ÙÛØÙÙÙØÛ ÙÛØÙÛØ"
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
-msgstr ""
-"ÙÛØÙÙÙ ØÛØÙÙ ØØØÛØØÙÙÙ mbox ÙÙÚÙÙÙØÙÙÙ ØÙØØÙØ ÙÙØÙÛÚØÙÙ ØÛØÙØÙÙ 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"
-msgstr "ØÛØØØÙ(INBOX) ØÙÙÙ ÙÛÚÙ ØÛØÙÛØÚÛ ØÛØÚÛÚÙÙ ÙÙÙÙØÙ(_A)"
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "_Apply filters to new messages in Inbox"
+msgstr ""
 
 #: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
@@ -3481,684 +3608,661 @@ msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÚÛØØÙØÙ"
 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 ØÛØÙÛØÙØÙÙÙ ÙÛÙØÛØÙØÛ ØØØÙÙ ØÙÙÛØÙÙÙÛ "
-"ØÙØÙÛØÙÙÙÙ ØÙÙÙØÛ"
+msgstr "ØÙØØÙÙ ØØØÛØØÙÙÙ mbox ØÙØØÙØ ÚÛØØÛØØÙÙÙ ÙÛØÙÙÙ ØÛØÙÙ ØÙÙÛØ ÛÛ ØØÙÙØØ ØÙØØØØÙØ ElmØ Pine ÙØÙÙ Mutt ØÛØÙÛØÙØÙÙÙ ÙÛÙØÛØÙØÛ ØØØÙÙ ØÙÙÛØÙÙÙÛ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÛ"
 
 #: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "ØÛÙÚÛÙÙÙÙ Unix mbox spool ÙÛÙØÛØÙØÙØÙ"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ÙÙØÙÛÚ %s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "ÙÛØÙÙÙ ØÛØ ÚÛØØÙØÙ %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:534
-#: ../camel/providers/local/camel-spool-store.c:571
+#: ../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
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛØÙÛÙ ÙÙÙ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ØØÙÙØÙØÙØØÙ root %s ÙÛÙØÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../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
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÙÛØÙÙÙ ØØÙÙÙØÛÚØØ inbox ÙÙÙ"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:708
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÙÙØÙÛÚ ØÙÙØÛÙØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:738
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "ÙÙØÙÛÚ ÙÛØØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
+msgstr "ÙÙØÙÛÚ ÙÛØØ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-local-summary.c:548
+#: ../camel/providers/local/camel-local-summary.c:527
 #, 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:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "ØÛÚÛØ ÙÛÛØÛØ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "maildir ÙÙØÙÛÚÙØØ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ØÛÚÛØ %s ÙÙ ÙÙØÙÛÚ %s ØÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ØÛÚÛØÙÙ ÙÙØØÙ ÙÙØÙÛÚÙØ ÙÛØÙÛØÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s: ÙÙØÙÛÚ ØØØÙØØ ÚÛÙÙØ ØÙÙØØ ØÙÙÙØÙØÛ"
+#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+msgstr ""
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:722
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÙÙØÙÛÚ %s ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:384
-#: ../camel/providers/local/camel-mbox-store.c:398
+#: ../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-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ÙÙØÙÛÚ ÙÛØØÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:350
-#: ../camel/providers/local/camel-mh-store.c:502
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:360
-#: ../camel/providers/local/camel-mh-store.c:511
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÙØÙÛÚ ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: maildir ÙÛÙØÛØÙØÙØÙ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:649
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "maildir ÙÛÙØÛØÙØÙØÙ ØÛÙÛØ"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../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
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÙØÛØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:713
+#: ../camel/providers/local/camel-maildir-store.c:773
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s :ÙÙØÙÛÚ ØØØÙØØ ÚÛÙÙØ ØÙÙØØ ØÙÙÙØÙØÛ"
+msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ: %s :ÙÙØÙÛÚ ØØØÙØØ ÚÛÙÙØ ØÙÙØØ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:436
-#: ../camel/providers/local/camel-maildir-summary.c:566
+#: ../camel/providers/local/camel-maildir-summary.c:413
+#: ../camel/providers/local/camel-maildir-summary.c:546
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ÙÛÙØÛØÙØÙØÙÙÙÚ ÙÙÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:557
+#: ../camel/providers/local/camel-maildir-summary.c:537
 msgid "Checking folder consistency"
 msgstr "ÙÙØÙÛÚÙÙÚ ØÙØØÛÙÙÙÙÙÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:650
+#: ../camel/providers/local/camel-maildir-summary.c:630
 msgid "Checking for new messages"
 msgstr "ÙÛÚÙ ØÛÚÛØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:743
-#: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../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
 msgid "Storing folder"
 msgstr "ÙÙØÙÛÚÙØ ØØÙÙØÛØØÙØÛ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ÚÛØØÙØÙÚÛ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÙÙØÙÛÚ ØÛØÙÙÚÛ ÙÛÙØÛØÚÙÙÙ ØÙÙÙÙØÛØÛÙ ØÛØÙØÙØÛ ØÛØÛÙÛÙØÛ."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ØÛÚÛÙ ÙÙØÙÛÚÙÙÚ ÙÛÙÛÙÙÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:372
-#: ../camel/providers/local/camel-mbox-store.c:542
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ØÛ ØØØÙÙ ØÙØÙÙØÙÙ ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:409
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:558
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÙÙØÙÛÚ ÙÛØØÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:576
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "ÙÙØÙÛÚ ØØÙÙÙÙØÚØÙ ÙÛÛØÛØ"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
-#: ../camel/providers/local/camel-mbox-store.c:632
-#: ../camel/providers/local/camel-mbox-store.c:661
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
-msgstr ""
-"ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:\n"
+msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØÛÚÛØÛÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:642
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ÙÛÙØÙØÙÙ ÚÛØØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÙÙØÙÛÚ '%s' ÙÛØÛÙ ØÛÙÛØ. ØÛÚÛØÛÙÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-store.c:678
-#: ../camel/providers/local/camel-mbox-store.c:693
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÙÙØÙÛÚÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ÚÛØØÙØÙ Â%s ÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:775
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÙÛÚÙ ÙÙØÙÛÚ ØØØÙ ØÙØØØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mbox-store.c:791
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ Â%s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:874
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Â%s ÙÙÚ ØØØÙÙÙ %s ØØ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:478
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÚØÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:539
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÙÙØÙÛÚ %2$s ÙÙÚ %1$s ØÛØØØÙÙØØ ØÛØÙØ ØÛÚÙÙÙ ÙÙÙÙØ ØØØØÙÙÙÙ ÙÛØ ØÛØØÙ."
 
-#: ../camel/providers/local/camel-mbox-summary.c:628
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØÛÙØÛØÚÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:802
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÚÛØØÛØÙÙ ØØÚØÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:969
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:918
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÙÛÙØÛ ÙÙØÙÛÚÙ %s ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:755
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÛØÙÙØÙÙÙ ÙÙØÙÛÚ ÙÙ ÙØÙÙÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:867
-#: ../camel/providers/local/camel-mbox-summary.c:1134
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÙÙØÙÛÚÙÙ ØØÙÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:906
-#: ../camel/providers/local/camel-mbox-summary.c:1165
+#: ../camel/providers/local/camel-mbox-summary.c:855
+#: ../camel/providers/local/camel-mbox-summary.c:1115
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
-msgstr ""
-"MBOX ÚÛØØÙØÙ ØÛØÛÙÛÙØÛØ ØÛØÙØÙÚ.(From ØÛÚÛÙ ÙÛØ ØÙÙÛØÙ ÙÛØÛÙ ØÙØÙØ ØÙØØÙ ÙÙÙ "
-"ØÙÙÛÙ.)"
+msgstr "MBOX ÚÛØØÙØÙ ØÛØÛÙÛÙØÛØ ØÛØÙØÙÚ.(From ØÛÚÛÙ ÙÛØ ØÙÙÛØÙ ÙÛØÛÙ ØÙØÙØ ØÙØØÙ ÙÙÙ ØÙÙÛÙ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:915
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:864
+#: ../camel/providers/local/camel-mbox-summary.c:1124
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÙÛØÛÙØØØÙÙØØÙ ØÙÙØÙÙÛØ ÙÙØÙÙÚÛ ÙÛØÙÛÙ ØÙÙÛÙ ÙÛÙØÛØÙØÛ ÙØØÙØØÙÙØÙ."
 
-#: ../camel/providers/local/camel-mbox-summary.c:1080
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1244
-#: ../camel/providers/local/camel-mbox-summary.c:1274
+#: ../camel/providers/local/camel-mbox-summary.c:1182
+#: ../camel/providers/local/camel-mbox-summary.c:1212
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
+#: ../camel/providers/local/camel-mbox-summary.c:1201
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÛØÙÙØÙÙÙ mailbox ÙØ ÙÛØÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "mh ÙÙØÙÛÚÙØØ ØÛÚÛØ ÙÙØÙÙÙÙ ØÙÙÙÙØÙ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:539
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØÛØÙØÛ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:224
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ÙÛÙØÛØÙØÙØÙÙÙÚ ÙÙÙÙÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:347
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "Spool '%s' ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "Spool '%s' ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
+
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool ØÛØÙ ÚÛØØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool ÙÙØÙÛÚÙ ØÛØÙØÙ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:423
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr ""
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÙÙØÙÛÚ '%s/%s' ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:405
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
-msgstr ""
-"ÙÙØÙÛÚ Â%s ÙÙ ØØÚØÙÙÙØÙ:\n"
+msgstr "ÙÙØÙÛÚ Â%s ÙÙ ØØÚØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:411
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÙÙØÙÛÚ '%s' ÙÛÛØÛØ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:418
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
-msgstr ""
-"ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:\n"
+msgstr "ÙÙØÙÛÚ Â%s ÙÙ ÙÛØØÙÙÙØÙ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:430
+#: ../camel/providers/local/camel-spool-store.c:520
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ØÛØ ØØÙØÛÙÙ(mailbox) ÚÛØØÙØÙ ØÛÙÛØ."
 
-#: ../camel/providers/local/camel-spool-store.c:478
+#: ../camel/providers/local/camel-spool-store.c:584
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "INBOX ÙØ ØØÙÙØØÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ÙÙØÙÛÚÙÙÙ ØÛÚÛØÚÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:618
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ÙÙØÙÛÚÙÙÙÚ ØØØÙÙÙ ØÛØÚÛØØÙÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/local/camel-spool-store.c:580
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "Spool '%s' ÙÙ ØØÚÙÙÙÙ ØÙÙÙÙØÙ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:596
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "Spool '%s' ØÛÙÚÛÙÙÙÙ ÚÛØØÛØ ÙØÙÙ ÙÛÙØÛØÙØÛ ØÛÙÛØ"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÛØÙÙØÙÙÙ ÙÙØÙÛÚ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "spool ÙÙØÙÛÚÙ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
-msgstr ""
-"spool ÙÙØÙÛÚÙ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s\n"
+msgstr "spool ÙÙØÙÛÚÙ %s ÙÙ ÙÛØÛÙØØØÙÙØÙÙÙ ØÙÙÙÙØÙ: %s\n"
 "ÙÙØÙÛÚ ØÛØÛÙØØÙØÛÙ ÙÙÙÙØÛØ ØÛ Â%s ØØ ØØÙÙØÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:286
+#: ../camel/providers/nntp/camel-nntp-folder.c:375
+#: ../camel/providers/nntp/camel-nntp-folder.c:497
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ØÙÚÙÙ ØØØØÙÙÙ: UID ÙÙÚ ÙÙØÙØØÙ ØÙÙØÛÛØØÙØ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:692
+#: ../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
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ØÛÚÛØØØ ØÛØÙØÛÙÙÙØÙ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:438
+#: ../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
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ØÛÚÛØ %s ÙÙ ØØÙØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../camel/providers/nntp/camel-nntp-folder.c:581
+#: ../camel/providers/nntp/camel-nntp-folder.c:587
+#: ../camel/providers/nntp/camel-nntp-folder.c:634
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÙÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
 msgid "Posting failed: "
 msgstr "ÙÙÙÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:658
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ØÙØØÙØ ÚØÙÛØØÛ NNTP ØÛÚÛØÙÙÙ ØÛÛÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:678
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ÙÙØÙÛÚÙØÙÙ ØÛÚÛØÙØØÙÙ ÙÛÚÛØÚÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ÙÙØÙÛÚÙØØÙÙ ÙÙØÙØØØÙÙ ÙÛØØÛØ(_S)(comp.os.linux ÙÙ c.o.linux ØÛÙÙÙØÛ )"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "ÙÛØØÛØÙ ØÛØÙÛØÙÛØÙØÛ ÙÛÙØØÙÛÛØÙÙÙ ÙÙØÙÛÚ ØØØÙÙØÙÙÙ ÙÛØØÛØ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
 msgstr "ÙÛÚÛÙØÙÙÙ NNTP ØÛØÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
 msgstr "SSL ØÛØØÙØÙÙÙ NNTP"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "USENET ØÛÛÛØÙÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr ""
-"ØÛ USENET ØÛÛÛØ ÚÛØÛÙÙÙØÙØÙÙ ØÙÙÛØ ÛÛ ØÛÙÙÚ ØÛÛÛØÙØ ØÙÙØÙØØØÙÙÙ ØÛÙÙÙÙÛÙØÛ."
+msgstr "ØÛ USENET ØÛÛÛØ ÚÛØÛÙÙÙØÙØÙÙ ØÙÙÛØ ÛÛ ØÛÙÙÚ ØÛÛÛØÙØ ØÙÙØÙØØØÙÙÙ ØÛÙÙÙÙÛÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ NNTP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙ "
-"ØÙØÙÙØÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÙØÛ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÛÙ ÙÙÙÙÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ÙÛÙØØÙÙÛØÙØÙÙÚ ØØÙØÚÙÙÙØÙÙÙ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ: %s"
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ NNTP ÙÛÙØØÙÙÛØÙØÙ ØÙÙÛÙ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙ ØÙØÙÙØÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:357
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ØÙÙ ÙÛÙÚÛÙ ØØÙØÙÙÙ ØÙÙÛØÙÙÙ ØÙÙÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØØØØÙÙÙ ÙÙØÙ %d ÙØÙØÙÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ØØØÙÙÙÙÙ ÙÛÙÚÛÙ USENET ØÛÛÛØÙÙØÙ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1053
+#: ../camel/providers/nntp/camel-nntp-store.c:1072
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
-msgstr ""
-"ØÛÛÛØ ÚÛØÛÙÙÙØÙÙÙ ØÙÙÛØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ:\n"
+msgstr "ØÛÛÛØ ÚÛØÛÙÙÙØÙÙÙ ØÙÙÛØØØ ØØØØÙÙÙ ÙÛØÛÙØÙ:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#: ../camel/providers/nntp/camel-nntp-store.c:1165
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "News store ÙÙÚ ØÙÚÙÚÛ ÙÛÚÙ ÙÙØÙÛÚ ÙÛØØÙÙØÙØÙØ: ÙÛØØÛØÙ ØÙÙÛÚ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#: ../camel/providers/nntp/camel-nntp-store.c:1181
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚ ØØØÙÙÙ ØÛØÚÛØØÛÙÙÛÙØÙØ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#: ../camel/providers/nntp/camel-nntp-store.c:1204
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚÙÙ ÚÙÙÙØÙÛÛØÛÙÙÛÙØÙØ. ÙÛØØÛØÙ ØÙÙÙÙØÙÚÙØÙØ "
-"ØÙÙÙØÛ."
+msgstr "News store ÙÙÚ ØÙÚÙØÙÙÙ ÙÙØÙÛÚÙÙ ÚÙÙÙØÙÛÛØÛÙÙÛÙØÙØ. ÙÛØØÛØÙ ØÙÙÙÙØÙÚÙØÙØ ØÙÙÙØÛ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1329
+#: ../camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
-msgstr ""
-"ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ ØÙÙÙØÙØÛ:\n"
+msgstr "ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ ØÙÙÙØÙØÛ:\n"
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÙÙ. ØØÙÙØÙØÙÙÙ ØÛÙÙÙÙ ØØØØ ÙÙØÙÛÚ ØÙÙÛØÙ ÙÛÙÙÙÙ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1380
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
-msgstr ""
-"ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ ØÙÙÙØÙØÛ:\n"
+msgstr "ØÛ ØÛÛÛØ ÚÛØÛÙÙÙØÙØØ ÙÛØØÛØÙ ØÙÙØÙÙÙ ØÙÙÙØÙØÛ:\n"
 "\n"
 "ØÛÙØØÙ ØÛÛÛØ ÚÛØÛÙÙÙØÙ ÙÛÛØÛØ ØÛÙÛØ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1573
+#: ../camel/providers/nntp/camel-nntp-store.c:1647
 msgid "NNTP Command failed: "
 msgstr "NNTP ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1732
 #, c-format
 msgid "Not connected."
 msgstr "ØØØÙØÙÙÙØØÙ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:235
-#: ../camel/providers/nntp/camel-nntp-summary.c:353
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÙÛÚÙ ØÛÚÛØÙÙ ØÛÙØÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:251
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ØÙÙ  ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÙÛÙØØÙÙÛØÙØÙ ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ØÙÙ  ØÙÙÙØÙÙÛ ØØÙÙÙØØÙ ÙÛÙØØÙÙÛØÙØÙ ØØÛØØÙ ÙÛÙØÙ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÙÛØØÛÙØØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:283
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:519
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÙÙÙÙÙÙÙ %s ØÙÙØØÙ ØÛÚÛØ ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:350
+#: ../camel/providers/pop3/camel-pop3-folder.c:535
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ØÛÚÛØÙ %d ÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:430
+#: ../camel/providers/pop3/camel-pop3-folder.c:614
 msgid "Unknown reason"
 msgstr "ÙØÙÛÙÛÙ ØÛÛÛØ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:470
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
 msgid "Retrieving POP summary"
 msgstr "POP ÙÙÚ ÙÙØÙÙÚÛ ÙÛØÙÛÙÙÙÙ ØÙÙÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:485
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
 msgid "Cannot get POP summary: "
 msgstr "POP ÙÙÚ ØÛØÛÙØÙØÙÚÛ ØÛØÙØÛÙÙÙØÙ: %s "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:825
 msgid "Expunging old messages"
 msgstr "ÙÙÙØ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:567
+#: ../camel/providers/pop3/camel-pop3-folder.c:845
 msgid "Expunging deleted messages"
 msgstr "ØÛÚÛØÛÙÚÛÙ ØÛÚÛØÙØØÙÙ ØÛÚÛØÛÛØØÙØÛ"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#, fuzzy
 #| msgid "Message storage"
 msgid "Message Storage"
 msgstr "ØÛÚÛØ ØØÙÙÙØÛÚ"
@@ -4175,8 +4279,7 @@ msgstr "%s ÙÛÙØÙÙ ÙÛÙÙÙ ØÛÚÛØ(_D)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Delete _expunged from local Inbox"
-msgstr ""
-"ÙÛØÙÙÙ ÙÙØÛÙÙØØ ØØÙØÛÙÙØÙÙ ÙÙØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙØØÙ ØÛØÙÙ ØÛÚÛØ(_E)"
+msgstr "ÙÛØÙÙÙ ÙÙØÛÙÙØØ ØØÙØÛÙÙØÙÙ ÙÙØØÙØÙÙÙ ÙÛÙØØÙÙÛØÙØØØ ØØØÙÙÙØØÙ ØÛØÙÙ ØÛÚÛØ(_E)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
@@ -4198,146 +4301,105 @@ msgstr "POP"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ØØØÙÙÙÙÙ ØÛØÙÛØÙÙ POP ÙÛÙØØÙÙÛØÙØÙØÙÙ ÚÛØÛØÛØ ØÛÚÛÙ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ "
-"ØØØÙÙÙÙØÛ. ØÛ ÙÛØØÛÙÙÙØØÙ POP ÙÛÙØØÙÙÛØÙØÙÙØÙØØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØØÙÙ ØÙØ "
-"ØØÙÙØÙÙØ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØØ ØØØÛØØÙÙÙ ØÛÙÙØØ ØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ. ØÛ ÙÛØØÛÙÙÙØØÙ POP ÙÛÙØØÙÙÛØÙØÙÙØÙØØ ØÛÙÙÙÙÛÙÚÛÙ ØÙØØÙÙ ØÙØ ØØÙÙØÙÙØ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
-msgstr ""
-"ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØØ ØÙÙÙØÙØÙØØÙ ØÙÙ ØÙÙÛÙ  APOP "
-"ÙÛÙÙØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ. ØÛÙÙ ÙÙÙÙÙÙØÙØÙØØÙ ÙÛÙØØÙÙÛØÙØÙØØØÙÙÙ "
-"ØÙØÙÛØÙÛÚÙÙÛØ ØÙØÙÙØÛÙÙÛØÙÙÙÙ ÙÛÙÙÙÙ."
+msgstr "ØÛ ØØÙÙØÙÙØ ØÙØÙÙØÙÙØÛ POP ÙÛÙØØÙÙÛØÙØØØ ØÙÙÙØÙØÙØØÙ ØÙÙ ØÙÙÛÙ  APOP ÙÛÙÙØÙÙÙÙÙ ØÙØÙÙØÙÙ ØØØÙÙÙÙØÛ. ØÛÙÙ ÙÙÙÙÙÙØÙØÙØØÙ ÙÛÙØØÙÙÛØÙØÙØØØÙÙÙ ØÙØÙÛØÙÛÚÙÙÛØ ØÙØÙÙØÛÙÙÛØÙÙÙÙ ÙÛÙÙÙÙ."
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:136
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØÙÙ ØÙÙØÛÛØÙÙÙ ØØÙØÙÙÙ ØÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 #, 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:151
+#: ../camel/providers/pop3/camel-pop3-store.c:154
 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:169
-#, c-format
-msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØ (mode%s) ØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#, c-format
-msgid "Failed to connect to POP server %s in secure mode: "
-msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
-
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "ØÛ ÙØØØÙÙÙØØ TLS ÙÙÙ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙÙÙØÙÙÙØÙ: ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ "
-"ÙÛØØÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ."
+msgstr "ÙÛÙØØÙÙÛØÙØ STLS ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#, 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
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "SASL '%s' ØÙØÙÙØÙÙ POP ÙÛÙØØÙÙÛØÙØ %s%s ØØ ÙÙØÛÙÙÙØÙ"
+msgid "Failed to connect to POP server %s in secure mode: "
+msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:288
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙØØ ÙÙØÚÙÙÙ ØÙÙÙÙØÙ%s: SASL ÙÛÙÙØÙÙÙ ØØØØ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:310
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:359
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 ÙÛÙØØÙÙÛØÙØÙ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s ÙÙÚ %s ØÙÙÙ POP3 ÙÛÙØØÙÙÛØÙØÙ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:525
 #, 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 ÙÙÙÙÙÙÙÙÙ "
-"ØØÙØÛØÛÛØÙØÙ. ÙÙÙØØÙØÙØØÙ ÚÛØÛÙ ØÛÙ ÙØØØØÙØ ØÙÙÙØÛ. ØØØÙÛØØÛÚÙ ØÙÙÛÙ ØØÙØÙÛ "
-"ÙÙÙÙÚ."
+msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ. ØÙÙØÛÛØØÙØ APOP ÙÙÙÙÙÙÙÙÙ ØØÙØÛØÛÛØÙØÙ. ÙÙÙØØÙØÙØØÙ ÚÛØÛÙ ØÛÙ ÙØØØØÙØ ØÙÙÙØÛ. ØØØÙÛØØÛÚÙ ØÙÙÛÙ ØØÙØÙÛ ÙÙÙÙÚ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:427
+#: ../camel/providers/pop3/camel-pop3-store.c:577
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
-msgstr ""
-"POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
+msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
 "ØÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:592
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
-msgstr ""
-"POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
+msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
 "ØÙØÙÛØÙÛÚÙ ØØØÙ %s ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
-"ØÙÙ %s ÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "POP3 server %s"
-msgstr "POP3 ÙÛÙØØÙÙÛØÙØÙ %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "%s ÙÙÚ %s ØÙÙÙ POP3 ÙÛÙØØÙÙÛØÙØÙ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:650
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙÙÙØÙÙÙØÙ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:678
 #, c-format
 msgid "No such folder '%s'."
 msgstr "`%s' ØÛÙØØÙ ÙÙØÙÛÚ ÙÙÙ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:695
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ØØÙÙÙØÛÚÙØØ ÙÙØÙÛÚ ÙÛØÛÙÙÙØÙ ÙÙÙ"
@@ -4350,9 +4412,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"ØÛØÙÛØÙÙ Âsendmail ÙØÙÚØØÙÙÙØÙØØ ÙÛØÙÛØÛØ ØØØÙÙÙÙØ ÙÛØÙÙÙ ØÙØØÛÙÙØØ ØÛØÙÛØÙÙ "
-"ÙÛØÙÛØÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
+msgstr "ØÛØÙÛØÙÙ Âsendmail ÙØÙÚØØÙÙÙØÙØØ ÙÛØÙÛØÛØ ØØØÙÙÙÙØ ÙÛØÙÙÙ ØÙØØÛÙÙØØ ØÛØÙÛØÙÙ ÙÛØÙÛØÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:49
 msgid "sendmail"
@@ -4377,26 +4437,24 @@ msgstr "sendmail ØØ pipe ÙÛØØÙÙÙØÙ: %s: ØÛØ ØÛÛÛØÙÙÙÙØÙ
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ÙÙ ØØÚÙÙÙÙØÙÙÙØÙ: %s: ØÛØ ØÛÛÛØÙÙÙÙØÙ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙÙØÙÙÙØÙ: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-"sendmail ÙØÙÚØØÙÙÙØÙ %s ØÛÚÛÙ ØÙÚÙØÙ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
+msgstr "sendmail ÙØÙÚØØÙÙÙØÙ %s ØÛÚÛÙ ØÙÚÙØÙ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ÙÙ ØÙØØØ ÙÙÙØÙÙÙØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-"sendmail ÙØÙÚØØÙÙÙØÙ %d ØÛÚÛÙ ÚØÙÛØ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
+msgstr "sendmail ÙØÙÚØØÙÙÙØÙ %d ØÛÚÛÙ ÚØÙÛØ ØÙÙÛÙ ØØØÙØÙÙØÙÙ ÙÛØØÙ: ØÛØ ØÛÛÛØÙÙÙÙØÙ."
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
@@ -4416,240 +4474,225 @@ msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-"SMTP ÙÙ ØÙØÙÙØÙÙØ ÙÙØØÙØÙÙÙ mailhub ØØ ØØØÙÙÙÙÙØ ØÛØÙÛØÙÙ ÙÛØÙÛØÛØ ØÛÚÛÙ "
-"ØÙØÙÙØÙÙÙØÛ."
+msgstr "SMTP ÙÙ ØÙØÙÙØÙÙØ ÙÙØØÙØÙÙÙ mailhub ØØ ØØØÙÙÙÙÙØ ØÛØÙÛØÙÙ ÙÛØÙÛØÛØ ØÛÚÛÙ ØÙØÙÙØÙÙÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ÙÛØÚØØØ ØÛÚÛÙ ØØÛØØ ØØØØ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØÙØÛØÛØ ÚØÙÛØØÛ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:280
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ÙÛÙØØÙÙÛØÙØÙ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ØÛØÙÙØÙÙÙ %s ØØØÙÙÙÙ ÙÛØÙÛØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
+#| msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
 msgstr ""
-"SMTP ÙÛÙØØÙÙÛØÙØÙ %s ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÙÙÙ %s ÙÙ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:437
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
+msgid "No SASL mechanism was specified"
 msgstr ""
-"SMTP ÙÛÙØØÙÙÛØÙØÙØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ.\n"
-"%s\n"
-"\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#: ../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
+msgid "AUTH command failed: "
+msgstr "AUTH ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙØØÙÙÛØÙÛ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:561
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØÛÛÛØÙÛÚÙÙÙÚ ØØØØÛØÙ ØÙÙØÛÛØØÙØ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:565
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "ØÛÚÛØ ÙÙÙÙØÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:590
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ØØÙØÛØÛÙ ØØÙØÛÚÙ ÙÙÙ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:603
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ØÛÚÛØÙÙ ÙÙÙÙÙØÙÙÙ ØÙÙÙÙØÙ: ÙÛÙ ØÛÚÛÙØÛ ØÙØ ØØÙØÛØÛÛØÙØÛÚÙ ØÙÙØÛÛØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "ÚØØÙÙØØÙÙÙÙÙÙ ØØØØÙÙÙØ ØÛÙØÛÙ ÙØØÙÙÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "ÙØØØÙÛØÙØØØ ÙØÙÙ ØØÙÙØÙÙÙØØ ÚØØÙÙØØÙÙØ ØØØØÙÙÙÙ ØØØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:710
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "ØÛÙØÛÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "ØÛÙØÛÙ ÙØØØÙÛØÙØÙÙÙ ØÛØÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "ØÙØØÛÙØ ÚØÙÙØÙ ÙØÙÙ ØÙØØÛÙØ ÙØØØÙÙÙÙÙÚ ØØÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "ÙØØØÛÙ ØÛÚÛØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "ÙÛÙØØÙÙÛØ ØÛÙÙØØ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØ ÙÙÙÙØØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:722
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "ÙÛÙØØÙÙÛØÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛØ ÙÛØÙÛØÛØ ÙØÙÙÙÙÙÙ ÙÛÙÙÛØØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ÙÙØÙØÙ ØØÙØÙÙØÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØ: <forward-path> ØØ ÙÙÙÙÙÙÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
-"ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØÛØ ÙÛØØÛÙØØÙ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-"ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
+msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
-msgstr ""
-"ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÙØØÛØÛÙ ÙÙÙÙØ ØÛØÙØÙÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÙØØÛØÛÙ ÙÙÙÙØ ØÛØÙØÙÙØØ ØØØØÙÙÙ ÙÛØÛÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "ØÙØÙÛØÙÛÚÙ ÙÛØÙÙÙ ØÛÙÛØØ <forward-path> ÙÙ ØÙÙØÙ ÙÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:736
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÙØØÛÙØ ØØÙÙÙØÛÚÙØÙ ÙÛØÙØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:738
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÛÙØÙÙÙÛÙÚÛÙ ØØÙÙØØ ØØØÙØÙØÙØÙÙ ØÛØÙÙ "
-"ÙÛØØÙ"
+msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØÙØØÙØÙÙØÙ: ØÛÙØÙÙÙÛÙÚÛÙ ØØÙÙØØ ØØØÙØÙØÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
-"ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙ ØØØÙØØ ØÛØØÛØ ÙÙÙÙÙÙØÙØÛ"
+msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ÙÛØØÛÙØØ ØØÙØÙÙØÙÙÙØÙ: ØÛØ ØØÙØÛÙÙ ØØØÙØØ ØÛØØÛØ ÙÙÙÙÙÙØÙØÛ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ØÛØ ÙÙØÚÛØÛØÙÙ ØØØÙØÚ. ØØØÙØÙØØØÛØÛØ ØÛÚÛÙ <CRLF>.<CRLF> ÙÙ ÙÙØÚÛØÛÚ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:744
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "ØÙØØÛØÛÙ ÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:748
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "ØÙÙ ØÛØÚÛØØÙØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÙ ØØØÙØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛØØÙÙØÙÙ ØÛÚÛÙ ØÙÙÙØÙØØ ØÛØÛØ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "ÛØÙÙØÙÙÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØØØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1004
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "SMTP ØØÙÙÙÙ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1031
-#: ../camel/providers/smtp/camel-smtp-transport.c:1048
-#: ../camel/providers/smtp/camel-smtp-transport.c:1056
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "HELO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1125
-msgid "SMTP Authentication"
-msgstr "SMTP ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙØÙ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1144
-#: ../camel/providers/smtp/camel-smtp-transport.c:1155
-#: ../camel/providers/smtp/camel-smtp-transport.c:1168
-msgid "AUTH command failed: "
-msgstr "AUTH ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1299
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1326
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
-#: ../camel/providers/smtp/camel-smtp-transport.c:1351
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
-#: ../camel/providers/smtp/camel-smtp-transport.c:1403
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
-#: ../camel/providers/smtp/camel-smtp-transport.c:1491
-#: ../camel/providers/smtp/camel-smtp-transport.c:1504
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../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
 msgid "DATA command failed: "
 msgstr "DATA ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 msgid "RSET command failed: "
 msgstr "RSET ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1584
-#: ../camel/providers/smtp/camel-smtp-transport.c:1598
-#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "QUIT command failed: "
 msgstr "QUIT ØÛÙØÛÙÙ ÙÛØÙÛÙ ØÙÙØÙ "
 
@@ -4765,261 +4808,290 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ØØÙÙØÛØØÙØÛ"
 
-#: ../libedataserver/e-client.c:109
-msgctxt "ClientError"
-msgid "Invalid argument"
-msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
-
-#: ../libedataserver/e-client.c:111
-msgctxt "ClientError"
-msgid "Backend is busy"
-msgstr "Backend ØØÙØÙØØØ"
-
-#: ../libedataserver/e-client.c:113
-msgctxt "ClientError"
+#: ../libedataserver/e-client.c:122
+#| msgctxt "ClientError"
+#| msgid "Source not loaded"
 msgid "Source not loaded"
 msgstr "ÙÛÙØÛ ØÙÙÛÙÙÙØØÙ"
 
-#: ../libedataserver/e-client.c:115
-msgctxt "ClientError"
+#: ../libedataserver/e-client.c:124
+#| msgctxt "ClientError"
+#| msgid "Source already loaded"
 msgid "Source already loaded"
-msgstr "ÙÛÙØÛ ØØÙÙÙÙØÚØÙ ØÙÙÛÙØØÙ"
-
-#: ../libedataserver/e-client.c:117
-msgctxt "ClientError"
-msgid "Authentication failed"
-msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
-
-#: ../libedataserver/e-client.c:119
-msgctxt "ClientError"
-msgid "Authentication required"
-msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
-
-#: ../libedataserver/e-client.c:121
-msgctxt "ClientError"
-msgid "Repository offline"
-msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
+msgstr "ÙÛÙØÛ ØÙÙÛÙØØÙ"
 
-#: ../libedataserver/e-client.c:123
-msgctxt "ClientError"
+#: ../libedataserver/e-client.c:132
+#| msgctxt "ClientError"
+#| msgid "Offline unavailable"
 msgid "Offline unavailable"
-msgstr "ØÙØØÙØ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
-
-#: ../libedataserver/e-client.c:125
-msgctxt "ClientError"
-msgid "Permission denied"
-msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
-
-#: ../libedataserver/e-client.c:127
-msgctxt "ClientError"
-msgid "Cancelled"
-msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
-
-#: ../libedataserver/e-client.c:129
-msgctxt "ClientError"
-msgid "Could not cancel"
-msgstr "ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
-
-#: ../libedataserver/e-client.c:131
-msgctxt "ClientError"
-msgid "Not supported"
-msgstr "ÙÙÙÙÙÙØÙØÛ"
-
-#: ../libedataserver/e-client.c:133
-msgctxt "ClientError"
-msgid "Unsupported authentication method"
-msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
-
-#: ../libedataserver/e-client.c:135
-msgctxt "ClientError"
-msgid "TLS not available"
-msgstr "TLS ÙÙÙ"
-
-#: ../libedataserver/e-client.c:137
-msgctxt "ClientError"
-msgid "Search size limit exceeded"
-msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
-
-#: ../libedataserver/e-client.c:139
-msgctxt "ClientError"
-msgid "Search time limit exceeded"
-msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
-
-#: ../libedataserver/e-client.c:141
-msgctxt "ClientError"
-msgid "Invalid query"
-msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
-
-#: ../libedataserver/e-client.c:143
-msgctxt "ClientError"
-msgid "Query refused"
-msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
+msgstr "ØÙØØØ ÙÙÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ"
 
-#: ../libedataserver/e-client.c:145
-msgctxt "ClientError"
+#: ../libedataserver/e-client.c:154
+#| msgctxt "ClientError"
+#| msgid "D-Bus error"
 msgid "D-Bus error"
 msgstr "D-Bus ØØØØÙÙÙÙ"
 
-#: ../libedataserver/e-client.c:147
-msgctxt "ClientError"
-msgid "Other error"
-msgstr "ØØØÙØ ØØØØÙÙÙ"
-
-#: ../libedataserver/e-client.c:149
-msgctxt "ClientError"
-msgid "Backend is not opened yet"
-msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
-
-#: ../libedataserver/e-client.c:152
-msgctxt "ClientError"
-msgid "Unknown error"
-msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
-
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1634 ../libedataserver/e-time-utils.c:1930
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1639 ../libedataserver/e-time-utils.c:1921
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * 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:1644 ../libedataserver/e-time-utils.c:1926
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * 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:1649 ../libedataserver/e-time-utils.c:1917
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
 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:1654
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
 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:1659
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
 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:1662 ../libedataserver/e-time-utils.c:1782
-#: ../libedataserver/e-time-utils.c:1912
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
 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:1669
+#: ../libedataserver/e-time-utils.c:1681
 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:1673
+#: ../libedataserver/e-time-utils.c:1685
 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:1678
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
 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:1683
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
 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:1688
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
 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:1693
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
 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:1696 ../libedataserver/e-time-utils.c:1785
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
 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:1854 ../libedataserver/e-time-utils.c:1974
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 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:1858 ../libedataserver/e-time-utils.c:1966
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1863 ../libedataserver/e-time-utils.c:1971
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 msgid "%I:%M %p"
 msgstr "%-I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1867 ../libedataserver/e-time-utils.c:1963
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
 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:1870
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1874
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:94
-#: ../libedataserverui/e-book-auth-util.c:651
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+"means manual proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+#| msgid "Bad authentication response from server."
+msgid "Whether authentication is required to access proxy server."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+#| msgid "Cannot authenticate user: "
+msgid "Proxy authentication user name"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+#| msgid ""
+#| "Unable to authenticate to IMAP server.\n"
+#| "%s\n"
+#| "\n"
+msgid "User name to use to authenticate against proxy server."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+#| msgid "Temporary authentication failure"
+msgid "Proxy authentication password"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+#| msgid "Cannot authenticate to server: %s"
+msgid "Password to use to authenticate against proxy server."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr ""
+
+#: ../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 ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr ""
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr "ØØÙØÙÙØØÙÙ ÛØÙØÙÛØÚÙ ÙÛÙØØÙÙÛØÙØ ØÛÙÙÙÙÙØÙÙÙÚ URL Ù"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Where to read automatic proxy configuration from."
+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:191
-#: ../libedataserverui/e-book-auth-util.c:412
+#: ../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:221
+#: ../libedataserverui/e-categories-editor.c:224
 msgid "Currently _used categories:"
-msgstr "ÚØØÙØ ØÙØÙÙØÙÙÙÛØØÙØÙ ÙØØÛÚÙØÙÙÙÙÛØ(_U):"
+msgstr "ÚØØÙØ ØÙØÙÙØÙÙÙÛØØÙØÙ ÙØØÛÚÙØÙÙÛÙÛØ(_U):"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:233
 msgid "_Available Categories:"
-msgstr "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØØÙ ÙØØÛÚÙØÙÙÙÙÛØ(_A):"
+msgstr "ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØØÙ ÙØØÛÚÙØÙÙÛÙÛØ(_A):"
 
 #: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
@@ -5061,20 +5133,62 @@ msgid ""
 "name"
 msgstr "ØÛÙÙÙÙÙØÛ Â%s ØÛÚÛÙ ÙØØÛÚÙØÙÙÛ ØØØ ØÙÙÛÙ. ØØØÙØ ØØØ ØÙØÙÙØÙÚ."
 
-#: ../libedataserverui/e-client-utils.c:793
+#: ../libedataserverui/e-client-utils.c:856
 #, c-format
+#| msgid ""
+#| "Enter password for %s (user %s)\n"
+#| "Reason: %s"
 msgid ""
-"Enter password for %s (user %s)\n"
+"Enter password for calendar %s (user %s)\n"
 "Reason: %s"
-msgstr ""
-"%s (ØÙØÙÛØÙÛÚÙ %s) ÙÙÚ ØÙÙÙÙÙ ÙÙØÚÛØÛÚ\n"
-"ØÛÛÛØÙ: %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:887
+#: ../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:889
+#: ../libedataserverui/e-client-utils.c:983
 msgid "Enter Password"
 msgstr "ØÙÙ ÙÙØÚÛØÛÚ"
 
@@ -5095,7 +5209,7 @@ msgid "_Search:"
 msgstr "ØÙØØÛ(_S):"
 
 #: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1011
+#: ../libedataserverui/e-name-selector-dialog.c:1035
 msgid "Any Category"
 msgstr "ØØÙÙØØÙ ÙØØÛÚÙØÙÙÛ"
 
@@ -5119,76 +5233,74 @@ msgstr "ØØÙØÙÛØØØÙØØ"
 msgid "Select Contacts from Address Book"
 msgstr "ØØØØÛØ ØÛÙØÙØÙØÙÙ ØØÙØÙÛØØØÙØØÙÙ ØØÙÙØØ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:766
+#: ../libedataserverui/e-name-selector-dialog.c:778
 msgid "_Add"
 msgstr "ÙÙØ(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:770
+#: ../libedataserverui/e-name-selector-dialog.c:782
 msgid "_Remove"
 msgstr "ØÛÚÛØ(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:930
+#: ../libedataserverui/e-name-selector-dialog.c:954
 #, 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:2704
+#: ../libedataserverui/e-name-selector-entry.c:2819
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ÙÙ ÙÛØØØ ÙØÙ(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2719
+#: ../libedataserverui/e-name-selector-entry.c:2834
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ÙÙ ÙÛÚÛØ(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2729
+#: ../libedataserverui/e-name-selector-entry.c:2844
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ÙÙ ÙÛØ(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2746
+#: ../libedataserverui/e-name-selector-entry.c:2861
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ÙÙ ØÛÚØÙØÙÛ(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:509
+#: ../libedataserverui/e-name-selector-list.c:520
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ÙÙ ØÛÚÛØ(_D)"
 
 #: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
-msgstr ""
-"ØØÚÙÛÚ ÚØÙÙÙØÙÙÙÚ ØØÚÙÛÚÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ: ØÙØÙÛØÙÛÚÙ ÙØÙÙ ÙÙÙÙÙÛØÛØ "
-"ØØØÙ ÙÙÙ"
+msgstr "ØØÚÙÛÚ ÚØÙÙÙØÙÙÙÚ ØØÚÙÛÚÙÙÙ ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ: ØÙØÙÛØÙÛÚÙ ÙØÙÙ ÙÙÙÙÙÛØÛØ ØØØÙ ÙÙÙ"
 
-#: ../libedataserverui/e-passwords.c:699
-#: ../libedataserverui/e-passwords-win32.c:612
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "ØÙØ Caps Lock ÙÛÙÛÙÙÙÙÙ ØØÚØÙÚÙØ."
 
-#: ../libedataserverui/e-passwords.c:819
-#: ../libedataserverui/e-passwords-win32.c:735
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "ØÛ ØÙÙ ØÙØØØÙØÙÙÙ ØÛØØÛ ØÛØ(_R)"
 
-#: ../libedataserverui/e-passwords.c:820
-#: ../libedataserverui/e-passwords-win32.c:736
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ØÛ ØÛÚÚÙÙÛ ØÛÚÛÙ ØÛ ØÙÙ ØÙØØØÙØÙÙÙ ØÛØØÛ ØÛØ(_R)"
 
-#: ../libedataserverui/e-passwords.c:825
-#: ../libedataserverui/e-passwords-win32.c:741
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "ØÛ ØÙÙÙÙ ØÛØØÛ ØÛØ(_R)"
 
-#: ../libedataserverui/e-passwords.c:826
-#: ../libedataserverui/e-passwords-win32.c:742
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "ØÛ ØÛÚÚÙÙÛ ØÛÚÛÙ ØÛ ØÙÙÙÙ ØÛØØÛ ØÛØ(_R)"
 
@@ -5197,10 +5309,232 @@ msgstr "ØÛ ØÛÚÚÙÙÛ ØÛÚÛÙ ØÛ ØÙÙÙÙ ØÛØØÛ ØÛØ(_R)"
 msgid "Select destination"
 msgstr "ÙÙØØÙÙÙ ØØÙÙØØ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:169
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "ÙÙØØÙ(_D)"
 
+#: ../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 ""
+
+#: ../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 ""
+
+#~ msgctxt "BookClientError"
+#~ msgid "Contact not found"
+#~ msgstr "ØØÙØÙÛØØØ ØÛÙÙÙÙÙØÙ"
+
+#~ msgctxt "BookClientError"
+#~ msgid "Contact ID already exists"
+#~ msgstr "ØØÙØÙÛØØØ ÙÙÙÙÙÙÙ ÙÛÛØÛØ"
+
+#~ msgctxt "BookClientError"
+#~ msgid "No space"
+#~ msgstr "ØÙØÙÛÙ ÙÙÙ"
+
+#~ msgctxt "BookClientError"
+#~ msgid "Unknown error"
+#~ msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
+
+#~ msgid "D-Bus book proxy gone"
+#~ msgstr "D-Bus ÙÙØØØ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
+
+#~ msgid "Cannot start view, D-Bus proxy gone"
+#~ msgstr "ÙÛØÛÙÛØÙÙ ØØØÙÙÙØÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
+
+#~ msgid "Cannot stop view, D-Bus proxy gone"
+#~ msgstr "ÙÛØÛÙÛØÙÙ ØÙØØÙØØÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
+
+#~ msgid "Cannot set fields of interest, D-Bus proxy gone"
+#~ msgstr "ØÛØÛÙ ØÛØ ØÛÙÙÙÙÙÙ ØÛÙÚÙÙÙÚÙÙÙ ØÙÙÙÙØÙØ D-Bus ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "No such calendar"
+#~ msgstr "ØÛÙØØÙ ÙÙÙÙØÙÛ ÙÙÙ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Object not found"
+#~ msgstr "ÙÛÚ ØÛÙÙÙÙÙØÙ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Invalid object"
+#~ msgstr "ØÙÙØÛÛØØÙØ ÙÛÚ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Unknown user"
+#~ msgstr "ÙØÙÛÙÛÙ ØÙØÙÛØÙÛÚÙ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Object ID already exists"
+#~ msgstr "ÙÛÚ ID ØÙ ÙÛÛØÛØ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Invalid range"
+#~ msgstr "ØÙÙØÛÛØØÙØ ØØØÙØÛ"
+
+#~ msgctxt "CalClientError"
+#~ msgid "Unknown error"
+#~ msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
+
+#~ msgid "D-Bus calendar proxy gone"
+#~ msgstr "D-Bus ÙÙÙÙØÙÛ ÛØÙØÙÛØÚÙØÙ ÙÛØÛÙÙÙØÙ"
+
+#~ 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 ÙÙÚ ØÛÙÚÙØÙÙÙ ÚØØÙÙ ÙÙÙØÙÙÙ ØÙÙÙÙØÙ"
+
+#~ msgid "Could not connect to %s: %s"
+#~ msgstr "%s ØÙÙÛÙ ØØØÙÙÙÙØ ÙÛØÙÛÙ ØÙÙØÙ: %s"
+
+#~ msgid "SSL unavailable"
+#~ msgstr "SSL ÙÙÙ(ØÙØÙÛØÙÙÙÙ ØÙÙÙØÙØÛ)"
+
+#~ msgid "URL '%s' needs a user component"
+#~ msgstr "URL '%s' ØÛÚÛÙ ØÙØ ØÙØÙÛØÙÛÚÙ ØÛÙÙÙÙ ØÙÙÛØÙ ÙÛØÛÙ"
+
+#~ msgid "URL '%s' needs a host component"
+#~ msgstr "URL '%s' ØÛÚÛÙ ØØØØØÙÙ ÙØØÙÙØ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
+
+#~ msgid "URL '%s' needs a path component"
+#~ msgstr "URL '%s' ØÛÚÛÙ ÙÙÙ ØÛÙÙÙÙ  ØÙÙÛØ ÙÛØÛÙ"
+
+#~ msgid ""
+#~ "SSL Certificate check for %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept?"
+#~ msgstr ""
+#~ "%s ÙÙÚ SSL ØÙØÙØØÙØÙÙØÙÙÙ ØÛÙØÛØÙØÛ:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "ÙÙØÛÙØÙØÙØØ"
+
+#~ msgid "SSL is not available in this build"
+#~ msgstr "ØÛ ÙØØØÙÙÙØØ SSL ÙÙÙ"
+
+#~ msgid "Error creating SASL authentication object."
+#~ msgstr "SASL ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ÙÛÚÙÙÙ ÙÛØÛØ ÙÛØÙÛÙ ØÙÙØÙ."
+
+#~ msgid "You did not enter a password."
+#~ msgstr "ØÙÙ ÙÙØÚÛØÙÙØÙÚÙØ."
+
+#~ msgid "Use I_dle if the server supports it"
+#~ msgstr "ØÛÚÛØ ÙÛÙØØÙÙÛØÙØ ÙÙÙÙÙØØ I_dle ÙÙ ØÙØÙÛØ"
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛÙÛÙ ÙÙÙÙÙÙÙ ØÙØÙÛØÙÛÚÙ ØØØÙ ØÛÙÙÙÙÛÙÙÙÚÛÙ"
+
+#~ msgid "TLS is not available in this build"
+#~ msgstr "ØÛ ÙØØØÙÙÙØØ TLS ÙÙÙ"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s: No support for requested "
+#~ "authentication mechanism."
+#~ msgstr ""
+#~ "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙÙÙØÙÙÙØÙ: ØÛÙÛÙ ÙÙÙÙÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ "
+#~ "ÙÛØØÙÙØÙÙÙÙ ÙÙÙÙÙÙØÙØÛ."
+
+#~ msgid "SASL '%s' Login failed for POP server %s%s"
+#~ msgstr "SASL '%s' ØÙØÙÙØÙÙ POP ÙÛÙØØÙÙÛØÙØ %s%s ØØ ÙÙØÛÙÙÙØÙ"
+
+#~ msgid ""
+#~ "Unable to connect to POP server %s.\n"
+#~ "Error sending password%s"
+#~ msgstr ""
+#~ "POP ÙÛÙØØÙÙÛØÙØÙ %s ØØ ØØØÙØÙØÙÙÙ ØÙÙÙÙØÙ.\n"
+#~ "ØÙÙ %s ÙÙ ØÛÛÛØÙØØÛ ØØØØÙÙÙ ÙÛØÛÙØÙ"
+
+#~ msgid ""
+#~ "Unable to authenticate to SMTP server.\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SMTP ÙÛÙØØÙÙÛØÙØÙØØ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÙÚÙÙÙ ØÙÙÙÙØÙ.\n"
+#~ "%s\n"
+#~ "\n"
+
+#~ msgctxt "ClientError"
+#~ msgid "Invalid argument"
+#~ msgstr "ØÙÙØÛÛØØÙØ ÙÙÙÙÙØ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Backend is busy"
+#~ msgstr "Backend ØØÙØÙØØØ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Authentication failed"
+#~ msgstr "ØÛÙÙÙÙÛØ ÙÛØÙÛÙ ØÙÙØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Authentication required"
+#~ msgstr "ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛØ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Repository offline"
+#~ msgstr "ØÛØÙÙÛ ØÙØØÙØ ÚØÙÛØØÛ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Permission denied"
+#~ msgstr "ÚÙÙÛÙÙÚÙØ ÙÛØÙÙØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Cancelled"
+#~ msgstr "ØÛÙÛÙØÙÙ ÙØÙØÛØÛÙØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Could not cancel"
+#~ msgstr "ÛØØ ÙÛÚÙÙÙÙ ØÙÙÙÙØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Not supported"
+#~ msgstr "ÙÙÙÙÙÙØÙØÛ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Unsupported authentication method"
+#~ msgstr "ÙÙÙÙÙÙØÙØÙØØÙ ØØÙØÚÙÙÛØ ØÛÙÙÙÙÛØ ØÛØÛÙÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "TLS not available"
+#~ msgstr "TLS ÙÙÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Search size limit exceeded"
+#~ msgstr "ØÙØØÛØ ÚÙÚÙÛÙÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Search time limit exceeded"
+#~ msgstr "ØÙØØÛØ ÛØÙØÙ ÚÛÙØÙÙ ØÛØÙÙ ÙÛØØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Invalid query"
+#~ msgstr "ØÙÙØÛÛØØÙØ ØÛØÛØØÛØÛØ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Query refused"
+#~ msgstr "ØÛØÛØØÛØÛØ ØÛØ ÙÙÙÙÙØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Other error"
+#~ msgstr "ØØØÙØ ØØØØÙÙÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Backend is not opened yet"
+#~ msgstr "ØØØÙØ ØÛÚÙ ØÛØÙ ØÛÚÙÙÙÙØØÙ"
+
+#~ msgctxt "ClientError"
+#~ msgid "Unknown error"
+#~ msgstr "ÙØÙÛÙÛÙ ØØØØÙÙÙ"
+
 #~ msgid "Could not connect to %s (port %s): "
 #~ msgstr "%s (ØÛØÙØ %s) ØØ ØØØÙÙÙØÙÙÙØÙ: "
 



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