[evolution-data-server] Updated Serbian translation



commit 46aed189af46eda591cc807313d9e3294b96b3ce
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Tue Jul 24 23:11:03 2012 +0200

    Updated Serbian translation

 po/sr.po       | 4674 +++++++++++++++++++++-----------------------------------
 po/sr latin po | 4674 +++++++++++++++++++++-----------------------------------
 2 files changed, 3402 insertions(+), 5946 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 0fcb4dc..4a7854b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-02-17 15:28+0000\n"
-"PO-Revision-Date: 2012-02-19 14:34+0200\n"
+"POT-Creation-Date: 2012-07-24 15:17+0000\n"
+"PO-Revision-Date: 2012-07-24 23:05+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -21,130 +21,127 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:125
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
-#: ../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
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:596
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
+#: ../calendar/libecal/e-cal.c:4032 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:521
 #: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:161
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:150
+#: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:173
+#: ../addressbook/backends/file/e-book-backend-file.c:164
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:468
+#: ../addressbook/backends/file/e-book-backend-file.c:459
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÑÑ ÐÐÐÑ ÐÐ ÐÐÐÐÑ â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/file/e-book-backend-file.c:1125
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
 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
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1562
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4866
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÑ â%sâ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:831
+#: ../addressbook/backends/google/e-book-backend-google.c:709
 msgid "Querying for updated contactsâ"
-msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ..."
-
-#: ../addressbook/backends/google/e-book-backend-google.c:880
-#: ../addressbook/libebook/e-book.c:3529 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1915
-msgid "Personal"
-msgstr "ÐÐÑÐÐ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:882
-msgid "Friends"
-msgstr "ÐÑÐÑÐÑÐÑÐ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:884
-msgid "Family"
-msgstr "ÐÐÑÐÐÐÑÐ"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:886
-msgid "Coworkers"
-msgstr "ÐÐÑÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:970
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Querying for updated groupsâ"
-msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÑÑÐÐÐÐ..."
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÑÑÐÐÐÐâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+#: ../addressbook/backends/google/e-book-backend-google.c:1275
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
 msgid "The backend does not support bulk additions"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1389
+#: ../addressbook/backends/google/e-book-backend-google.c:1307
 msgid "Creating new contactâ"
-msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ..."
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../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
+#: ../addressbook/backends/google/e-book-backend-google.c:1396
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
 msgid "The backend does not support bulk removals"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1504
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
 msgid "Deleting contactâ"
-msgstr "ÐÑÐÑÐÐ ÐÐÐÑÐÐÑ..."
+msgstr "ÐÑÐÑÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1749
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
+#: ../addressbook/backends/google/e-book-backend-google.c:1674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
 msgid "The backend does not support bulk modifications"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1782
+#: ../addressbook/backends/google/e-book-backend-google.c:1712
 msgid "Modifying contactâ"
-msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ..."
+msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1983
+#: ../addressbook/backends/google/e-book-backend-google.c:1895
 msgid "Loadingâ"
-msgstr "ÐÑÐÑÐÐÐÐ..."
+msgstr "ÐÑÐÑÐÐÐÐâ"
+
+#: ../addressbook/backends/google/e-book-google-utils.c:1557
+msgid "Personal"
+msgstr "ÐÐÑÐÐ"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1558
+msgid "Friends"
+msgstr "ÐÑÐÑÐÑÐÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2108
-msgid "Authenticating with the serverâ"
-msgstr "ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÑÐÑÐÐÑÐÐ..."
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1559
+msgid "Family"
+msgstr "ÐÐÑÐÐÐÑÐ"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1560
+msgid "Coworkers"
+msgstr "ÐÐÑÐÐÐÐÑÐ"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
 
@@ -156,916 +153,929 @@ msgstr "ÐÐÑÐÑÑÐÐ ÐÑÑÐÐÐÑÑÐ ÐÐÐ (DN)"
 msgid "Using Email Address"
 msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐ â%sâ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
+msgid "Failed to get the DN for user '%s'"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ â%sâ"
 
-#: ../addressbook/libebook/e-book.c:3196
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ â%sâ ÑÐÐÑÑÐÐÐÐ Ñ ÐÐÐÐÑÑ."
-
-#: ../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:3638
-#: ../addressbook/libebook/e-book-client.c:699
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÐÑÐ"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐ â%sâ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
 
-#: ../addressbook/libebook/e-book-client.c:92
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:98
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "ÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:512
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:522
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑ"
-
-#: ../addressbook/libebook/e-book-client.c:624
-#: ../calendar/libecal/e-cal-client.c:725
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "ÐÐÐÑÐÑÐÐ ÐÐÑÐÑÐ â%sâ"
-
-#: ../addressbook/libebook/e-book-client.c:662
-msgid "Failed to find system book"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÑ ÑÐÑÑÐÐÐ"
-
-#: ../addressbook/libebook/e-book-client.c:771
-#: ../calendar/libecal/e-cal-client.c:878
-#, c-format
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐ â%sâ ÑÐÑÑÐÐÐÐÐ Ñ ÑÐÐÑÐÑ ÐÐÐÐÑÐ."
-
-#: ../addressbook/libebook/e-book-client.c:2563
-#: ../calendar/libecal/e-cal-client.c:4480
+#: ../addressbook/libebook/e-book-client.c:2282
+#: ../calendar/libecal/e-cal-client.c:4640
 msgid "Cannot get connection to view"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:120
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:122
-msgid "Book URI"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
+#: ../addressbook/libebook/e-contact.c:128
+msgid "Book UID"
+msgstr "ÐÑÑÐÑÐ ÐÐÑÐÑÐÑÐ"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
-msgstr "ÐÑÐÐ ÐÐÐ"
+msgstr "ÐÐÐ Ð ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "ÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "1Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "2Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "3Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "4Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "ÐÐÑÐÑÐÐÐÑ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "2Â ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
-msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÑ"
+msgstr "ÐÐÐÑ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "2Â ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "ÐÐÑÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
-msgstr "TTY"
+msgstr "ÐÐÐ"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "ÐÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "ÐÐÑÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:182
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐÑÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "ÐÐÐÑÐÐ ÐÐ. ÐÐÑÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐ ÐÐÐÐ ÐÐÑÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:263
-msgid "List Show Addresses"
-msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐ"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+msgid "List Shows Addresses"
+msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:266
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÑÐÑÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 ÑÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐÐÐÐÐ"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:1601
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÑ ÐÐÐÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:87
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "ÐÐÐÑÐÐÑ â%sâ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "ÐÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4000 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:134
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4014 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
-msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
+msgstr "ÐÑÐÑÑÑÐ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÐÑÐ"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "ÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:118
-msgid "Invalid argument"
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3998 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
+msgid "Invalid argument"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4037 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÐÑÐÐ ÑÐÑ ÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:619
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-msgid "Cannot authenticate user: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐÑÐÑÐÐÐÐ: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐ-ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑ â%sâ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
 #, c-format
-msgid "Empty URI"
-msgstr "ÐÑÐÐÐÐ ÐÑÑÐÑÐ"
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ Ñ ÐÐÐÐÑÑ â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐ â%sâ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:564
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:594
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÐ: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÐ. ÐÐÐÐÐ ÐÐ ÐÐÐÑÑÐÑ ÑÐÐÐÐÐÐ "
+"ÑÐ ÑÐÑ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÐ. ÐÐÐ ÑÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐ, ÐÐÐ ÑÑÐ "
+"ÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÑÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑÑ, ÐÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÐÐÐ "
+"ÐÑÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÑÐ ÑÐÐÐ ÑÑÐ ÑÐÑÐ Ñ ÑÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÑ âÐÐÐÐÐÐÑÐ "
+"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÑÐÑÐâ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐ â%dâ ÐÐÐÐ ÑÑÐÑÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2302
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1074,388 +1084,364 @@ msgstr ""
 "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑ ÑÐ ÐÑÐÐÑÐÐ Ñ ÑÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ.\n"
 "ÐÐÑÑÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
-msgid "Calendar doesn't support Free/Busy"
-msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ / ÐÐÑÐÐÑÐ"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3668
+msgid "CalDAV does not support bulk additions"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑ %s (ÐÐÑÐÑÐÐÐ %s)\n"
-"ÐÐÐÐÐÐ: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3770
+msgid "CalDAV does not support bulk modifications"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑ %s (ÐÐÑÐÑÐÐÐ %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3938
+msgid "CalDAV does not support bulk removals"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÑÐÑÐ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4597
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ / ÐÐÑÐÐÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÑÐÑÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ: ÐÐÑÐ ÐÐÑÐÑÐ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:256
-#: ../calendar/backends/file/e-cal-backend-file.c:262
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:418
+#: ../calendar/backends/http/e-cal-backend-http.c:481
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÐ: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:542
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:459
+#: ../calendar/backends/http/e-cal-backend-http.c:579
+#, c-format
 msgid "Bad file format."
 msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:467
+#: ../calendar/backends/http/e-cal-backend-http.c:589
+#, c-format
 msgid "Not a calendar."
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:793
-#: ../calendar/backends/http/e-cal-backend-http.c:794
-#: ../calendar/backends/weather/e-cal-backend-weather.c:522
+#: ../calendar/backends/http/e-cal-backend-http.c:934
+#: ../calendar/backends/http/e-cal-backend-http.c:938
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:181
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÑÑÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÑÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:433
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:906
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s ÐÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐ ÐÐ %s"
-
-#: ../calendar/libecal/e-cal.c:4567
+#: ../calendar/libecal/e-cal.c:4002
 msgid "Repository is offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4004 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4006 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4008 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI not loaded"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4577
+#: ../calendar/libecal/e-cal.c:4012
 msgid "URI already loaded"
 msgstr "ÐÐÑÐÑÐ ÑÐ ÐÐÑ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4581
+#: ../calendar/libecal/e-cal.c:4016
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4018 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "ÐÐ ÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4022
 msgid "Operation has been canceled"
 msgstr "ÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4589
+#: ../calendar/libecal/e-cal.c:4024
 msgid "Could not cancel operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4026 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:4593
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:4028
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4595
+#: ../calendar/libecal/e-cal.c:4030
 msgid "A D-Bus exception has occurred"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÐÑÐÐ Ð-ÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:4599
+#: ../calendar/libecal/e-cal.c:4034
 msgid "No error"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal-client.c:600
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal-client.c:765
-msgid "Failed to find system calendar"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
-
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
-
-#: ../calendar/libecal/e-cal-client.c:919
-msgid "Invalid source type"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÐÐÐÑÐ"
-
-#: ../calendar/libecal/e-cal-component.c:1362
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
-msgstr "1Â"
+msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
-msgstr "2Â"
+msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
-msgstr "3Â"
+msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
-msgstr "4Â"
+msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
-msgstr "5Â"
+msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
-msgstr "6Â"
+msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
-msgstr "7Â"
+msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
-msgstr "8Â"
+msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
-msgstr "9Â"
+msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
-msgstr "10Â"
+msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
-msgstr "11Â"
+msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
-msgstr "12Â"
+msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
-msgstr "13Â"
+msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
-msgstr "14Â"
+msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
-msgstr "15Â"
+msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
-msgstr "16Â"
+msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
-msgstr "17Â"
+msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
-msgstr "18Â"
+msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
-msgstr "19Â"
+msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
-msgstr "20Â"
+msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
-msgstr "21Â"
+msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
-msgstr "22Â"
+msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
-msgstr "23Â"
+msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
-msgstr "24Â"
+msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
-msgstr "25Â"
+msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
-msgstr "26Â"
+msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
-msgstr "27Â"
+msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
-msgstr "28Â"
+msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
-msgstr "29Â"
+msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
-msgstr "30Â"
+msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
-msgstr "31Â"
+msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "ÐÐÑÐÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:142
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:159
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:807
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:829
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:944
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:975
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1175
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1205
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1464,7 +1450,7 @@ msgstr "â%sâ ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1246
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
@@ -1472,7 +1458,7 @@ msgstr "â%sâ ÐÑÐÐÑÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:874
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
@@ -1484,8 +1470,8 @@ msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐ
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1010
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
@@ -1496,8 +1482,8 @@ msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1016
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1252
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
@@ -1515,7 +1501,7 @@ msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1024
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
@@ -1530,13 +1516,13 @@ msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑ
 msgid "\"%s\" expects none or two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1546,12 +1532,12 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ âanyâ, âsummaryâ, âdescriptionâ, "
 "âlocationâ, âattendeeâ, âorganizerâ, ÐÐÐ âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1560,148 +1546,156 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐ Ð ÑÐÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ "
 "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
+
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:800
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1041
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1168
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÑÑÐÑÑ ÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÑÑ ÐÑÐÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐ"
+
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÑÐÐÐ"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐ ÐÑÑÐÐÐ: %s: %s"
@@ -1733,110 +1727,103 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-folder.c:412
+#: ../camel/camel-disco-folder.c:417
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:484 ../camel/camel-offline-folder.c:331
 msgid "Copy folder content locally for _offline operation"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐ _ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:527
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-#: ../camel/providers/pop3/camel-pop3-folder.c:840
-#: ../camel/providers/pop3/camel-pop3-folder.c:1038
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../camel/camel-disco-store.c:466 ../camel/camel-imapx-folder.c:410
+#: ../camel/camel-imapx-folder.c:443 ../camel/camel-imapx-folder.c:479
+#: ../camel/camel-imapx-folder.c:535 ../camel/camel-imapx-folder.c:611
+#: ../camel/camel-imapx-folder.c:645 ../camel/camel-imapx-folder.c:685
+#: ../camel/camel-imapx-folder.c:721 ../camel/camel-imapx-store.c:273
+#: ../camel/camel-imapx-store.c:1363 ../camel/camel-imapx-store.c:1451
+#: ../camel/camel-imapx-store.c:1497
+#: ../camel/providers/imap/camel-imap-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:2002
+#: ../camel/providers/imap/camel-imap-store.c:2469
+#: ../camel/providers/imap/camel-imap-store.c:3219
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:394
+#: ../camel/providers/pop3/camel-pop3-store.c:807
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÑÐÑÑ"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÑÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÑÐÑÑ"
 
 #: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:937
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÑÐÑÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1495
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1513
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d ÐÐ %d"
@@ -1858,7 +1845,7 @@ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÐÐÑÐÑÐÐÑÐÐ-ÐÐ
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s: %s"
 
-#: ../camel/camel-folder.c:258
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1867,7 +1854,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:298
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1876,7 +1863,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:346
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1885,32 +1872,41 @@ msgstr[1] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÑ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:914
+#: ../camel/camel-folder.c:930
 #: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:917
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:1229
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-folder.c:3535
+#: ../camel/camel-folder.c:3371
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÑÐÑ â%sâ Ñ %s"
 
-#: ../camel/camel-folder.c:3681
+#: ../camel/camel-folder.c:3753
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
-#: ../camel/camel-folder-search.c:661
+#: ../camel/camel-folder.c:3985
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
+
+#: ../camel/camel-folder-search.c:417 ../camel/camel-folder-search.c:581
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1919,8 +1915,7 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
-#: ../camel/camel-folder-search.c:673
+#: ../camel/camel-folder-search.c:429 ../camel/camel-folder-search.c:593
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1930,47 +1925,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
+#: ../camel/camel-folder-search.c:811 ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÑÐÑ"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:991
+#: ../camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÑÑÐÑ %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:998 ../camel/camel-folder-search.c:1006
+#: ../camel/camel-folder-search.c:928 ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1034
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÑÐÑ"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1044
+#: ../camel/camel-folder-search.c:974
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
-#: ../camel/camel-gpg-context.c:1323
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ: %s"
 
-#: ../camel/camel-gpg-context.c:664
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1981,17 +1976,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:765
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐ-Ð ÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:826
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2000,7 +1995,7 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÐÐÑÐÐ ÐÐÑÑÐÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2009,12 +2004,12 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÑÐÑÐÐÐÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ-Ð ÐÐ â%sâ"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:850
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2022,193 +2017,463 @@ msgstr ""
 "ÐÐÐÑÑÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑÑ, ÑÐÐÐ ÐÐ ÑÐ ÐÐÑÐ "
 "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐ ÐÑÑÑ."
 
-#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:896
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐ ÑÐÑÐÐ ÐÑÑÑ: ÑÐÐÑÐ ÑÑ 3 ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:909
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ-Ð: %s"
 
-#: ../camel/camel-gpg-context.c:1040
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ: ÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
-#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
-#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
-#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1793
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: "
 
-#: ../camel/camel-gpg-context.c:1916
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ: "
 
-#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2059
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÑÑÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐ ÐÐÐ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÑ"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÑÐÐÐÐ"
-
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-imapx-folder.c:101
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ: %s"
+msgid "Could not create folder summary for %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-imapx-folder.c:109
 #, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr ""
-"ÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ. "
-"ÐÐÐÑÑÐÑÑÐ ÐÐÑÐÐÑÐ."
+msgid "Could not create cache for %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âfcntl(2)â: %s"
+#: ../camel/camel-imapx-folder.c:791
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/nntp/camel-nntp-folder.c:731
+msgid "Apply message _filters to this folder"
+msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐÐ"
 
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âflock(2)â: %s"
+#: ../camel/camel-imapx-server.c:1015
+msgid "Server disconnected"
+msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+#: ../camel/camel-imapx-server.c:1457
+msgid "Error writing to cache stream: "
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ: "
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-imapx-server.c:2384
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+msgid "Not authenticated"
+msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ"
+#: ../camel/camel-imapx-server.c:2453
+msgid "Error performing IDLE"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ-Ð"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-imapx-server.c:3297
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/camel-movemail.c:105
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+#: ../camel/camel-imapx-server.c:3298
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+msgid "STARTTLS not supported"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-imapx-server.c:3337
+#: ../camel/providers/imap/camel-imap-store.c:435
 #, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-imapx-server.c:3404
+#: ../camel/providers/imap/camel-imap-store.c:734
 #, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-imapx-server.c:3415 ../camel/camel-session.c:486
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÑÑÑ Ñ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ â%sâ: %s"
+msgid "No support for %s authentication"
+msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-movemail.c:193
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ: %s"
+#: ../camel/camel-imapx-server.c:3434
+#: ../camel/providers/imap/camel-imap-store.c:1118
+#: ../camel/providers/nntp/camel-nntp-store.c:494
+msgid "Cannot authenticate without a username"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-movemail.c:207
-#, c-format
-msgid "Could not fork: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ: %s"
+#: ../camel/camel-imapx-server.c:3443
+#: ../camel/providers/imap/camel-imap-store.c:1126
+#: ../camel/providers/nntp/camel-nntp-store.c:503
+#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:513
+msgid "Authentication password not available"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/camel-movemail.c:245
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐ: %s"
+#: ../camel/camel-imapx-server.c:3633
+msgid "Error fetching message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-movemail.c:246
-msgid "(Unknown error)"
-msgstr "(ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ)"
+#: ../camel/camel-imapx-server.c:3715
+msgid "Failed to copy the tmp file"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../camel/camel-movemail.c:273
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
+#: ../camel/camel-imapx-server.c:3729
+msgid "Failed to close the tmp stream"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../camel/camel-movemail.c:286
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
+#: ../camel/camel-imapx-server.c:3827
+msgid "Error copying messages"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ: %s"
+#: ../camel/camel-imapx-server.c:3962
+msgid "Error appending message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-multipart-signed.c:297
-#, c-format
-msgid "No content available"
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÑÐÐÑÐ"
+#: ../camel/camel-imapx-server.c:4149
+msgid "Error fetching message headers"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-multipart-signed.c:305
-#, c-format
-msgid "No signature available"
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÐÑÐ"
+#: ../camel/camel-imapx-server.c:4295
+msgid "Error retrieving message"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-imapx-server.c:4417 ../camel/camel-imapx-server.c:4622
 #, c-format
-msgid "parse error"
-msgstr "ÐÑÐÑÐÐ ÑÐÑÐÑÐ"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/camel-net-utils.c:703
+#: ../camel/camel-imapx-server.c:4476
 #, c-format
-msgid "Resolving: %s"
-msgstr "ÐÐÐÐÐÐÐ: %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
+
+#: ../camel/camel-imapx-server.c:4518
+msgid "Error fetching new messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4717
+msgid "Error while fetching messages"
+msgstr "ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:4725 ../camel/camel-imapx-server.c:4760
+#, c-format
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÑ Ñ â%sâ"
+msgstr[1] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr[2] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr[3] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÑ Ñ â%sâ"
+
+#: ../camel/camel-imapx-server.c:4887 ../camel/camel-imapx-server.c:4923
+msgid "Error refreshing folder"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5016
+msgid "Error expunging message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-imapx-server.c:5105
+msgid "Error fetching folders"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5184
+msgid "Error subscribing to folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
+
+#: ../camel/camel-imapx-server.c:5241
+msgid "Error creating folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5290
+msgid "Error deleting folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5344
+msgid "Error renaming folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:5399
+msgid "Error performing NOOP"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ-Ð"
+
+#: ../camel/camel-imapx-server.c:5497
+msgid "Error syncing changes"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-server.c:6119
+#: ../camel/providers/imap/camel-imap-folder.c:3473
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÐÐ â%sâ: %s"
+
+#: ../camel/camel-imapx-server.c:6120
+#: ../camel/providers/imap/camel-imap-folder.c:3474
+msgid "No such message available."
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ."
+
+#: ../camel/camel-imapx-server.c:6275 ../camel/camel-imapx-server.c:6290
+msgid "Cannot create spool file: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÑÐÐÐ: "
+
+#: ../camel/camel-imapx-store.c:155
+#: ../camel/providers/imap/camel-imap-store.c:810
+#, c-format
+msgid "IMAP server %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
+
+#: ../camel/camel-imapx-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:813
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%s"
+
+#: ../camel/camel-imapx-store.c:249
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid "Password"
+msgstr "ÐÐÐÐÐÐÐ"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+
+#: ../camel/camel-imapx-store.c:342
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2227
+#, c-format
+msgid "No such folder %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:367 ../camel/camel-imapx-store.c:838
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:474
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:679
+#: ../camel/providers/local/camel-maildir-store.c:685
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-spool-store.c:387
+msgid "Inbox"
+msgstr "ÐÐÐÐÑÑÐ"
+
+#: ../camel/camel-imapx-store.c:1070
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
+
+#: ../camel/camel-imapx-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1749
+#, c-format
+msgid "No such folder: %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-store.c:1384
+#: ../camel/providers/imap/camel-imap-store.c:2046
+#: ../camel/providers/imap/camel-imap-store.c:2484
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑ ÑÐÐÑÐÐ ÐÐÐÐ â%câ"
+
+#: ../camel/camel-imapx-store.c:1395
+#: ../camel/providers/imap/camel-imap-store.c:2497
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
+
+#: ../camel/camel-imapx-store.c:1405
+#: ../camel/providers/imap/camel-imap-store.c:2109
+#: ../camel/providers/imap/camel-imap-store.c:2548
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/camel-imapx-stream.c:72
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../camel/camel-imapx-stream.c:81
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"ÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ. "
+"ÐÐÐÑÑÐÑÑÐ ÐÐÑÐÐÑÐ."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âfcntl(2)â: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âflock(2)â: %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ"
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+
+#: ../camel/camel-movemail.c:119
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+
+#: ../camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
+
+#: ../camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÑÑÑ Ñ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ â%sâ: %s"
+
+#: ../camel/camel-movemail.c:193
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ: %s"
+
+#: ../camel/camel-movemail.c:207
+#, c-format
+msgid "Could not fork: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ: %s"
+
+#: ../camel/camel-movemail.c:245
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐ: %s"
+
+#: ../camel/camel-movemail.c:246
+msgid "(Unknown error)"
+msgstr "(ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ)"
+
+#: ../camel/camel-movemail.c:273
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
+
+#: ../camel/camel-movemail.c:286
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
+
+#: ../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:297
+#, c-format
+msgid "No content available"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÑÐÐÑÐ"
+
+#: ../camel/camel-multipart-signed.c:305
+#, c-format
+msgid "No signature available"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÐÑÐ"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
+msgid "parse error"
+msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐÐ"
+
+#: ../camel/camel-net-utils.c:703
+#, c-format
+msgid "Resolving: %s"
+msgstr "ÐÐÐÐÐÐÐ: %s"
 
 #: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
@@ -2237,7 +2502,7 @@ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ: %s"
 msgid "Could not connect to %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: "
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-offline-folder.c:207
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐ ÐÐÑÐ"
@@ -2270,7 +2535,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÑ."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
@@ -2315,11 +2580,11 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "ÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2327,11 +2592,11 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, ÐÐÐ "
 "ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:55
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "ÐÐÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2339,47 +2604,47 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, "
 "ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:846
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÑÐÐÑÐ ÐÑÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:857
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ âÐÐÐÐÐÑÐÑ ÐÐÑÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:898
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:919
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:932
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÐÐÑÐÑ 5 ÐÐÑÐÑÑÐÐÐÑÐ "
 "ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:130
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2387,11 +2652,11 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ, ÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐ "
 "ÐÑÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:135
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2399,7 +2664,7 @@ msgstr ""
 "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ "
 "ÐÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2407,7 +2672,7 @@ msgstr ""
 "ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÐÑ "
 "ÐÑÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÑÐÐÑÐ (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2415,7 +2680,7 @@ msgstr ""
 "ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐÑ ÑÑÑÑÐÑÑÑÑ, ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐ "
 "ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2423,52 +2688,52 @@ msgstr ""
 "ÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐÑÐ ÐÑÐÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑ "
 "ÑÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐÐÑÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÑ ÑÐÐÑÐ (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÑÐ ÑÑÐÐÐÐÐÑ ÑÐÐÑÐÑÐ ÑÐ ÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
-#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:406
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐÑÐÐ ÑÐÐÑ."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:103
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÑÐÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "ÐÐÐÐ / ÐÐÐ"
 
-#: ../camel/camel-sasl-ntlm.c:45
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2476,28 +2741,28 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐ / ÐÐÐÑÑÐÐÑÐÐ "
 "ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-plain.c:40
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÑ ÐÑÐ ÐÐÐÑÑÐÑÐ ÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
 msgstr "POP ÐÐÐÐÑÐÐ ÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÑÑÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐ â%sâ ÑÑÐÑÐÐÐ"
@@ -2507,277 +2772,271 @@ msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:407
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
 
-#: ../camel/camel-session.c:462
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format
-msgid "No support for %s authentication"
-msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:501
 #, c-format
 msgid "%s authentication failed"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ %s ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-session.c:1183
+#: ../camel/camel-session.c:1239
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÐÑÐÑÐ â%sâ ÐÐÐÐÐÐÑ ÐÐ â%sâ ÐÐ ÐÐÐÐÑÐÐÑ â%sâ."
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ"
 
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÐ"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "ÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑÐ â%sâ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÐ"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "ÐÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "ÐÐÑ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
 # ÑÐ, ÑÐ...
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑÑ"
 
 # ÑÐ, ÐÐÐÐ ÑÐ Ð ÐÐÑÐ ÐÐ âÐÐÑÑÐÐÐÐÑâ...
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "ÐÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÐÐ ÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "ÐÐÑÐ ÑÑÐÐÐ ÑÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ, ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÑÐÑÐ ÑÑ ÑÐÐÐÐÐÐ Ð ÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÑÐÐÑÐÐÐ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÑ ÑÐÑÑÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÑ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÐ ÑÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÑÑÑ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Ð/ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÐÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÑÐÐ ÑÐÐÐ"
 
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÑÐÐÐÐ"
+
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
@@ -2788,90 +3047,100 @@ msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:386
+#, c-format
+msgid "Subscribing to folder '%s'"
+msgstr "ÐÑÐÑÐÐÑÑÑÐÐ ÑÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "ÐÐÑÐÐÑÑÑÐÐ ÑÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "ÐÐÐ %d ÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ4"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÐ: ÐÃÐ â%dâ"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ5"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:777
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr "ÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÑÑ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐ (ÐÐÑÐÐÑÐ 255 ÐÐÐÐÐÐÐ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:470
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
 "   Issuer:       %s\n"
@@ -2884,16 +3153,16 @@ msgstr ""
 "   ÐÑÐÑÐÐ:       %s\n"
 "   ÐÐÑÐÐÑ:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "ÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "ÐÐÐÐ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2906,19 +3175,19 @@ msgstr ""
 "ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÑÐÐÑÐÑÑ:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "_ÐÐÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:485
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "ÐÑÐÑÐÐÑÐ _ÐÑÐÐÑÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:486
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "ÐÑÐÑÐÐÑÐ _ÑÑÐÑÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:544
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2927,7 +3196,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÑÐÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:596
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2936,7 +3205,7 @@ msgstr ""
 "ÐÐÑ ÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:614
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2945,7 +3214,7 @@ msgstr ""
 "ÐÑÑÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:631
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2959,42 +3228,50 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÑ â%sâ"
 
-#: ../camel/camel-vee-folder.c:647
+#: ../camel/camel-vee-folder.c:484
 #, c-format
-msgid "Updating %s folder"
-msgstr "ÐÐÑÑÐÑÐÐ â%sâ ÑÐÑÑÐÐÐÑ"
+msgid "Updating folder '%s'"
+msgstr "ÐÐÑÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
+#: ../camel/camel-vee-folder.c:843 ../camel/camel-vee-folder.c:953
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÑÐÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-vee-folder.c:1354
+#: ../camel/camel-vee-folder.c:876
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ â%sâ Ñ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1422
+#: ../camel/camel-vee-folder.c:929
 #, c-format
 msgid "Error storing '%s': "
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÑÑ â%sâ:"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÑÑ â%sâ: "
+
+#: ../camel/camel-vee-folder.c:1157
+msgid "Automatically _update on change in source folders"
+msgstr "ÐÐÐ _ÐÐÑÑÐÑÐÑ ÐÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "ÐÐÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "ÐÐÑÑÑÐ _ÐÐÐÐÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÐ"
@@ -3004,23 +3281,23 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
@@ -3029,7 +3306,7 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s Ñ ÑÐÑÑÐÐÐÐ %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:426
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3038,100 +3315,78 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:508
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:520
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:603
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:818
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ â%sâ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:856
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:344
-#| msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:348
 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 "Apply message filters to this folder"
-msgid "Apply message _filters to this folder"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-folder.c:437
+#: ../camel/providers/imap/camel-imap-folder.c:439
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:458
+#: ../camel/providers/imap/camel-imap-folder.c:460
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1116
-#: ../camel/providers/imapx/camel-imapx-server.c:3949
+#: ../camel/providers/imap/camel-imap-folder.c:1127
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3473
+#: ../camel/providers/imap/camel-imap-folder.c:3436
 msgid "Unable to retrieve message: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ: %s"
-
-#: ../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"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3511
-#: ../camel/providers/imapx/camel-imapx-server.c:5512
-msgid "No such message available."
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3586
-#: ../camel/providers/imap/camel-imap-folder.c:4464
-#: ../camel/providers/nntp/camel-nntp-folder.c:511
+#: ../camel/providers/imap/camel-imap-folder.c:3547
+#: ../camel/providers/imap/camel-imap-folder.c:4417
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4045
-#: ../camel/providers/imap/camel-imap-folder.c:4128
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:4005
+#: ../camel/providers/imap/camel-imap-folder.c:4085
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4262
+#: ../camel/providers/imap/camel-imap-folder.c:4216
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÑÑ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4272
+#: ../camel/providers/imap/camel-imap-folder.c:4226
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÐ ÐÐÑ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4504
+#: ../camel/providers/imap/camel-imap-folder.c:4454
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ."
@@ -3157,208 +3412,94 @@ msgid "Failed to cache %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ â%sâ: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "Ð_ÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐ_ÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "_ÐÐÑÐÐÐÐ:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "ÐÑÐÐ_ÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð_ÑÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "ÐÐÐÐÐ _ÐÐÐÐÐ:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ _ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ _ÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
+msgstr "_ÐÑÐÐÐÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐÑÑÐÑÑ ÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÑÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ_ÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÑÑÐÐÐÐÐ ÑÐ_ÐÑÐÐÑ ÐÐÑÑÑ ÑÐ ÐÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐ ÑÑÐÐÐÐÐ ÑÐ_ÐÑÐÐÑ ÐÐÑÑÑ ÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ ÐÐÐ-Ð"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:118
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid "Password"
-msgstr "ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:109
-#: ../camel/providers/imapx/camel-imapx-provider.c:120
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "ÐÐÐÐÑÑÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
-
-#: ../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 "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%s"
-
-#: ../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 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 password not available"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imap/camel-imap-store.c:2269
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#, c-format
-msgid "No such folder %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑ ÑÐÐÑÐÐ ÐÐÐÐ â%câ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/imap/camel-imap-store.c:2158
 #: ../camel/providers/local/camel-maildir-store.c:268
 #: ../camel/providers/local/camel-mbox-store.c:421
 #: ../camel/providers/local/camel-mh-store.c:558
@@ -3366,203 +3507,61 @@ msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
+#: ../camel/providers/imap/camel-imap-store.c:2921
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3326
+#: ../camel/providers/imap/camel-imap-store.c:3263
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3266
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr "_ÐÑÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÑÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "ÐÐÑÐÐÐÐ:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "ÐÑÐÑ ÐÐÐÐ ÐÐ _ÐÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐ-Ð"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "ÐÐÐÐ+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-msgid "Server disconnected"
-msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-msgid "Error writing to cache stream: "
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ:"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2005
-msgid "Error performing IDLE"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ-Ð"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3160
-msgid "Error fetching message"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
-msgid "Closing tmp stream failed: "
-msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ:"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3327
-msgid "Error copying messages"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3457
-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 message"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
-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 %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÑ Ñ â%sâ"
-msgstr[1] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
-msgstr[2] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
-msgstr[3] "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÑ Ñ â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4334
-#: ../camel/providers/imapx/camel-imapx-server.c:4368
-msgid "Error refreshing folder"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4457
-msgid "Error expunging message"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4542
-msgid "Error fetching folders"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4616
-msgid "Error subscribing to folder"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4669
-msgid "Error creating folder"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4714
-msgid "Error deleting folder"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4764
-msgid "Error renaming folder"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4815
-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 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÑÐÐÐ: "
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
-#, c-format
-msgid "No such folder: %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "ÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/local/camel-local-folder.c:187
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:197
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:215
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:479
-#| msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "_ÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:710
+#: ../camel/providers/local/camel-local-folder.c:726
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3571,23 +3570,23 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â.foldersâ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "ÐÐ-ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3595,30 +3594,29 @@ msgstr ""
 "ÐÐ ÐÐÐÐÐÑÐÑÐ (ÐÑÐÐÐÑÑÐÑÐ) ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐÑÐÐÑÐÑÐÐÐ "
 "ÐÑÐÐÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑ ÐÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÑÐÑÐ Ñ ÐÐÐ/ÐÐÐÐ/ÐÑÑ ÑÐÑÐÐÑÑ"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3627,7 +3625,7 @@ msgstr ""
 "ÐÑÐÐÑÐÐÐ.\n"
 "ÐÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÐÑÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐ, ÐÐÐÐ ÐÐÐ ÐÑÑ ÑÑÐÐÑ."
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÑÐÐÐ"
 
@@ -3724,7 +3722,7 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ"
 
 #: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:786
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐÑ ÐÐÑÑÐÑÐ"
@@ -3768,34 +3766,34 @@ msgid "not a maildir directory"
 msgstr "ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ"
 
 #: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-maildir-store.c:974
 #: ../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:773
+#: ../camel/providers/local/camel-maildir-store.c:777
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:413
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:537
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐÑÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:630
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:649
 #: ../camel/providers/local/camel-mbox-summary.c:793
@@ -3989,7 +3987,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:224
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s: %s"
@@ -4089,47 +4087,47 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÑÐÐÐ, ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:286
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:497
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ: ÐÐÐ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:336
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/pop3/camel-pop3-folder.c:613
-#: ../camel/providers/pop3/camel-pop3-folder.c:997
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:347
-#: ../camel/providers/nntp/camel-nntp-folder.c:522
-#: ../camel/providers/pop3/camel-pop3-folder.c:551
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#: ../camel/providers/pop3/camel-pop3-folder.c:622
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:581
-#: ../camel/providers/nntp/camel-nntp-folder.c:587
-#: ../camel/providers/nntp/camel-nntp-folder.c:634
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:658
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:678
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ!"
@@ -4167,22 +4165,22 @@ msgid ""
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:283
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:295
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÑÐ ÐÑÐÑÐÐ ÐÐÐ ÐÑÐÑÐÐ â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:458
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1044
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4193,24 +4191,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÑÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1175
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1371
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4221,7 +4219,7 @@ msgstr ""
 "\n"
 "ÐÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ. ÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4232,14 +4230,14 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
 msgid "NNTP Command failed: "
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1691
 #, c-format
 msgid "Not connected."
-msgstr "ÐÐÐÐÐÐÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ."
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:195
 #: ../camel/providers/nntp/camel-nntp-summary.c:322
@@ -4262,34 +4260,34 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ head-Ð: %s"
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:519
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:535
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:614
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:825
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÑÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:845
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
@@ -4389,26 +4387,26 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%s
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐ ÑÐÑÐÐÑÑ â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "POP3 server %s"
 msgstr "ÐÐÐ3 ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "ÐÐÐ3 ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:527
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÐÐÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐ. ÐÐÐÑÑ "
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÐÐÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐ. ÐÐÐÑÑ "
 "ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4419,7 +4417,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:594
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4428,17 +4426,17 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "ÐÐÐ3 ÐÑÑÐÐÐ ÐÐÐÐ ÑÐÑÐÑÐÑÑÐÑÑ ÑÐÑÑÐÐÐÐ"
@@ -4479,7 +4477,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐ: %s: ÐÐÑÑÐ ÐÐ
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: "
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
@@ -4522,353 +4520,514 @@ msgstr ""
 msgid "Welcome response error: "
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:225
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #, c-format
 msgid "SMTP server %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:369
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:449
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#: ../camel/providers/smtp/camel-smtp-transport.c:479
+#: ../camel/providers/smtp/camel-smtp-transport.c:490
+#: ../camel/providers/smtp/camel-smtp-transport.c:503
 msgid "AUTH command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âAUTHâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ, ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "Command not implemented"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:803
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÑÑÑ ÑÐÑÑÐÐÐ, ÐÐÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
 msgid "Help message"
 msgstr "ÐÐÑÑÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Service ready"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ, ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Requested mail action okay, completed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÑÐ Ñ ÑÐÐÑ, ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÑÐ ÐÑÐÑÐÐÑÐÐÐ ÐÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÐÑÑÐÑÑÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐ ÑÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ: ÐÑÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑ ÐÐÑÑÐ; ÐÐÐÑÑÐÐÐ ÑÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÐ ÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "A password transition is needed"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Temporary authentication failure"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 #: ../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:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1237
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1274
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1301
 #, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> ÐÐÑÐ ÑÑÐÐÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1349
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+msgstr "RCPT TO <%s> ÐÐÑÐ ÑÑÐÐÐÐ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1343
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 #: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
 msgid "DATA command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1492
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 msgid "RSET command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1562
 msgid "QUIT command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âQUITâ: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "ÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ, âÐÐÐÑÑÐâ, âÑÐÑÐâ ÐÐÐ âÐÐÐÐâ"
+
+#: ../libebackend/e-authentication-mediator.c:145
+#: ../libebackend/e-authentication-mediator.c:156
+#: ../libebackend/e-authentication-mediator.c:612
+#: ../libebackend/e-authentication-mediator.c:973
+msgid "Bus name vanished (client terminated?)"
+msgstr "ÐÐÐÐÐ ÑÐÐÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐ (ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÐÐ?)"
+
+#: ../libebackend/e-authentication-mediator.c:204
+msgid "No response from client"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÑÐ"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:275
+#: ../libebackend/e-authentication-mediator.c:606
+#: ../libebackend/e-authentication-mediator.c:967
+msgid "Client cancelled the operation"
+msgstr "ÐÐÐÑÐÐÑ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÑÐÑÐÑÑ"
+
+#: ../libebackend/e-authentication-mediator.c:334
+msgid "Client reports password was rejected"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../libebackend/e-authentication-session.c:530
+msgid "Add this password to your keyring"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÑ ÐÐÐÐÐÐÑ Ñ ÐÐÑ ÐÑÐÐÐÐÐÐ"
+
+#: ../libebackend/e-authentication-session.c:593
+msgid "Password was incorrect"
+msgstr "ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ"
+
+#: ../libebackend/e-authentication-session.c:1322
+#: ../libebackend/e-authentication-session.c:1494
+#: ../libebackend/e-authentication-session.c:1673
+msgid "Keyring operation was cancelled"
+msgstr "ÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÑÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐ"
+
+#: ../libebackend/e-server-side-source.c:162
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ [%s] ÐÑÑÐÐ"
+
+#: ../libebackend/e-server-side-source.c:1079
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐ ÐÐÐ ÐÐÑÑÐÐÐÐ â.sourceâ"
+
+# ÐÐÑ Ñ ÑÐÐÑÑÐÐÐ?
+#: ../libebackend/e-source-registry-server.c:598
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "ÐÐÐ â%sâ ÑÐ ÐÐÑ Ñ ÑÐÐÑÑÐÐÐ"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ÐÐÐÑÐÐÐ"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ÐÐÑÑÐÑÐÐ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "ÐÐÑÑÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ÐÐÐÐÐ ÐÑÑÑÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ÐÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "ÐÑÐÑÑÑ"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ÐÑÑÐÑÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ÐÑÐÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "ÐÐÐ"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "ÐÐÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "ÐÐÐÐÑ ÑÐ ÐÐÑ ÑÑÐÑÐÐ"
 
-#: ../libedataserver/e-client.c:132
+#. Translators: This means that the EClient does not support offline mode, or
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "ÐÑÐÑÐÐ Ñ Ð-ÐÐÐÐÑÑÑÐÐÐ"
 
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÑ ÐÐ ÐÐÑÐÑÐÑ"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÑ ÐÐ ÐÐÑÑÑ"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÑ"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÐÑ ÐÐÑÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐ â%sâ."
+
+#: ../libedataserver/e-source.c:603
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ [%s] ÐÑÑÐÐ"
+
+#: ../libedataserver/e-source.c:882
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐÐ â%sâ ÑÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÑÐ"
+
+#: ../libedataserver/e-source.c:964
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "ÐÐÐÐÑ ÐÐÐÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐ"
+
+#: ../libedataserver/e-source.c:1138
+msgid "Unnamed"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../libedataserver/e-source-registry.c:1512
+msgid "The user declined to authenticate"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐÑ"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4876,7 +5035,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4884,7 +5043,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1941
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4892,78 +5051,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1932
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1989
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1981
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4971,24 +5130,24 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1986
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1978
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1885
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5017,9 +5176,9 @@ 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 "ÐÐ ÐÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÑÐÑÑÑÐ ÑÐÑÐÐÑÑ ÐÐÑÑÐÐÐÐÐÑ."
+msgstr ""
+"ÐÐ ÐÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÑÐÑÑÑÐ ÑÐÑÐÐÑÑ ÐÐÑÑÐÐÐÐÐÑ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
 msgid "Host name for HTTP requests"
@@ -5038,24 +5197,20 @@ msgid "Port number to use for HTTP requests."
 msgstr "ÐÑÐÑ ÐÐÑÑÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Cannot authenticate without a username"
 msgid "Proxy authentication user name"
 msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "User name to use to authenticate against proxy server."
 msgstr ""
 "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ "
 "ÐÐÑÑÐÐÐÐÐÐÐ."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-#| msgid "%s authentication failed"
 msgid "Proxy authentication password"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "Password to use to authenticate against proxy server."
 msgstr ""
 "ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ "
@@ -5086,7 +5241,6 @@ 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 "ÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐ"
 
@@ -5110,193 +5264,134 @@ msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 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:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ.\n"
-
-#: ../libedataserverui/e-categories-editor.c:224
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "ÐÑÐÐÑÑÐÐ _ÐÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
 
-#: ../libedataserverui/e-categories-editor.c:233
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:324
 msgid "Icon"
 msgstr "ÐÐÐÐÐÑÐ"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:329
 msgid "Category"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "_ÐÐÐ ÑÐÐÐÐ"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
-msgstr "Ð_ÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgstr "_ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Ð ÐÐÐÐÑÐÐÐÑÑ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑ %s (ÐÐÑÐÑÐÐÐ %s)\n"
-"ÐÐÐÐÐÐ: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑ %s (ÐÐÑÐÑÐÐÐ %s)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-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 task list %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-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 memo list %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "ÐÐÐÑÐ ÐÑÐÐÑÑÐÑ ÑÐÑ"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÑ"
-
-#: ../libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "Ð_ÐÑÐÑÐÑ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+msgid "Cat_egory:"
 msgstr "ÐÐÑÐÐÐ_ÑÐÑÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
 msgstr "_ÐÑÐÑÑÐÐÐ:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:344
+#: ../libedataserverui/e-name-selector-dialog.c:1141
 msgid "Any Category"
 msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
+#: ../libedataserverui/e-name-selector-dialog.c:346
 msgid "Co_ntacts"
 msgstr "ÐÐ_ÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:401
 msgid "Search"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:404
 msgid "Address Book"
-msgstr "_ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÑÐÑÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:407
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:522
 msgid "Select Contacts from Address Book"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:880
 msgid "_Add"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:884
 msgid "_Remove"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:1056
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2819
+#: ../libedataserverui/e-name-selector-entry.c:2959
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr "ÐÑÐÑÑÑÐ %s ÑÐÑÑÐÑ"
+msgstr "_ÐÐÑÐÑÐ %s ÑÐÑÑÐÑ"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2834
+#: ../libedataserverui/e-name-selector-entry.c:2974
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð_ÐÐÐÐÐ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2844
+#: ../libedataserverui/e-name-selector-entry.c:2984
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð_ÑÐÑÐ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2861
+#: ../libedataserverui/e-name-selector-entry.c:3001
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÑÐÐÐ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
 msgstr "_ÐÐÐÐÐÐ â%sâ"
@@ -5330,1448 +5425,81 @@ msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
-msgid "Select destination"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
-
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:224
 msgid "_Destination"
 msgstr "_ÐÐÑÐÐÐÑÑÐ"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-msgid "Keep running after the last client is closed"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐ ÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ"
-
-#: ../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 "ÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
-
-#~ msgid "Check new messages for Jun_k contents"
-#~ msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÐÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
-
-#~ msgid "Invalid URI"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ"
-
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ ÐÐ â%sâ"
-
-#~ msgid "Could not instantiate backend"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
-
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: %s"
-
-#~ msgid "SSL unavailable"
-#~ msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#~ msgid "URL '%s' needs a user component"
-#~ msgstr "ÐÐÑÐÑÐ â%sâ ÐÐÑÑÐÐÐ ÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ"
-
-#~ msgid "URL '%s' needs a host component"
-#~ msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-
-#~ msgid "URL '%s' needs a path component"
-#~ msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÑÑÐÑÐÐ"
-
-#~ msgid ""
-#~ "SSL Certificate check for %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept?"
-#~ msgstr ""
-#~ "ÐÑÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
-
-#~ msgid "SSL is not available in this build"
-#~ msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÑ ÐÐÑÐÐÑÐ"
-
-#~ msgid "Error creating SASL authentication object."
-#~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#~ msgid "You did not enter a password."
-#~ msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÑ."
-
-#~ msgid ""
-#~ "Unable to authenticate to IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "Use I_dle if the server supports it"
-#~ msgstr "ÐÐÑÐÑÑÐ _ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
-
-#~ msgid "Authentication requested but no username provided"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐ"
-
-#~ msgid "TLS is not available in this build"
-#~ msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s: No support for requested "
-#~ "authentication mechanism."
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÑÑÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ "
-#~ "ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
-
-#~ msgid "SASL '%s' Login failed for POP server %s%s"
-#~ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐ â%sâ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s%s"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending password%s"
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
-#~ "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐÐÐÐ%s"
-
-#~ msgid ""
-#~ "Unable to authenticate to SMTP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~| msgid "Object not found"
-#~ msgctxt "BookClientError"
-#~ msgid "Contact not found"
-#~ msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
-
-#~| msgid "Object ID already exists"
-#~ msgctxt "BookClientError"
-#~ msgid "Contact ID already exists"
-#~ msgstr "ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
-
-#~| msgid "Namespace"
-#~ msgctxt "BookClientError"
-#~ msgid "No space"
-#~ msgstr "ÐÐÐÐ ÐÑÐÑÑÐÑÐ"
-
-#~| msgid "Unknown error"
-#~ msgctxt "BookClientError"
-#~ msgid "Unknown error"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "D-Bus book proxy gone"
-#~ msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÑÑÐÐÐÐÐ Ð-ÐÐÑÐ ÐÐÑÐÑÐÑÐ"
-
-#~ msgid "Cannot start view, D-Bus proxy gone"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ, ÐÐÑÑÐÐÐÐÐ Ð-ÐÐÑÐ ÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot stop view, D-Bus proxy gone"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÐÐÐ, ÐÐÑÑÐÐÐÐÐ Ð-ÐÐÑÐ ÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot set fields of interest, D-Bus proxy gone"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐ, ÐÐÑÑÐÐÐÐÐ Ð-ÐÐÑÐ ÑÐ ÐÑÐÑÐÐ"
-
-#~| msgid "No such calendar"
-#~ msgctxt "CalClientError"
-#~ msgid "No such calendar"
-#~ msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
-
-#~| msgid "Object not found"
-#~ msgctxt "CalClientError"
-#~ msgid "Object not found"
-#~ msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐ"
-
-#~| msgid "Invalid object"
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid object"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
-
-#~| msgid "Unknown User"
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown user"
-#~ msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
-
-#~| msgid "Object ID already exists"
-#~ msgctxt "CalClientError"
-#~ msgid "Object ID already exists"
-#~ msgstr "ÐÐ ÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
-
-#~| msgid "Invalid range"
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid range"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
-
-#~| msgid "Unknown error"
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown error"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "D-Bus calendar proxy gone"
-#~ msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÑÑÐÐÐÐÐ Ð-ÐÐÑÐ ÐÐÐÐÐÐÐÑÐ"
-
-#~| msgid "Invalid argument"
-#~ msgctxt "ClientError"
-#~ msgid "Invalid argument"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
-
-#~| msgid "Backend is busy"
-#~ msgctxt "ClientError"
-#~ msgid "Backend is busy"
-#~ msgstr "ÐÐÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
-
-#~| msgid "Authentication failed"
-#~ msgctxt "ClientError"
-#~ msgid "Authentication failed"
-#~ msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
-
-#~| msgid "Authentication required"
-#~ msgctxt "ClientError"
-#~ msgid "Authentication required"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#~| msgid "Repository is offline"
-#~ msgctxt "ClientError"
-#~ msgid "Repository offline"
-#~ msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
-
-#~| msgid "Permission denied"
-#~ msgctxt "ClientError"
-#~ msgid "Permission denied"
-#~ msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
-
-#~| msgid "Canceled"
-#~ msgctxt "ClientError"
-#~ msgid "Cancelled"
-#~ msgstr "ÐÑÐÐÐÐÐÐ"
-
-#~| msgid "%s: could not cancel"
-#~ msgctxt "ClientError"
-#~ msgid "Could not cancel"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
-
-#~| msgid "Protocol not supported"
-#~ msgctxt "ClientError"
-#~ msgid "Not supported"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐ"
-
-#~| msgid "Unsupported authentication method"
-#~ msgctxt "ClientError"
-#~ msgid "Unsupported authentication method"
-#~ msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
-
-#~| msgid "TLS not available"
-#~ msgctxt "ClientError"
-#~ msgid "TLS not available"
-#~ msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#~| msgid "Search size limit exceeded"
-#~ msgctxt "ClientError"
-#~ msgid "Search size limit exceeded"
-#~ msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
-
-#~| msgid "Search time limit exceeded"
-#~ msgctxt "ClientError"
-#~ msgid "Search time limit exceeded"
-#~ msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
-
-#~| msgid "Invalid query"
-#~ msgctxt "ClientError"
-#~ msgid "Invalid query"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
-
-#~| msgid "Query refused"
-#~ msgctxt "ClientError"
-#~ msgid "Query refused"
-#~ msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ"
-
-#~| msgid "I/O error"
-#~ msgctxt "ClientError"
-#~ msgid "Other error"
-#~ msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
-
-#~| msgid "Unknown error"
-#~ msgctxt "ClientError"
-#~ msgid "Unknown error"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Updating contacts cache (%d)... "
-#~ msgstr "ÐÑÐÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐÑÐ (%d)... "
-
-#~ msgid "\"%s\" on book before \"%s\""
-#~ msgstr "â%sâ Ñ ÐÑÐÐÐ ÐÑÐ â%sâ"
-
-#~ msgid "book busy"
-#~ msgstr "ÐÑÐÐÐ ÐÐÑÐÐÑÐ"
-
-#~ msgid "CORBA exception making \"%s\" call"
-#~ msgstr "CORBA ÐÐÑÐÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑ â%sâ"
-
-#~ msgid "%s: there is no current operation"
-#~ msgstr "%s: ÐÐÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#~ msgid "\"%s\" on book after \"%s\""
-#~ msgstr "â%sâ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐ â%sâ"
-
-# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
-#~ msgid "%s: canceled"
-#~ msgstr "%s: ÐÑÐÐÐÐÐÐ"
-
-#~ msgid "%s: no factories available for URI `%s'"
-#~ msgstr "%s: ÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑ â%s'"
-
-#~ msgid "%s: Could not create EBookListener"
-#~ msgstr "%s: ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ EBookListener"
-
-#~ msgid "%s: there was no self contact UID stored in gconf"
-#~ msgstr "%s: ÐÐÐÐ ÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÑÐÐÑÑÐÐ Ñ gconf"
-
-#~ msgid "Could not create thread for getting deltas"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ"
-
-#~ msgid "Offline mode unavailable"
-#~ msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#~ msgid "Could not create thread for populating cache"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÑÑÐÐÐ"
-
-#~ msgid "Reply Requested: by "
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑ: ÐÐ "
-
-#~ msgid "Reply Requested: When convenient"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑ: ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
-
-#~ msgid "Loading %s items"
-#~ msgstr "ÐÑÐÑÐÐÐÑÐ %s ÐÑÐÐÐÐÑÐ"
-
-#~ msgid "Calendar"
-#~ msgstr "ÐÐÐÐÐÐÐÑ"
-
-#~ msgid "Cannot open message"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÑ"
-
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÑÑÐÑÐ ÐÐÑÑÐÐ: ÐÐ %s"
-
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
-
-#~ msgid "Unsupported operation: count by expression: for %s"
-#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
-
-#~ msgid "Unsupported operation: search by UIDs: for %s"
-#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ: ÐÐ %s"
-
-#~ msgid "Learning junk"
-#~ msgstr "ÐÑÐÑÐ ÑÑÐ ÑÐ ÑÑÐÑÐ"
-
-#~ msgid "Learning non-junk"
-#~ msgstr "ÐÑÐÑÐ ÑÑÐ ÐÐÑÐ ÑÑÐÑÐ"
-
-#~ msgid "Canceled."
-#~ msgstr "ÐÐÑÑÑÐÑÐ."
-
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "ÐÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÐ"
-
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÑ "
-#~ "ÐÐÑÐÑÐÐÑ: %s"
-
-#~ msgid "Unable to parse message content"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
-
-#~ msgid "cannot create thread"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ"
-
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ Kerberos 4 ÐÑÐÑÐÐÐ."
-
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ Kerberos ÐÐÑÑÑ:\n"
-#~ "%s"
-
-#~ msgid "POP Before SMTP auth using a non-pop source"
-#~ msgstr "POP ÐÑÐ SMTP auth ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ pop"
-
-#~ msgid ""
-#~ "Could not create directory %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ %s:\n"
-#~ "%s"
-
-#~ msgid "Camel session doesn't support forwarding of a message."
-#~ msgstr "Camel ÑÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ."
-
-#~ msgid "import keys: unimplemented"
-#~ msgstr "ÑÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
-
-#~ msgid "export keys: unimplemented"
-#~ msgstr "ÐÐÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
-
-#~ msgid "Cannot get folder: Invalid operation on this store"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ"
-
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÑÐÐÐÐ ÐÑÑÑ ÐÐÐÐÐÐÑÐ"
-
-#~ msgid "Certificate signature failure"
-#~ msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#~ msgid "Certificate not yet valid"
-#~ msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
-
-#~ msgid "Certificate has expired"
-#~ msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÑÐÐÐÐ"
-
-#~ msgid "CRL not yet valid"
-#~ msgstr "CRL ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
-
-#~ msgid "CRL has expired"
-#~ msgstr "CRL ÑÐ ÐÑÑÐÐÐÐ"
-
-#~ msgid "Error in CRL"
-#~ msgstr "ÐÑÐÑÐÐ Ñ CRL"
-
-#~ msgid "Out of memory"
-#~ msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÑÐ"
-
-#~ msgid "Zero-depth self-signed certificate"
-#~ msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
-
-#~ msgid "Self-signed certificate in chain"
-#~ msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ Ñ ÐÐÐÑÑ"
-
-#~ msgid "Unable to get issuer's certificate locally"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
-
-#~ msgid "Unable to verify leaf signature"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑÑÐ"
-
-#~ msgid "Certificate chain too long"
-#~ msgstr "ÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
-
-#~ msgid "Certificate Revoked"
-#~ msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
-
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ (CA)"
-
-#~ msgid "Path length exceeded"
-#~ msgstr "ÐÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÑÐ"
-
-#~ msgid "Invalid purpose"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐ"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
-
-#~ msgid "Certificate rejected"
-#~ msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
-
-#~ msgid "Subject/Issuer mismatch"
-#~ msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÑÐ"
-
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "AKID/SKID ÐÐÑÐÐÐÐÑÐ"
-
-#~ msgid "AKID/Issuer serial mismatch"
-#~ msgstr "AKID/ÐÐÐÐÐÐÑ ÑÐÑÐÑÑÐÐ ÐÐÑÐÐÐÐÑÐ"
-
-#~ msgid "Error in application verification"
-#~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
-
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "ÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÐÐ %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ: %s\n"
-#~ "  %s"
-
-# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
-#~ msgid "User canceled"
-#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÑÐÐ"
-
-#~ msgid "Could not get message"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
-
-#~ msgid "Trash Folder Full. Please Empty."
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÑÐ ÐÑÐÐ. ÐÑÐÑÐÐÐÐÑÐ ÑÐ."
-
-#~ msgid "Cannot append message to folder '%s': %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: %s"
-
-#~ msgid "Cannot append message in offline mode: cache unavailable"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÑÑÐÐÐ"
-
-#~ msgid "Cannot append message in offline mode: %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: %s"
-
-#~ msgid "Checking for new mail"
-#~ msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
-
-#~ msgid "Check new messages for J_unk contents"
-#~ msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ Ñ_ÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
-
-#~ msgid "Automatically synchroni_ze account locally"
-#~ msgstr "ÐÑÑÐÐÐÑÑÐÐ Ñ_ÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ"
-
-#~ msgid "SOAP Settings"
-#~ msgstr "SOAP ÐÐÐÐÑÐÐÐÑÐ"
-
-#~ msgid "Post Office Agent SOAP _Port:"
-#~ msgstr "_ÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÑÑ:"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell GroupWise"
-
-#~ msgid "For accessing Novell GroupWise servers"
-#~ msgstr "ÐÐ ÐÑÐÑÑÑÐÐÑÐ Novell Groupwise ÑÐÑÐÐÑÐÐÐ"
-
-#~ msgid ""
-#~ "This option will connect to the GroupWise server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ GroupWise ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ "
-#~ "ÑÐÐÑÑÑ."
-
-#~ msgid "Host or user not available in url"
-#~ msgstr "ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÑÑÐÐÐ"
-
-#~ msgid ""
-#~ "Some features may not work correctly with your current server version"
-#~ msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
-
-#~ msgid "Cannot create GroupWise folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ GroupWise ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ"
-
-#~ msgid "GroupWise server %s"
-#~ msgstr "GroupWise ÑÐÑÐÐÑ %s"
-
-#~ msgid "GroupWise service for %s on %s"
-#~ msgstr "GroupWise ÑÐÑÐÐÑ ÐÐ %s ÐÐ %s"
-
-#~ msgid "GroupWise mail delivery via %s"
-#~ msgstr "GroupWise ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ %s"
-
-#~ msgid "Sending Message"
-#~ msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#~ msgid ""
-#~ "You have exceeded this account's storage limit. Your messages are queued "
-#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
-#~ "some of your mail.\n"
-#~ msgstr ""
-#~ "ÐÐÑÑÐÐÐÐ ÑÑÐ ÑÐÐÑÑÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ "
-#~ "ÐÐÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑ ÐÐÑÑÐ. ÐÐÑÐÑÐÑÐ ÐÑ ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ/ÐÑÐÐÐ "
-#~ "ÐÑÐÐÐ ÐÐÐÐÐ ÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÐ ÐÑÑÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÑÑ.\n"
-
-#~ msgid "Hula"
-#~ msgstr "ÐÑÐÐ"
-
-#~ msgid "For accessing Hula servers"
-#~ msgstr "ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÑÐÐ ÑÐÑÐÐÑÐÐÐ"
-
-#~ msgid ""
-#~ "This option will connect to the Hula server using a plaintext password."
-#~ msgstr ""
-#~ "ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ "
-#~ "ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
-
-#~ msgid "Operation cancelled"
-#~ msgstr "ÐÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ"
-
-#~ msgid "Unexpected response status '%s' after APPEND command"
-#~ msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÑÑÐÑÑÑ ÐÐÐÐÐÐÑÐ â%sââ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
-
-#~ msgid "No response on continuation after APPEND command"
-#~ msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
-
-#~ msgid "Unknown error occurred during APPEND command!"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÐ APPEND!"
-
-#~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr "ÐÑÐ_ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ"
-
-#~ msgid "SSL negotiations failed"
-#~ msgstr "SSL ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
-
-#~ msgid "Drafts"
-#~ msgstr "ÐÑÐÐÑÐÐÐ"
-
-#~ msgid "Sent"
-#~ msgstr "ÐÐÑÐÐÑÐ"
-
-#~ msgid "Templates"
-#~ msgstr "ÐÐÐÐÐÐÐ"
-
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
-
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ IMAP4 ÑÐÑÐÐÑÐ %s: %s"
-
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ IMAP ÑÐÑÐÐÑÐ: %s."
-
-#~ msgid "Cannot select folder '%s': Invalid mailbox name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot select folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
-
-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "ÐÐÐÐ ÑÐ IMAP4 ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
-
-#~ msgid ""
-#~ "Enable extended Mailing-List detection required for some filter and "
-#~ "vFolder rules"
-#~ msgstr ""
-#~ "ÐÐÐÐÑÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐ Ð "
-#~ "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÐ"
-
-#~ msgid "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÑ ÐÑÐÑÐÑÐÐÐ ÐÐ X ÑÐÐÑÐÐÐ"
-
-#~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐÑÑÐÑÐÑÐÑ ÐÐ X ÑÐÐÑÐÐÐ"
-
-#~ msgid "Cannot access folder '%s': %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
-
-#~ msgid "Cannot sync flags to folder '%s': Unknown error"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot sync flags to folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot expunge folder '%s': Unknown error"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot expunge folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
-
-#~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
-
-#~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ "
-#~ "ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ "
-#~ "ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ "
-#~ "ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ"
-
-#~ msgid "IMAP4rev1"
-#~ msgstr "IMAPv4rev1"
-
-#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
-#~ msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑÐ."
-
-#~ msgid ""
-#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ "
-#~ "ÑÐÐÑÑÑ."
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ %s Ñ ÐÐÐÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ: ÑÐÑÐÐÑ ÐÐ "
-#~ "ÐÐÐÑÐÐÐÐ STARTTLS"
-
-#~ msgid "TLS negotiations failed"
-#~ msgstr "TLS ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐ %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ %s"
-
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ LIST ÐÐÑÐÑÐÐÑÐÑÑ ÐÐ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
-
-#~ msgid "Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ"
-
-#~ msgid "Cannot create folder '%s': Invalid mailbox name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot create folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot delete folder '%s': Special folder"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot delete folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÑÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ %s ÐÐ ÐÐÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
-
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot subscribe to folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#~ msgid "Scanning for changed messages"
-#~ msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
-
-#~ msgid "IMAP server %s is in an inconsistent state."
-#~ msgstr "IMAP ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÑÐÐ."
-
-#~ msgid "Fetching envelopes of new messages"
-#~ msgstr "ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÑÑ IMAP ÑÐÑÐÐÑÐ %s: "
-
-#~ msgid "No data"
-#~ msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐ"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "ÐÐÐÐ ÑÐ IMAP ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
-
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-#~ msgstr ""
-#~ "ÐÐÑÐÐÑÐÐÐÐÑÐÐÐÐ IMAP 4(.1) ÐÐÐÑÐÐÑ\n"
-#~ "ÐÐÐ ÑÐ ÐÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐ ÐÐÐ, ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐ imap.\n"
-#~ "\n"
-#~ " !!! ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ  !!!\n"
-
-#~ msgid "Could not connect to %s (port %s): %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ %s (ÐÐÑÑ %s): %s"
-
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s"
-
-#~ msgid "Maildir append message canceled"
-#~ msgstr "ÐÑÐÐÐÐÐÑÐ maildir ÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐ"
-
-#~ msgid "Invalid message contents"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
-
-#~ msgid "Mail append canceled"
-#~ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐ"
-
-#~ msgid "Message construction failed."
-#~ msgstr "ÐÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÑÐÐÐÐ."
-
-#~ msgid "MH append message canceled"
-#~ msgstr "MH ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐ"
-
-#~ msgid "Use cancel"
-#~ msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#~ msgid "STARTTLS command failed"
-#~ msgstr "ÐÐÑÑÐÐÐÐ STARTTLS ÐÐÐÐÐÐÐ"
-
-#~ msgid "HELO command failed"
-#~ msgstr "ÐÐÑÑÐÐÐÐ HELO ÐÐÐÐÐÐÐ"
-
-#~ msgid "AUTH command failed"
-#~ msgstr "ÐÐÑÑÐÐÐÐ AUTH ÐÐÐÐÐÐÐ"
-
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÐ ÑÐÑÐÐÑÐ.\n"
-
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "ÐÐÑÑÐÐÐÐ MAIL FROM ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "ÐÐÑÑÐÐÐÐ RCPT TO ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "ÐÐÑÑÐÐÐÐ DATA ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#~ msgid "RSET command failed"
-#~ msgstr "ÐÐÑÑÐÐÐÐ RSET ÐÐÐÐÐÐÐ"
-
-#~ msgid "QUIT command failed"
-#~ msgstr "ÐÐÑÑÐÐÐÐ QUIT ÐÐÐÐÐÐÐ"
-
-#~ msgid "Item(s) belong to these _categories:"
-#~ msgstr "ÐÑÐÐÐÐÑ(Ð) ÐÑÐÐÐÐÐ(ÑÑ) ÐÐÐÐ _ÐÐÑÐÐÐÑÐÑÐÐÐ:"
-
-#~ msgid "_Edit"
-#~ msgstr "_ÐÑÐÑÐÐÐÑÐ"
-
-#~ msgid "categories"
-#~ msgstr "ÐÐÑÐÐÐÑÐÑÐ"
-
-#~ msgid "Color Info"
-#~ msgstr "ÐÐÐÐÑÐ Ð ÐÐÑÐÐÐ"
-
-#~ msgid "The color to render"
-#~ msgstr "ÐÐÑÐ ÐÐ ÐÐÑÐÐÑ"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "<b>Co_ntacts</b>"
-#~ msgstr "<b>ÐÐ_ÐÑÐÐÑÐ</b>"
-
-#~ msgid "<b>Show Contacts</b>"
-#~ msgstr "<b>ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ</b>"
-
-#~ msgid "Enter password for %s"
-#~ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
-
-#~ msgid "Enter password"
-#~ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
-
-#~ msgid "Owner"
-#~ msgstr "ÐÐÐÑÐÐÐ"
-
-#~ msgid "Publishing Editor"
-#~ msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
-
-#~ msgid "Editor"
-#~ msgstr "ÐÑÐÑÐÐÐÑ"
-
-#~ msgid "Publishing Author"
-#~ msgstr "ÐÑÑÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
-
-#~ msgid "Author"
-#~ msgstr "ÐÑÑÐÑ"
-
-#~ msgid "Non-editing Author"
-#~ msgstr "ÐÑÑÐÑ ÐÐÑÐ ÐÐ ÑÑÐÑÑÑÐ"
-
-#~ msgid "Reviewer"
-#~ msgstr "ÐÐÑÐÐÐÐÐÑ"
-
-#~ msgid "Contributor"
-#~ msgstr "ÐÐÑÐÐÐÐÐ"
-
-#~ msgid "None"
-#~ msgstr "ÐÐÑÑÐ"
-
-#~ msgid "Custom"
-#~ msgstr "ÐÑÐÐÐÐÐÑÐÐÐ"
-
-#~ msgid "Generic error"
-#~ msgstr "ÐÐÑÑÐ ÐÑÐÑÐÐ"
-
-#~ msgid "A folder with the same name already exists"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
-
-#~ msgid "The specified folder type is not valid"
-#~ msgstr "ÐÐÐÐÐÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
-
-#~ msgid "Not enough space to create the folder"
-#~ msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "The folder is not empty"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐ"
-
-#~ msgid "The specified folder was not found"
-#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ"
-
-#~ msgid "Function not implemented in this storage"
-#~ msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ"
-
-#~ msgid "Operation not supported"
-#~ msgstr "ÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
-
-#~ msgid "The specified type is not supported in this storage"
-#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
-
-#~ msgid "The specified folder cannot be modified or removed"
-#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ"
-
-#~ msgid "Cannot make a folder a child of one of its descendants"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ Ñ ÑÐÑ ÑÐÐÐÑ"
-
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐÐÐÐ"
-
-#~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "ÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "%s's Folders"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐ %s"
-
-#~ msgid "Personal Folders"
-#~ msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Favorite Public Folders"
-#~ msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "All Public Folders"
-#~ msgstr "ÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Global Address List"
-#~ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÐÑÐ"
-
-#~ msgid "Deleted Items"
-#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ"
-
-#~ msgid "Journal"
-#~ msgstr "ÐÐÐÐÐÐÐ"
-
-#~ msgid "Notes"
-#~ msgstr "ÐÐÐÐÑÐÐ"
-
-#~ msgid "Outbox"
-#~ msgstr "ÐÐÐÐÐÐÐ"
-
-#~ msgid "Sent Items"
-#~ msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐÐÑÐ"
-
-#~ msgid "Tasks"
-#~ msgstr "ÐÐÐÑÐÐÑÐ"
-
-#~ msgid "Invalid connection"
-#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
-
-#~ msgid "No response from the server"
-#~ msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑÐ"
-
-#~ msgid "Bad parameter"
-#~ msgstr "ÐÐÑ ÐÐÑÐÐÐÑÐÑ"
-
-#~ msgid "Evolution Addressbook file backend"
-#~ msgstr "ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
-
-#~ msgid "Evolution Calendar file and webcal backend"
-#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ Ð webcal ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
-
-#~ msgid "Evolution Data Server interface check service"
-#~ msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÐÐÑÑ ÑÑÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Evolution Data Server logging service"
-#~ msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
-
-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr ""
-#~ "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÑÐ; ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ "
-#~ "ÐÑÐÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐ\n"
-
-#~ msgid "Fair"
-#~ msgstr "ÐÐÑÑÐ"
-
-#~ msgid "Snow showers"
-#~ msgstr "ÐÐÑÐÐÐ"
-
-#~ msgid "Snow"
-#~ msgstr "ÐÐÐÐ"
-
-#~ msgid "Partly cloudy"
-#~ msgstr "ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
-
-#~ msgid "Smoke"
-#~ msgstr "ÐÐÐ"
-
-#~ msgid "Thunderstorms"
-#~ msgstr "ÐÑÐÑÐÐÐÐÐ"
-
-#~ msgid "Cloudy"
-#~ msgstr "ÐÐÐÐÑÐÐ"
-
-#~ msgid "Drizzle"
-#~ msgstr "ÐÐÐÐÐ ÐÐÑÐ"
-
-#~ msgid "Sunny"
-#~ msgstr "ÐÑÐÑÐÐÐ"
-
-#~ msgid "Dust"
-#~ msgstr "ÐÑÐÑÐÐÐ"
-
-#~ msgid "Clear"
-#~ msgstr "ÐÐÐÑÐ"
-
-#~ msgid "Mostly cloudy"
-#~ msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
-
-#~ msgid "Windy"
-#~ msgstr "ÐÐÑÑÐÐÐÑÐ"
-
-#~ msgid "Rain showers"
-#~ msgstr "ÐÐÐÐ ÐÐÑÐ"
-
-#~ msgid "Foggy"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#~ msgid "Rain/snow mixed"
-#~ msgstr "ÐÐÑÐ Ð ÑÐÐÐ"
-
-#~ msgid "Sleet"
-#~ msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐ ÑÐÐÐÐÐ"
-
-#~ msgid "Very hot/humid"
-#~ msgstr "ÐÐÐÐÐ ÑÐÐÐÐ/ÐÐÐÐÐÐ"
-
-#~ msgid "Blizzard"
-#~ msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ"
-
-#~ msgid "Freezing rain"
-#~ msgstr "ÐÐÐÐÐÐ ÐÐÑÐ"
-
-#~ msgid "Haze"
-#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#~ msgid "Blowing snow"
-#~ msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐ"
-
-#~ msgid "Freezing drizzle"
-#~ msgstr "ÐÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐ"
-
-#~ msgid "Very cold/wind chill"
-#~ msgstr "ÐÐÐÐÐ ÑÐÐÐÐÐ/ÐÐÑÑÐÐÐÑÐ"
-
-#~ msgid "Rain"
-#~ msgstr "ÐÐÑÐ"
-
-#~ msgid "Weather: Partly Cloudy"
-#~ msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
-
-#~ msgid "%.1fÂC - %s"
-#~ msgstr "%.1fÂC - %s"
-
-#~ msgid "%.1fÂF - %s"
-#~ msgstr "%.1fÂF - %s"
-
-#~ msgid "%.1f/%.1fÂC - %s"
-#~ msgstr "%.1f/%.1fÂC - %s"
-
-#~ msgid "%.1f/%.1fÂF - %s"
-#~ msgstr "%.1f/%.1fÂF - %s"
-
-#~ msgid "%d%% chance of precipitation\n"
-#~ msgstr "ÑÐÐÑÐ ÐÐ %d%% ÐÐ ÐÐÐÐÐÐÐÐ\n"
-
-#~ msgid "%.1fcm snow\n"
-#~ msgstr "%.1fcm ÑÐÐÐ\n"
-
-#~ msgid "%.1fin snow\n"
-#~ msgstr "%.1fin ÑÐÐÐ\n"
-
-#~ msgid "%.1f-%.1fcm snow\n"
-#~ msgstr "%.1f-%.1fcm ÑÐÐÐ\n"
-
-#~ msgid "%.1f-%.1fin snow\n"
-#~ msgstr "%.1f-%.1fin ÑÐÐÐ\n"
-
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ â%sâ: %s"
-
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÑÑ: %s"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "ÐÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐ, ÐÑÐÑÐÐ %d"
-
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ â%sâ"
-
-#~ msgid "%sPlease enter the GroupWise password for %s %s"
-#~ msgstr "%sÐÐÐÑÐÑÐ Groupwise ÐÐÐÐÐÐÑ ÐÐ %s %s"
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐ Ð ÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÑ ÐÐÐÑÐÐÑÐÐÐ."
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÑÑÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÑÐÐ %d Ð %d"
-
-#~ msgid "%sPlease enter the IMAP password for %s %s"
-#~ msgstr "%sÐÐÐÑÐÑÐ IMAP ÐÐÐÐÐÐÑ ÐÐ %s %s"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sÐÐÐÑÐÑÐ IMAP ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ %s ÐÐ ÐÐÐÐÑÐÐÑ %s"
-
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÑÐÐÐÐÐÐ: %s: %s"
-
-#~ msgid "Please enter the NNTP password for %s %s"
-#~ msgstr "ÐÐÐÑÐÑÐ NNTP ÐÐÐÐÐÐÑ ÐÐ %s %s"
-
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sÐÐÐÑÐÑÐ SMTP ÐÐÐÐÐÐÑ ÐÐ %s ÐÐ ÐÐÐÐÑÐÐÑ %s"
-
-#~ msgid "Category _Color"
-#~ msgstr "_ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
-
-#~ msgid "Select User"
-#~ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐ"
-
-#~ msgid "Addressbook..."
-#~ msgstr "ÐÐÑÐÑÐÑ..."
-
-#~ msgid "\t\t\t\t\t\t"
-#~ msgstr "\t\t\t\t\t\t"
-
-#~ msgid "Cannot get folder info in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot delete GroupWise folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "Cannot rename GroupWise folders in offline mode."
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#~ msgid "%sEnter password for %s"
-#~ msgstr "%sÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
-
-#~ msgid ""
-#~ "Could not authenticate to server. (Password incorrect?)\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑ. (ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ?)\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Could not authenticate to server.\n"
-#~ "\n"
-#~ "This probably means that your server requires you\n"
-#~ "to specify the Windows domain name as part of your\n"
-#~ "username (eg, \"DOMAIN\\user\").\n"
-#~ "\n"
-#~ "Or you might have just typed your password wrong.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑ.\n"
-#~ "\n"
-#~ "ÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐ ÐÐ ÑÐ ÑÐÑÐÐÑÑ ÐÐÑÑÐÐÐÐ ÐÐ\n"
-#~ "ÐÐÐÐÐÐÑÐ ÐÐÐ Windows ÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ\n"
-#~ "ÐÐÐÐÐ (ÐÐÑ. âÐÐÐÐÐ\\ÐÐÑÐÑÐÐÐ\").\n"
-#~ "ÐÐÐ ÑÑÐ ÐÐÐÐÐ ÑÐÐÐ ÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÑ.\n"
-#~ "\n"
-
-#~ msgid "Mailbox for %s is not on this server."
-#~ msgstr "Mailbox ÐÐ %s ÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ."
-
-#~ msgid ""
-#~ "The server '%s' is running Exchange 5.5 and is\n"
-#~ "therefore not compatible with Ximian Connector"
-#~ msgstr ""
-#~ "ÐÐÑÐÐÑ '%s' ÐÐÑÐÑÑÐ Exchange 5.5 Ð ÑÑÐÐÐ\n"
-#~ "ÐÐÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐ Ximian Connector-ÐÐ"
-
-#~ msgid ""
-#~ "Could not find Exchange Web Storage System at %s.\n"
-#~ "If OWA is running on a different path, you must specify that in the\n"
-#~ "account configuration dialog."
-#~ msgstr ""
-#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ Exchange Web Storage System ÐÐ %s.\n"
-#~ "ÐÐÐÐÐÐÐ OWA ÑÐÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÑÐÑÐ, ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÑÐ Ñ\n"
-#~ "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐ."
-
-#~ msgid "No mailbox for user %s on %s.\n"
-#~ msgstr "ÐÐÐÐ mailbox-Ð ÐÐ ÐÐÑÐÑÐÐÐÐ %s ÐÐ %s.\n"
-
-#~ msgid "Could not connect to server %s: %s"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ %s: %s"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ"
-
-#~ msgid "Network error"
-#~ msgstr "ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ"
-
-#~ msgid "Folder Name"
-#~ msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Folder Size"
-#~ msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#~ msgid "Groupwise server %s"
-#~ msgstr "GroupWise ÑÐÑÐÐÑ %s"
-
-#~ msgid "e_book_open: cancelled"
-#~ msgstr "e_book_open: ÐÑÐÐÐÐÐ"
-
-#~ msgid "e_book_load_uri: no factories available for uri `%s'"
-#~ msgstr "e_book_load_uri: ÐÐÐÐ ÐÐÑÑÑÐÐÐÑ ÑÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
-
-#~ msgid "File As"
-#~ msgstr "ÐÐÐÐÐÐ ÐÐÐ"
-
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ GPG %s: %s\n"
-
-#~ msgid "Address Book and Calendar"
-#~ msgstr "ÐÐÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÑ"
-
-#~ msgid "Post Office Agent:"
-#~ msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑÑ:"
-
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÑ ÐÐÐÑ (SSL)"
-
-#~ msgid "Checklist"
-#~ msgstr "ÐÐÐÑÐÐ ÐÐ ÐÐÐÑÑ"
-
-#~ msgid "Server rejected username"
-#~ msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÑ"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ/ÐÐÐÐÐÐÑ"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐ ÑÐÑÐÐÑÐ."
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÑÑÐÐ ÐÐ %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÑÑÐÐ ÐÐ %s: %s"
-
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ Ð LDAP ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
-
-#~ msgid "uid? expects 1 argument"
-#~ msgstr "uid? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
-
-#~ msgid "uid? expects argument 1 to be a string"
-#~ msgstr "uid? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÑÐÐ"
-
-#~ msgid "e_book_add_contact called on book before e_book_load_uri"
-#~ msgstr "ÐÐÐÐÐÐ ÑÐ e_book_add_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::addContact call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::addContact"
-
-#~ msgid "e_book_commit_contact called on book before e_book_load_uri"
-#~ msgstr "ÐÐÐÐÐÐ ÑÐ e_book_commit_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::modifyContact call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::modifyContact"
-
-#~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_fields ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getSupportedFields call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getSupportedFields"
-
-#~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_auth_methods ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getSupportedAuthMethods call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getSupportedAuthMethods"
-
-#~ msgid "e_book_authenticate_user on book before e_book_load_uri"
-#~ msgstr "e_book_authenticate_user ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::authenticateUser call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::authenticateUser"
-
-#~ msgid "e_book_get_contact on book before e_book_load_uri"
-#~ msgstr "e_book_get_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getContact call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getContact"
-
-#~ msgid "e_book_remove_contact on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "e_book_remove_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contacts ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::removeContacts call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::removeContacts"
-
-#~ msgid "e_book_get_book_view on book before e_book_load_uri"
-#~ msgstr "e_book_get_book_view ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getBookView call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getBookView"
-
-#~ msgid "e_book_get_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_get_contacts ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getContactList call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getContactList"
-
-#~ msgid "e_book_get_changes on book before e_book_load_uri"
-#~ msgstr "e_book_get_changes ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getChanges call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getChanges"
-
-#~ msgid "Corba exception making Book::cancelOperation call"
-#~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::cancelOperation"
+#: ../libedataserverui/e-source-selector-dialog.c:326
+msgid "Select destination"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
 
-#~ msgid "e_book_remove on book before e_book_load_uri"
-#~ msgstr "e_book_remove ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "ÐÐÐÐÐÐÐÑ"
 
-#~ msgid "time-now expects 0 arguments"
-#~ msgstr "ÐÑÐÐÐ-ÑÐÐÐ ÐÑÐÐÑÑÐ 0 ÐÑÐÑÐÐÐÐÑÐ"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "ÐÐÐ: %u â ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐ ÑÐÑÐÐÑÐ"
 
-#~ msgid "make-time expects argument 1 to be a string"
-#~ msgstr "ÑÐÐÑÐ-ÐÑÐÐÐ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ ÐÐÐ"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÑÐÐÐÐÑÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ"
 
-#~ msgid "time-add-day expects 2 arguments"
-#~ msgstr "ÐÐÐÐÑ-ÐÑÐÐÐ ÐÑÐÐÑÑÐ 2 ÐÑÐÑÐÐÐÑÐ"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
 
-#~ msgid "time-day-begin expects 1 argument"
-#~ msgstr "ÐÑÐÐÐ-ÐÐÑÐÑÐÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐ"
 
-#~ msgid "time-day-begin expects argument 1 to be a time_t"
-#~ msgstr "ÐÑÐÐÐ-ÐÐÑÐÑÐÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÐÐ"
 
-#~ msgid "time-day-end expects 1 argument"
-#~ msgstr "ÐÑÐÐÐ-ÐÑÐÑÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÑÑ Ð ÐÐÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑÐÐÐÑÐ"
 
-#~ msgid "occur-in-time-range? expects 2 arguments"
-#~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ 2 ÐÑÐÑÐÐÐÑÐ"
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "ÐÐÐÑÐÐÑÐ"
 
-#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
-#~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
+#: ../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 "ÐÐÑÑÐÐÑÐ ÐÐ ÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ"
 
-#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
-#~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 2 ÐÑÐÐ time_t"
+#: ../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 "ÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#~ msgid "has-recurrences? expects no arguments"
-#~ msgstr "ÐÐÐÐÐÑÐ-ÑÐ? ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
+#: ../tests/libedataserverui/evolution-source-viewer.c:569
+msgid "Evolution Source Viewer"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#~ msgid "is-completed? expects 0 arguments"
-#~ msgstr "ÑÐ-ÐÐÑÐÐ? ÐÑÐÐÑÑÐ 0 ÐÑÐÑÐÐÐÐÑÐ"
+#: ../tests/libedataserverui/evolution-source-viewer.c:598
+msgid "Display Name"
+msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#~ msgid "completed-before? expects 1 argument"
-#~ msgstr "ÐÐÑÐÐ-ÐÑÐ? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+#: ../tests/libedataserverui/evolution-source-viewer.c:607
+msgid "Flags"
+msgstr "ÐÐÑÐÑÐ"
 
-#~ msgid "completed-before? expects argument 1 to be a time_t"
-#~ msgstr "ÐÐÑÐÐ-ÐÑÐ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
+#: ../tests/libedataserverui/evolution-source-viewer.c:635
+msgid "Identity"
+msgstr "ÐÐÐÐÑÐÑÐÑ"
diff --git a/po/sr latin po b/po/sr latin po
index a3f554f..b02cbf4 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-02-17 15:28+0000\n"
-"PO-Revision-Date: 2012-02-19 14:34+0200\n"
+"POT-Creation-Date: 2012-07-24 15:17+0000\n"
+"PO-Revision-Date: 2012-07-24 23:05+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -21,130 +21,127 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:125
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:545
-#: ../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
+#: ../addressbook/backends/file/e-book-backend-file.c:116
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../addressbook/libebook/e-book-client.c:106
+#: ../addressbook/libedata-book/e-data-book.c:432
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:596
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
+#: ../calendar/libecal/e-cal.c:4032 ../calendar/libecal/e-cal-client.c:148
+#: ../camel/camel-imapx-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:521
 #: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:161
+#: ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "Nepoznata greÅka"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:150
+#: ../addressbook/backends/file/e-book-backend-file.c:141
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Nisam uspeo da uklonim datoteku â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:173
+#: ../addressbook/backends/file/e-book-backend-file.c:164
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Nisam uspeo da napravim direktorijum â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:468
+#: ../addressbook/backends/file/e-book-backend-file.c:459
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Nisam uspeo da napravim Ävrstu vezu za izvor â%sâ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/file/e-book-backend-file.c:1125
+#: ../addressbook/backends/file/e-book-backend-file.c:561
+#: ../addressbook/backends/file/e-book-backend-file.c:1127
 msgid "No UID in the contact"
 msgstr "Nema JIB-a u kontaktu"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1559
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
+#: ../addressbook/backends/file/e-book-backend-file.c:1569
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:508
 msgid "Loading..."
 msgstr "UÄitavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1562
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4866
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
+#: ../addressbook/backends/file/e-book-backend-file.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4886
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
 msgid "Searching..."
 msgstr "PretraÅujem..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#: ../addressbook/backends/file/e-book-backend-file.c:2115
 #, c-format
 msgid "Failed to build summary for an address book %s"
 msgstr "Nisam uspeo da izgradim saÅetak za adresar â%sâ"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:831
+#: ../addressbook/backends/google/e-book-backend-google.c:709
 msgid "Querying for updated contactsâ"
-msgstr "Propitujem za aÅuriranim kontaktima..."
-
-#: ../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 "LiÄno"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:882
-msgid "Friends"
-msgstr "Prijatelji"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:884
-msgid "Family"
-msgstr "Porodica"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:886
-msgid "Coworkers"
-msgstr "Saradnici"
+msgstr "Propitujem za aÅuriranim kontaktimaâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:970
+#: ../addressbook/backends/google/e-book-backend-google.c:843
 msgid "Querying for updated groupsâ"
-msgstr "Propitujem za aÅuriranim grupama..."
+msgstr "Propitujem za aÅuriranim grupamaâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+#: ../addressbook/backends/google/e-book-backend-google.c:1275
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1655
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
 msgid "The backend does not support bulk additions"
 msgstr "Pozadinac ne podrÅava grupno dodavanje"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1389
+#: ../addressbook/backends/google/e-book-backend-google.c:1307
 msgid "Creating new contactâ"
-msgstr "Stvaram novi kontakt..."
+msgstr "Stvaram novi kontaktâ"
 
-#: ../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
+#: ../addressbook/backends/google/e-book-backend-google.c:1396
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
 msgid "The backend does not support bulk removals"
 msgstr "Pozadinac ne podrÅava grupno uklanjanje"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1504
+#: ../addressbook/backends/google/e-book-backend-google.c:1424
 msgid "Deleting contactâ"
-msgstr "BriÅem kontakt..."
+msgstr "BriÅem kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1749
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
+#: ../addressbook/backends/google/e-book-backend-google.c:1674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
 msgid "The backend does not support bulk modifications"
 msgstr "Pozadinac ne podrÅava grupno ureÄivanje"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1782
+#: ../addressbook/backends/google/e-book-backend-google.c:1712
 msgid "Modifying contactâ"
-msgstr "Menjam kontakt..."
+msgstr "Menjam kontaktâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1983
+#: ../addressbook/backends/google/e-book-backend-google.c:1895
 msgid "Loadingâ"
-msgstr "UÄitavam..."
+msgstr "UÄitavamâ"
+
+#: ../addressbook/backends/google/e-book-google-utils.c:1557
+msgid "Personal"
+msgstr "LiÄno"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1558
+msgid "Friends"
+msgstr "Prijatelji"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2108
-msgid "Authenticating with the serverâ"
-msgstr "PotvrÄujem identitet sa serverom..."
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1559
+msgid "Family"
+msgstr "Porodica"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1560
+msgid "Coworkers"
+msgstr "Saradnici"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
 msgid "Not connected"
 msgstr "Nisam povezan"
 
@@ -156,916 +153,929 @@ msgstr "Koristim istaknuto ime (DN)"
 msgid "Using Email Address"
 msgstr "KoriÅÄenje elektronske adrese"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1090
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovo se povezujem na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1216
 msgid "Invalid DN syntax"
 msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1754
 msgid "Adding contact to LDAP server..."
 msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1885
 msgid "Removing contact from LDAP server..."
 msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2334
 msgid "Modifying contact from LDAP server..."
 msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4716
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4736
 msgid "Receiving LDAP search results..."
 msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4887
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4907
 msgid "Error performing search"
 msgstr "GreÅka tokom pretrage"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5008
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5028
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5567
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "Nije uspelo stvaranje resursa â%sâ sa HTTP stanjem: %d (%s)"
+msgid "Failed to get the DN for user '%s'"
+msgstr "Nisam uspeo da dobavim DN za korisnika â%sâ"
 
-#: ../addressbook/libebook/e-book.c:3196
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: nema izvora za jib â%sâ smeÅtenog u Gkonfu."
-
-#: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1910
-msgid "On This Computer"
-msgstr "Na ovom raÄunaru"
-
-#: ../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 "Adresar ne postoji"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Nije uspelo stvaranje resursa â%sâ sa HTTP stanjem: %d (%s)"
 
-#: ../addressbook/libebook/e-book-client.c:92
+#: ../addressbook/libebook/e-book-client.c:95
 msgid "No such book"
 msgstr "Nema takvog adresara"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libedata-book/e-data-book.c:306
 msgid "Contact not found"
 msgstr "Kontakt nije pronaÄen"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:307
 msgid "Contact ID already exists"
 msgstr "IB kontakta veÄ postoji"
 
-#: ../addressbook/libebook/e-book-client.c:98
+#: ../addressbook/libebook/e-book-client.c:101
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "No space"
 msgstr "Nema prostora"
 
-#: ../addressbook/libebook/e-book-client.c:512
+#: ../addressbook/libebook/e-book-client.c:488
 msgid "Failed to run book factory"
 msgstr "Nisam uspeo da pokrenem pogon adresara"
 
-#: ../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 "Neispravan izvor"
-
-#: ../addressbook/libebook/e-book-client.c:624
-#: ../calendar/libecal/e-cal-client.c:725
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "PogreÅna adresa â%sâ"
-
-#: ../addressbook/libebook/e-book-client.c:662
-msgid "Failed to find system book"
-msgstr "Nisam uspeo da pronaÄem adresar sistema"
-
-#: ../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 "Nema izvora za JIB â%sâ saÄuvanog u spisku izvora."
-
-#: ../addressbook/libebook/e-book-client.c:2563
-#: ../calendar/libecal/e-cal-client.c:4480
+#: ../addressbook/libebook/e-book-client.c:2282
+#: ../calendar/libecal/e-cal-client.c:4640
 msgid "Cannot get connection to view"
 msgstr "Ne mogu da dobijem vezu za pregled"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Unique ID"
 msgstr "Jedinstveni IB"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:120
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook/e-contact.c:126
 msgid "File Under"
 msgstr "Smesti pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:122
-msgid "Book URI"
-msgstr "Adresa adresara"
+#: ../addressbook/libebook/e-contact.c:128
+msgid "Book UID"
+msgstr "Putanja adresara"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Full Name"
-msgstr "Puno ime"
+msgstr "Ime i prezime"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Email 1"
 msgstr "1Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Email 2"
 msgstr "2Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Email 3"
 msgstr "3Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Email 4"
 msgstr "4Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Mailer"
 msgstr "PoÅiljalac"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Address Label"
 msgstr "Oznaka kuÄne adrese"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Work Address Label"
 msgstr "Oznaka adrese na poslu"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Other Address Label"
 msgstr "Oznaka druge adrese"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Assistant Phone"
 msgstr "Telefon pomoÄnika"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Business Phone 2"
 msgstr "2Â telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Business Fax"
-msgstr "Poslovni faks"
+msgstr "Faks na poslu"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Callback Phone"
 msgstr "Telefon za pozivanje"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Company Phone"
 msgstr "Telefon preduzeÄa"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Home Phone"
 msgstr "KuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Home Phone 2"
 msgstr "2Â kuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Home Fax"
 msgstr "KuÄni faks"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:163
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Pager"
 msgstr "PejdÅer"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:172
 msgid "TTY"
-msgstr "TTY"
+msgstr "TTV"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Organizational Unit"
 msgstr "Organizaciona jedinica"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Title"
 msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Assistant"
 msgstr "PomoÄnik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Homepage URL"
 msgstr "LiÄna stranica"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Weblog URL"
 msgstr "Adresa veb dnevnika"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:182
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Free/Busy URL"
 msgstr "Adresa za slobodno/zauzeto"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICS Calendar"
 msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:194
 msgid "Video Conferencing URL"
 msgstr "Adresa video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:197
 msgid "Spouse's Name"
 msgstr "Ime supruÅnika"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:198
 msgid "Note"
 msgstr "Napomena"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:201
 msgid "AIM Home Screen Name 1"
 msgstr "1Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:202
 msgid "AIM Home Screen Name 2"
 msgstr "2Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:203
 msgid "AIM Home Screen Name 3"
 msgstr "3Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:204
 msgid "AIM Work Screen Name 1"
 msgstr "1Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:205
 msgid "AIM Work Screen Name 2"
 msgstr "2Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:206
 msgid "AIM Work Screen Name 3"
 msgstr "3Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:207
 msgid "GroupWise Home Screen Name 1"
 msgstr "1Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:208
 msgid "GroupWise Home Screen Name 2"
 msgstr "2Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:209
 msgid "GroupWise Home Screen Name 3"
 msgstr "3Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:210
 msgid "GroupWise Work Screen Name 1"
 msgstr "1Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:211
 msgid "GroupWise Work Screen Name 2"
 msgstr "2Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:212
 msgid "GroupWise Work Screen Name 3"
 msgstr "3Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Jabber Home ID 1"
 msgstr "1Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Jabber Home ID 2"
 msgstr "2Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Jabber Home ID 3"
 msgstr "3Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Jabber Work ID 1"
 msgstr "1Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Jabber Work ID 2"
 msgstr "2Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Jabber Work ID 3"
 msgstr "3Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:219
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:220
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:221
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:222
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:224
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:225
 msgid "MSN Home Screen Name 1"
 msgstr "1Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:226
 msgid "MSN Home Screen Name 2"
 msgstr "2Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:227
 msgid "MSN Home Screen Name 3"
 msgstr "3Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:228
 msgid "MSN Work Screen Name 1"
 msgstr "1Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:229
 msgid "MSN Work Screen Name 2"
 msgstr "2Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:230
 msgid "MSN Work Screen Name 3"
 msgstr "3Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:231
 msgid "ICQ Home ID 1"
 msgstr "1Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:232
 msgid "ICQ Home ID 2"
 msgstr "2Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:233
 msgid "ICQ Home ID 3"
 msgstr "3Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:234
 msgid "ICQ Work ID 1"
 msgstr "1Â poslovni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:235
 msgid "ICQ Work ID 2"
 msgstr "2Â poslovni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:236
 msgid "ICQ Work ID 3"
 msgstr "3Â poslovni ICKu IB"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Last Revision"
 msgstr "Poslednja revizija"
 
-#: ../addressbook/libebook/e-contact.c:234
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name or Org"
 msgstr "Ime ili org."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Address List"
 msgstr "Razne adrese"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Home Address"
 msgstr "KuÄna adresa"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Category List"
 msgstr "Spisak kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Photo"
 msgstr "Slika"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:249
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Email List"
 msgstr "Spisak el. adresa"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:264
 msgid "AIM Screen Name List"
 msgstr "Spisak AIM nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:265
 msgid "GroupWise ID List"
 msgstr "Spisak GroupVajz naloga"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Jabber ID List"
 msgstr "Spisak DÅaber naloga"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Yahoo! Screen Name List"
 msgstr "Spisak Jahu! nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:268
 msgid "MSN Screen Name List"
 msgstr "Spisak MSN nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:269
 msgid "ICQ ID List"
 msgstr "Spisak ICKu naloga"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Wants HTML Mail"
 msgstr "Åeli HTML poÅtu"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook/e-contact.c:276
 msgid "List"
 msgstr "Spisak"
 
-#: ../addressbook/libebook/e-contact.c:263
-msgid "List Show Addresses"
-msgstr "Spisak prikazanih adresa"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook/e-contact.c:281
+msgid "List Shows Addresses"
+msgstr "Spisak prikazuje adrese"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Birth Date"
 msgstr "RoÄendan"
 
-#: ../addressbook/libebook/e-contact.c:266
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
 msgid "Anniversary"
 msgstr "GodiÅnjica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:287
 msgid "X.509 Certificate"
 msgstr "X.509 uverenje"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Gadu-Gadu Home ID 1"
 msgstr "1Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Gadu-Gadu Home ID 2"
 msgstr "2Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:291
 msgid "Gadu-Gadu Home ID 3"
 msgstr "3Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:292
 msgid "Gadu-Gadu Work ID 1"
 msgstr "1Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:293
 msgid "Gadu-Gadu Work ID 2"
 msgstr "2Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Gadu-Gadu Work ID 3"
 msgstr "3Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Gadu-Gadu ID List"
 msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:302
 msgid "Skype Home Name 1"
 msgstr "1Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:303
 msgid "Skype Home Name 2"
 msgstr "2Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:304
 msgid "Skype Home Name 3"
 msgstr "3Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:305
 msgid "Skype Work Name 1"
 msgstr "1Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:306
 msgid "Skype Work Name 2"
 msgstr "2Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:307
 msgid "Skype Work Name 3"
 msgstr "3Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:308
 msgid "Skype Name List"
 msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:310
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:312
 msgid "Google Talk Home Name 1"
 msgstr "1Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:313
 msgid "Google Talk Home Name 2"
 msgstr "2Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:314
 msgid "Google Talk Home Name 3"
 msgstr "3Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:315
 msgid "Google Talk Work Name 1"
 msgstr "1Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:316
 msgid "Google Talk Work Name 2"
 msgstr "2Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:317
 msgid "Google Talk Work Name 3"
 msgstr "3Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:318
 msgid "Google Talk Name List"
 msgstr "Spisak imena Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:1601
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "Spisak Tviter imena"
+
+#: ../addressbook/libebook/e-contact.c:1623
+#: ../addressbook/libebook/e-destination.c:879
 msgid "Unnamed List"
 msgstr "Neimenovani spisak"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
 msgid "Cannot process, book backend is opening"
 msgstr "Ne mogu da obradim, pozadinac adresara se otvara"
 
-#: ../addressbook/libedata-book/e-book-backend.c:87
+#: ../addressbook/libedata-book/e-book-backend.c:90
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Nepoznato svojstvo adresara â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
+#: ../addressbook/libedata-book/e-book-backend.c:107
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "Ne mogu da izmenim vrednost svojstva adresara â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
 #: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Kontakt â%sâ nije pronaÄen"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:214
+#: ../addressbook/libedata-book/e-data-book.c:724
 msgid "Invalid query: "
 msgstr "Neispravan upit: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Success"
 msgstr "UspeÅno"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4565 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:303
+#: ../calendar/libecal/e-cal.c:4000 ../calendar/libedata-cal/e-data-cal.c:416
+#: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "Pozadinac je zauzet"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
 msgid "Repository offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4579 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:134
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4014 ../calendar/libedata-cal/e-data-cal.c:418
+#: ../libedataserver/e-client.c:138
 msgid "Permission denied"
-msgstr "Zabranjen pristup"
+msgstr "Pristup je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Authentication Required"
-msgstr "Potrebna je autentifikacija"
+msgstr "Potrebna je prijava"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Unsupported field"
 msgstr "NepodrÅano polje"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
 msgid "Unsupported authentication method"
 msgstr "NepodrÅan naÄin autentifikacije"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
 msgid "TLS not available"
 msgstr "TLS nije dostupan"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "Adresar ne postoji"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
 msgid "Book removed"
 msgstr "Knjiga je uklonjena"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Not available in offline mode"
 msgstr "Nije dostupno u reÅimu van mreÅe"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
 msgid "Search size limit exceeded"
 msgstr "PremaÅena veliÄina pretrage"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
 msgid "Search time limit exceeded"
 msgstr "Isteklo vreme za pretragu"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
 msgid "Invalid query"
 msgstr "Neispravan upit"
 
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
 msgid "Query refused"
 msgstr "Upit je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
 msgid "Could not cancel"
 msgstr "Ne mogu da otkaÅem"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid server version"
 msgstr "Neispravna verzija servera"
 
-#: ../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"
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libecal/e-cal.c:3998 ../calendar/libedata-cal/e-data-cal.c:439
+#: ../libedataserver/e-client.c:120
+msgid "Invalid argument"
 msgstr "Neispravan argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4602 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4037 ../calendar/libedata-cal/e-data-cal.c:441
+#: ../libedataserver/e-client.c:144
 msgid "Not supported"
 msgstr "Nije podrÅan"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
 msgid "Backend is not opened yet"
 msgstr "Pozadinac nije otvoren joÅ uvek"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal-client.c:619
+#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "Druga greÅka"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:909
 msgid "Cannot get contact: "
 msgstr "Ne mogu da dobijem kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../addressbook/libedata-book/e-data-book.c:567
+#: ../addressbook/libedata-book/e-data-book.c:592
 msgid "Empty query: "
 msgstr "Prazan upit: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../addressbook/libedata-book/e-data-book.c:617
+#: ../addressbook/libedata-book/e-data-book.c:1007
 msgid "Cannot add contact: "
 msgstr "Ne mogu da dodam kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot modify contacts: "
 msgstr "Ne mogu da izmenim kontakte: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-msgid "Cannot authenticate user: "
-msgstr "Ne mogu da potvrdim identitet korisnika: "
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
+#: ../addressbook/libedata-book/e-data-book.c:796
 msgid "Cannot open book: "
 msgstr "Ne mogu da otvorim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../addressbook/libedata-book/e-data-book.c:812
 msgid "Cannot remove book: "
 msgstr "Ne mogu da uklonim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
+#: ../addressbook/libedata-book/e-data-book.c:839
 msgid "Cannot refresh address book: "
 msgstr "Ne mogu da osveÅim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../addressbook/libedata-book/e-data-book.c:865
 msgid "Cannot get backend property: "
 msgstr "Ne mogu da dobavim svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
 msgid "Cannot set backend property: "
 msgstr "Ne mogu da postavim svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:927
 msgid "Cannot get contact list: "
 msgstr "Ne mogu da dobavim spisak kontakta: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list uids: "
 msgstr "Ne mogu da dobavim jib-ove spiska kontakata: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
 msgid "Cannot remove contacts: "
 msgstr "Ne mogu da uklonim kontakte: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "Nema naziva pozadinca u izvoru â%sâ"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
 #, c-format
-msgid "Empty URI"
-msgstr "Prazna afresa"
+msgid "Invalid backend name '%s' in source '%s'"
+msgstr "Neispravan naziv pozadinca â%sâ u izvoru â%sâ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
+#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../calendar/libedata-cal/e-data-cal-factory.c:230
+msgid "Missing source UID"
+msgstr "Nedostaje UIB izvora"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "Nema takvog izvora za UIB â%sâ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:564
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server je nedostupan (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:594
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "Nisam uspeo da se poveÅem na server koristeÄi SSL: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
+msgid ""
+"Failed to connect to a server using SSL. One possible reason is an invalid "
+"certificate being used by the server. If this is expected, like self-signed "
+"certificate being used on the server, then disable certificate validity "
+"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+msgstr ""
+"Nisam uspeo da se poveÅem na server koristeÄi SSL. Jedan od moguÄih razloga "
+"je taj da server koristi neispravno uverenje. Ako je ovo oÄekivano, kao Åto "
+"je koriÅÄenje samopotpisanog uverenja na serveru, onda iskljuÄite probe "
+"ispravnosti uverenja tako Åto Äete u svojstvima izabrati opciju âZanemari "
+"neispravno SSL uverenjeâ"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "VraÄen je neoÄekivani kod â%dâ HTTP stanja (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2302
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1074,388 +1084,364 @@ msgstr ""
 "Server je nedostupan, kalendar je otvoren u reÅimu samo za Äitanje.\n"
 "Poruka greÅke: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
-msgid "Calendar doesn't support Free/Busy"
-msgstr "Kalendar ne podrÅava Slobodno / Zauzeto"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3668
+msgid "CalDAV does not support bulk additions"
+msgstr "KolDAV ne podrÅava grupno dodavanje"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Unesite lozinku za adresar %s (korisnik %s)\n"
-"Razlog: %s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3770
+msgid "CalDAV does not support bulk modifications"
+msgstr "KolDAV ne podrÅava grupno ureÄivanje"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "Unesite lozinku za adresar %s (korisnik %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3938
+msgid "CalDAV does not support bulk removals"
+msgstr "KolDAV ne podrÅava grupno uklanjanje"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4597
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendar ne podrÅava Slobodno / Zauzeto"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
 msgid "Birthday"
 msgstr "RoÄendan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 #, c-format
 msgid "Birthday: %s"
 msgstr "RoÄendan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
 #, c-format
 msgid "Anniversary: %s"
 msgstr "GodiÅnjica: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:235
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ne mogu da saÄuvam podatak iz kalendara: loÅa adresa."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:256
-#: ../calendar/backends/file/e-cal-backend-file.c:262
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data"
 msgstr "Ne mogu da saÄuvam podatke kalendara"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:418
+#: ../calendar/backends/http/e-cal-backend-http.c:481
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "LoÅa adresa: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:542
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Preusmereno na neispravnu adresu"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:459
+#: ../calendar/backends/http/e-cal-backend-http.c:579
+#, c-format
 msgid "Bad file format."
 msgstr "LoÅ oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:467
+#: ../calendar/backends/http/e-cal-backend-http.c:589
+#, c-format
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:793
-#: ../calendar/backends/http/e-cal-backend-http.c:794
-#: ../calendar/backends/weather/e-cal-backend-weather.c:522
+#: ../calendar/backends/http/e-cal-backend-http.c:934
+#: ../calendar/backends/http/e-cal-backend-http.c:938
+#: ../calendar/backends/weather/e-cal-backend-weather.c:511
 msgid "Could not create cache file"
 msgstr "Ne mogu da napravim datoteku za ostavu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:181
+#: ../calendar/backends/weather/e-cal-backend-weather.c:171
 msgid "Could not retrieve weather data"
 msgstr "Ne mogu da dobijem podatke o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:276
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblaÄna noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy"
 msgstr "Vreme: oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Overcast"
 msgstr "Vreme: mestimiÄno oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Sunny"
 msgstr "Vreme: sunÄano"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:433
+#: ../calendar/backends/weather/e-cal-backend-weather.c:408
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../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 "Unesite lozinku za %s (korisnik %s)"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:906
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "Unesite lozinku za %s kako bi mreÅni posrednik bio omoguÄen za %s"
-
-#: ../calendar/libecal/e-cal.c:4567
+#: ../calendar/libecal/e-cal.c:4002
 msgid "Repository is offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:4004 ../calendar/libecal/e-cal-client.c:135
 msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4006 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Object not found"
 msgstr "Objekat nije naÄen"
 
-#: ../calendar/libecal/e-cal.c:4573 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4008 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:4010
 msgid "URI not loaded"
 msgstr "Adresa nije uÄitana"
 
-#: ../calendar/libecal/e-cal.c:4577
+#: ../calendar/libecal/e-cal.c:4012
 msgid "URI already loaded"
 msgstr "Adresa je veÄ uÄitana"
 
-#: ../calendar/libecal/e-cal.c:4581
+#: ../calendar/libecal/e-cal.c:4016
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:4583 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4018 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ postoji"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:4020
 msgid "Protocol not supported"
 msgstr "Protokol nije podrÅan"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:4022
 msgid "Operation has been canceled"
 msgstr "Operacija je otkazana"
 
-#: ../calendar/libecal/e-cal.c:4589
+#: ../calendar/libecal/e-cal.c:4024
 msgid "Could not cancel operation"
 msgstr "Ne mogu da otkaÅem operaciju"
 
-#: ../calendar/libecal/e-cal.c:4591 ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:4026 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "PotvrÄivanje identiteta nije uspelo"
 
-#: ../calendar/libecal/e-cal.c:4593
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:4028
+#: ../camel/providers/smtp/camel-smtp-transport.c:845
+#: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "Potrebno je potvrÄivanje identiteta"
 
-#: ../calendar/libecal/e-cal.c:4595
+#: ../calendar/libecal/e-cal.c:4030
 msgid "A D-Bus exception has occurred"
 msgstr "DoÅlo je do izuzetka D-basa"
 
-#: ../calendar/libecal/e-cal.c:4599
+#: ../calendar/libecal/e-cal.c:4034
 msgid "No error"
 msgstr "Nema greÅke"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unknown user"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libecal/e-cal-client.c:600
+#: ../calendar/libecal/e-cal-client.c:610
 msgid "Failed to run calendar factory"
 msgstr "Nisam uspeo da pokrenem pogon kalendara"
 
-#: ../calendar/libecal/e-cal-client.c:765
-msgid "Failed to find system calendar"
-msgstr "Nisam uspeo da pronaÄem kalendar sistema"
-
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "Kalendar ne postoji"
-
-#: ../calendar/libecal/e-cal-client.c:919
-msgid "Invalid source type"
-msgstr "Neispravna vrsta izvora"
-
-#: ../calendar/libecal/e-cal-component.c:1362
+#: ../calendar/libecal/e-cal-component.c:1339
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "1st"
-msgstr "1Â"
+msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "2nd"
-msgstr "2Â"
+msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "3rd"
-msgstr "3Â"
+msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "4th"
-msgstr "4Â"
+msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "5th"
-msgstr "5Â"
+msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "6th"
-msgstr "6Â"
+msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "7th"
-msgstr "7Â"
+msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "8th"
-msgstr "8Â"
+msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "9th"
-msgstr "9Â"
+msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "10th"
-msgstr "10Â"
+msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "11th"
-msgstr "11Â"
+msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "12th"
-msgstr "12Â"
+msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "13th"
-msgstr "13Â"
+msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "14th"
-msgstr "14Â"
+msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "15th"
-msgstr "15Â"
+msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "16th"
-msgstr "16Â"
+msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "17th"
-msgstr "17Â"
+msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "18th"
-msgstr "18Â"
+msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "19th"
-msgstr "19Â"
+msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "20th"
-msgstr "20Â"
+msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "21st"
-msgstr "21Â"
+msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "22nd"
-msgstr "22Â"
+msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "23rd"
-msgstr "23Â"
+msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "24th"
-msgstr "24Â"
+msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "25th"
-msgstr "25Â"
+msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "26th"
-msgstr "26Â"
+msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "27th"
-msgstr "27Â"
+msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "28th"
-msgstr "28Â"
+msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "29th"
-msgstr "29Â"
+msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "30th"
-msgstr "30Â"
+msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "31st"
-msgstr "31Â"
+msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
 msgctxt "Priority"
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
 msgctxt "Priority"
 msgid "Low"
 msgstr "Nisko"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:721
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "NeodreÄeno"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
+#: ../calendar/libedata-cal/e-cal-backend.c:36
 msgid "Cannot process, calendar backend is opening"
 msgstr "Ne mogu da obradim, pozadinac kalendara se otvara"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:142
+#: ../calendar/libedata-cal/e-cal-backend.c:135
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Nepoznato svojstvo kalendara â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:159
+#: ../calendar/libedata-cal/e-cal-backend.c:152
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Ne mogu da izmenim vrednost svojstva kalendara â%sâ"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:807
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:829
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:944
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:975
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1175
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1205
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ne oÄekuje argumente"
@@ -1464,7 +1450,7 @@ msgstr "â%sâ ne oÄekuje argumente"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1246
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ oÄekuje jedan argument"
@@ -1472,7 +1458,7 @@ msgstr "â%sâ oÄekuje jedan argument"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:874
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ oÄekuje da prvi argument bude niska"
@@ -1484,8 +1470,8 @@ msgstr "â%sâ oÄekuje da prvi argument bude niska ISO 8601 datuma/vremena"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1010
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ oÄekuje dva argumenta"
@@ -1496,8 +1482,8 @@ msgstr "â%sâ oÄekuje dva argumenta"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1016
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1252
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ oÄekuje da prvi argument bude time_t"
@@ -1515,7 +1501,7 @@ msgstr "â%sâ oÄekuje dva ili tri argumenta"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1024
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ oÄekuje da drugi argument bude time_t"
@@ -1530,13 +1516,13 @@ msgstr "â%sâ oÄekuje da treÄi argument bude niska"
 msgid "\"%s\" expects none or two arguments"
 msgstr "â%sâ oÄekuje nijedan ili dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â%sâ oÄekuje da drugi argument bude niska"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:912
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1546,12 +1532,12 @@ msgstr ""
 "â%sâ oÄekuje da prvi argument bude âanyâ, âsummaryâ, âdescriptionâ, "
 "âlocationâ, âattendeeâ, âorganizerâ, ili âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ oÄekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1560,148 +1546,156 @@ msgstr ""
 "â%sâ oÄekuje da svi argumenti budu niske ili jedan i samo jedan argument da "
 "bude logiÄki netaÄan (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
 msgid "Unsupported method"
 msgstr "NepodrÅan metod"
 
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "Kalendar ne postoji"
+
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:909
 msgid "Cannot open calendar: "
 msgstr "Ne mogu da otvorim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
+#: ../calendar/libedata-cal/e-data-cal.c:934
 msgid "Cannot remove calendar: "
 msgstr "Ne mogu da uklonim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
 msgid "Cannot refresh calendar: "
 msgstr "Ne mogu da osveÅim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../calendar/libedata-cal/e-data-cal.c:990
 msgid "Cannot retrieve backend property: "
 msgstr "Ne mogu da preuzmem svojstvo pozadinca: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
 msgid "Cannot retrieve calendar object path: "
 msgstr "Ne mogu da preuzmem putanju objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
 msgid "Cannot retrieve calendar object list: "
 msgstr "Ne mogu da preuzmem spisak objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
 msgid "Cannot create calendar object: "
 msgstr "Ne mogu da napravim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
 msgid "Cannot modify calendar object: "
 msgstr "Ne mogu da izmenim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1217
 msgid "Cannot remove calendar object: "
 msgstr "Ne mogu da uklonim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot receive calendar objects: "
 msgstr "Ne mogu da primim objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
 msgid "Cannot send calendar objects: "
 msgstr "Ne mogu da poÅaljem objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
 msgid "Could not retrieve attachment uris: "
 msgstr "Ne mogu da preuzmem adrese priloga: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
 msgid "Could not discard reminder: "
 msgstr "Ne mogu da odbacim podsetnik: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../calendar/libedata-cal/e-data-cal.c:1374
 msgid "Could not get calendar view path: "
 msgstr "Ne mogu da dobavim putanju pregleda kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
 msgid "Could not retrieve calendar time zone: "
 msgstr "Ne mogu da preuzmem vremensku zonu kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
 msgid "Could not add calendar time zone: "
 msgstr "Ne mogu da dodam vremensku zonu kalendara: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
 #, c-format
 msgid "Invalid call"
 msgstr "Neispravan poziv"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:206
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:219
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava proveru"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:235
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava Åifrovanje"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:249
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava deÅifrovanje"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:262
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "MoÅda neÄete moÄi da uvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:276
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "MoÅda neÄete moÄi da izvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:800
+#: ../camel/camel-cipher-context.c:817
 msgid "Signing message"
 msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:1041
+#: ../camel/camel-cipher-context.c:1058
 msgid "Encrypting message"
 msgstr "Åifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:1168
+#: ../camel/camel-cipher-context.c:1185
 msgid "Decrypting message"
 msgstr "DeÅifrovanje poruke"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
-msgstr "Ne mogu da napraviti putanju za privremeno Äuvanje"
+msgstr "Ne mogu da napravim putanju privremenog Äuvanja"
+
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "Prazna datoteka ostave"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nije moguÄe ukloniti unos iz ostave: %s: %s"
@@ -1733,110 +1727,103 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "VrÅim ponovno usklaÄivanje sa serverom"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "Preuzimam nove poruke za rad van mreÅe"
 
-#: ../camel/camel-disco-folder.c:412
+#: ../camel/camel-disco-folder.c:417
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam fasciklu â%sâ za rad van mreÅe"
 
-#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
-#| msgid "Copy folder content locally for offline operation"
+#: ../camel/camel-disco-folder.c:484 ../camel/camel-offline-folder.c:331
 msgid "Copy folder content locally for _offline operation"
 msgstr "Lokalno umnoÅi sadrÅaj fascikle za rad _van mreÅe"
 
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:527
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-#: ../camel/providers/pop3/camel-pop3-folder.c:840
-#: ../camel/providers/pop3/camel-pop3-folder.c:1038
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../camel/camel-disco-store.c:466 ../camel/camel-imapx-folder.c:410
+#: ../camel/camel-imapx-folder.c:443 ../camel/camel-imapx-folder.c:479
+#: ../camel/camel-imapx-folder.c:535 ../camel/camel-imapx-folder.c:611
+#: ../camel/camel-imapx-folder.c:645 ../camel/camel-imapx-folder.c:685
+#: ../camel/camel-imapx-folder.c:721 ../camel/camel-imapx-store.c:273
+#: ../camel/camel-imapx-store.c:1363 ../camel/camel-imapx-store.c:1451
+#: ../camel/camel-imapx-store.c:1497
+#: ../camel/providers/imap/camel-imap-store.c:1246
+#: ../camel/providers/imap/camel-imap-store.c:2002
+#: ../camel/providers/imap/camel-imap-store.c:2469
+#: ../camel/providers/imap/camel-imap-store.c:3219
+#: ../camel/providers/pop3/camel-pop3-folder.c:525
+#: ../camel/providers/pop3/camel-pop3-folder.c:655
+#: ../camel/providers/pop3/camel-pop3-folder.c:838
+#: ../camel/providers/pop3/camel-pop3-folder.c:1036
+#: ../camel/providers/pop3/camel-pop3-store.c:394
+#: ../camel/providers/pop3/camel-pop3-store.c:807
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr "Morate da budete na mreÅi da bi zavrÅili ovu operaciju"
+msgstr "Morate da budete na mreÅi da biste zavrÅili ovu operaciju"
 
 #: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:889 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Nisam uspeo da napravim sadrÅani proces â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:937
+#: ../camel/camel-filter-driver.c:943
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1142 ../camel/camel-filter-driver.c:1151
+#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
 msgid "Syncing folders"
 msgstr "UsklaÄujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1705
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "GreÅka prilikom Äitanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1258 ../camel/camel-filter-driver.c:1716
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "GreÅka prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1356
+#: ../camel/camel-filter-driver.c:1347
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1393 ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
 #, c-format
 msgid "Failed on message %d"
 msgstr "GreÅka kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1430 ../camel/camel-filter-driver.c:1537
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
 msgid "Syncing folder"
 msgstr "UsklaÄujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1435 ../camel/camel-filter-driver.c:1543
+#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
 msgid "Complete"
 msgstr "ZavrÅeno"
 
-#: ../camel/camel-filter-driver.c:1495
+#: ../camel/camel-filter-driver.c:1485
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1513
+#: ../camel/camel-filter-driver.c:1503
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "GreÅka kod poruke %d od %d"
@@ -1858,7 +1845,7 @@ msgstr "Neispravni argumenti za (korisniÄka-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "GreÅka u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder.c:258
+#: ../camel/camel-folder.c:270
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1867,7 +1854,7 @@ msgstr[1] "UÄim nove spam poruke u â%sâ"
 msgstr[2] "UÄim nove spam poruke u â%sâ"
 msgstr[3] "UÄim novu spam poruku u â%sâ"
 
-#: ../camel/camel-folder.c:298
+#: ../camel/camel-folder.c:310
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1876,7 +1863,7 @@ msgstr[1] "UÄim nove ham poruke u â%sâ"
 msgstr[2] "UÄim nove ham poruke u â%sâ"
 msgstr[3] "UÄim novu ham poruku u â%sâ"
 
-#: ../camel/camel-folder.c:346
+#: ../camel/camel-folder.c:358
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1885,32 +1872,41 @@ msgstr[1] "Filtriram nove poruke u â%sâ"
 msgstr[2] "Filtriram nove poruke u â%sâ"
 msgstr[3] "Filtriram novu poruku u â%sâ"
 
-#: ../camel/camel-folder.c:914
+#: ../camel/camel-folder.c:930
 #: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "PremeÅtam poruke"
 
-#: ../camel/camel-folder.c:917
+#: ../camel/camel-folder.c:933
 msgid "Copying messages"
 msgstr "UmnoÅavam poruke"
 
-#: ../camel/camel-folder.c:1229
+#: ../camel/camel-folder.c:1253
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ObaveÅtenje o koliÄini nije podrÅano za fasciklu â%sâ"
 
-#: ../camel/camel-folder.c:3535
+#: ../camel/camel-folder.c:3371
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Praznim fasciklu â%sâ"
+
+#: ../camel/camel-folder.c:3603
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "DovlaÄim poruku â%sâ u %s"
 
-#: ../camel/camel-folder.c:3681
+#: ../camel/camel-folder.c:3753
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "DovlaÄim obaveÅtenje o koliÄini za â%sâ"
 
-#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
-#: ../camel/camel-folder-search.c:661
+#: ../camel/camel-folder.c:3985
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "OsveÅavam fasciklu â%sâ"
+
+#: ../camel/camel-folder-search.c:417 ../camel/camel-folder-search.c:581
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1919,8 +1915,7 @@ msgstr ""
 "Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
-#: ../camel/camel-folder-search.c:673
+#: ../camel/camel-folder-search.c:429 ../camel/camel-folder-search.c:593
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1930,47 +1925,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:887 ../camel/camel-folder-search.c:930
+#: ../camel/camel-folder-search.c:811 ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) zahteva samo jedan logiÄki rezultat"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:991
+#: ../camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nije dozvoljeno unutar %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:998 ../camel/camel-folder-search.c:1006
+#: ../camel/camel-folder-search.c:928 ../camel/camel-folder-search.c:936
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) zahteva nisku sa tipom poklapanja"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1034
+#: ../camel/camel-folder-search.c:964
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) oÄekuje niz kao rezultat"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1044
+#: ../camel/camel-folder-search.c:974
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
-#: ../camel/camel-gpg-context.c:1323
+#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
+#: ../camel/camel-gpg-context.c:1327
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam uspeo da izvrÅim gÄp: %s"
 
-#: ../camel/camel-gpg-context.c:664
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/camel-gpg-context.c:668
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1981,17 +1976,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:765
+#: ../camel/camel-gpg-context.c:769
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam uspeo da analiziram podsetnik gÄp ib-a korisnika."
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam uspeo da analiziram zahtev za gÄp lozinkom."
 
-#: ../camel/camel-gpg-context.c:826
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2000,7 +1995,7 @@ msgstr ""
 "Potreban vam je PIN da otkljuÄate kljuÄ\n"
 "Pametne kartice: â%sâ"
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2009,12 +2004,12 @@ msgstr ""
 "Potrebna vam je lozinka da otkljuÄate kljuÄ\n"
 "korisnika: â%sâ"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "NeoÄekivan zahtev GnuÄP-a za â%sâ"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:850
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2022,193 +2017,463 @@ msgstr ""
 "Znajte da Åifrovani sadrÅaj ne sadrÅi podatke o primaocu, tako da Äe biti "
 "postavljen upit za lozinku za svaki saÄuvani liÄni kljuÄ."
 
-#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
+#: ../libedataserver/e-client.c:140
 #, c-format
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:896
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam uspeo da otkljuÄam tajni kljuÄ: unete su 3 pogreÅne lozinke."
 
-#: ../camel/camel-gpg-context.c:909
+#: ../camel/camel-gpg-context.c:913
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "NeoÄekivan odgovor GnuÄP-a: %s"
 
-#: ../camel/camel-gpg-context.c:1040
+#: ../camel/camel-gpg-context.c:1044
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam uspeo da Åifrujem: nisu oznaÄeni ispravni primaoci."
 
-#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
 msgid "Could not generate signing data: "
-msgstr "Ne mogu da napravim podatke za potpisivanje:"
+msgstr "Ne mogu da napravim podatke za potpisivanje: "
 
-#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
-#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
-#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
+#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
+#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
 msgid "Failed to execute gpg."
 msgstr "Nisam uspeo da izvrÅim gÄp."
 
-#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
-#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
+#: ../camel/camel-smime-context.c:980
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1793
+#: ../camel/camel-gpg-context.c:1797
 msgid "Cannot verify message signature: "
-msgstr "Ne mogu da proverim potpis poruke:"
+msgstr "Ne mogu da proverim potpis poruke: "
 
-#: ../camel/camel-gpg-context.c:1916
+#: ../camel/camel-gpg-context.c:1920
 msgid "Could not generate encrypting data: "
-msgstr "Ne mogu da napravim podatke za Åifrovanje:"
+msgstr "Ne mogu da napravim podatke za Åifrovanje: "
 
-#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:1973
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno Åifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2059
+#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
+#: ../camel/camel-gpg-context.c:2063
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ne mogu da deÅifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2051
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nisam uspeo da deÅifrujem MIME deo: greÅka u protokolu"
 
-#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
 msgid "Encrypted content"
 msgstr "Åifrovan sadrÅaj"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim Http tokom"
-
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-imapx-folder.c:101
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Ne mogu da napravim zakljuÄanu datoteku za â%sâ: %s"
+msgid "Could not create folder summary for %s"
+msgstr "Ne mogu da napravim saÅetak fascikle za â%sâ"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-imapx-folder.c:109
 #, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
-msgstr ""
-"Isteklo je vreme prilikom pokuÅaja da pribavim zakljuÄanu datoteku na â%sâ. "
-"PokuÅajte kasnije."
+msgid "Could not create cache for %s: "
+msgstr "Ne mogu da napravim ostavu za â%sâ: "
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nisam uspeo da zakljuÄam koristeÄi âfcntl(2)â: %s"
+#: ../camel/camel-imapx-folder.c:791
+#: ../camel/providers/imap/camel-imap-folder.c:359
+#: ../camel/providers/nntp/camel-nntp-folder.c:731
+msgid "Apply message _filters to this folder"
+msgstr "Primeni _filtere poruke nad ovom fasciklom"
 
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nisam uspeo da zakljuÄam koristeÄi âflock(2)â: %s"
+#: ../camel/camel-imapx-server.c:1015
+msgid "Server disconnected"
+msgstr "Veza sa serverom je iskljuÄena"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu da napravim vezu ka pomoÄniku zakljuÄavanja: %s"
+#: ../camel/camel-imapx-server.c:1457
+msgid "Error writing to cache stream: "
+msgstr "GreÅka prilikom upisa u tok ostave: "
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-imapx-server.c:2384
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu da podelim pomoÄnika zakljuÄavanja: %s"
+msgid "Not authenticated"
+msgstr "NepotvrÄenog identiteta"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ne mogu da zakljuÄam â%sâ: greÅka u protokolu sa pomoÄnikom zakljuÄavanja"
+#: ../camel/camel-imapx-server.c:2453
+msgid "Error performing IDLE"
+msgstr "GreÅka prilikom izvrÅavanja IDLE-a"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-imapx-server.c:3297
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Ne mogu da zakljuÄam â%sâ"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/camel-movemail.c:105
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Ne mogu da proverim datoteku poÅte â%sâ: %s"
+#: ../camel/camel-imapx-server.c:3298
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+msgid "STARTTLS not supported"
+msgstr "STARTTLS nije podrÅano"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-imapx-server.c:3337
+#: ../camel/providers/imap/camel-imap-store.c:435
 #, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Ne mogu da otvorim datoteku poÅte â%sâ: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: "
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-imapx-server.c:3404
+#: ../camel/providers/imap/camel-imap-store.c:734
 #, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Ne mogu da otvorim privremenu datoteku poÅte â%sâ: %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP server â%sâ ne podrÅava â%sâ prijavljivanje identiteta"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-imapx-server.c:3415 ../camel/camel-session.c:486
+#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Nisam uspeo da smestim poÅtu u privremenu datoteku â%sâ: %s"
+msgid "No support for %s authentication"
+msgstr "Nema podrÅke za â%sâ potvrÄivanja identiteta"
 
-#: ../camel/camel-movemail.c:193
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Ne mogu da napravim vezu: %s"
+#: ../camel/camel-imapx-server.c:3434
+#: ../camel/providers/imap/camel-imap-store.c:1118
+#: ../camel/providers/nntp/camel-nntp-store.c:494
+msgid "Cannot authenticate without a username"
+msgstr "Ne mogu da potvrdim identitet bez korisniÄkog imena"
 
-#: ../camel/camel-movemail.c:207
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Ne mogu da podelim: %s"
+#: ../camel/camel-imapx-server.c:3443
+#: ../camel/providers/imap/camel-imap-store.c:1126
+#: ../camel/providers/nntp/camel-nntp-store.c:503
+#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:513
+msgid "Authentication password not available"
+msgstr "Lozinka potvrÄivanja identiteta nije dostupna"
 
-#: ../camel/camel-movemail.c:245
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Program za premeÅtanje poÅte je otkazao: %s"
+#: ../camel/camel-imapx-server.c:3633
+msgid "Error fetching message"
+msgstr "GreÅka prilikom preuzimanja poruke"
 
-#: ../camel/camel-movemail.c:246
-msgid "(Unknown error)"
-msgstr "(Nepoznata greÅka)"
+#: ../camel/camel-imapx-server.c:3715
+msgid "Failed to copy the tmp file"
+msgstr "Nisam uspeo da umnoÅim privremenu datoteku"
 
-#: ../camel/camel-movemail.c:273
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "GreÅka pri Äitanju datoteke poÅte: %s"
+#: ../camel/camel-imapx-server.c:3729
+msgid "Failed to close the tmp stream"
+msgstr "Nisam uspeo da zatvorim privremenu datoteku"
 
-#: ../camel/camel-movemail.c:286
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "GreÅka pri pisanju privremene datoteke poÅte: %s"
+#: ../camel/camel-imapx-server.c:3827
+msgid "Error copying messages"
+msgstr "GreÅka umnoÅavanja poruka"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "GreÅka pri umnoÅavanju privremene datoteke: %s"
+#: ../camel/camel-imapx-server.c:3962
+msgid "Error appending message"
+msgstr "GreÅka prikaÄinjanja poruka"
 
-#: ../camel/camel-multipart-signed.c:297
-#, c-format
-msgid "No content available"
-msgstr "Nema dostupnog sadrÅaja"
+#: ../camel/camel-imapx-server.c:4149
+msgid "Error fetching message headers"
+msgstr "GreÅka preuzimanja zaglavlja poruke"
 
-#: ../camel/camel-multipart-signed.c:305
-#, c-format
-msgid "No signature available"
-msgstr "Nema dostupnog potpisa"
+#: ../camel/camel-imapx-server.c:4295
+msgid "Error retrieving message"
+msgstr "GreÅka dovlaÄenja poruke"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-imapx-server.c:4417 ../camel/camel-imapx-server.c:4622
 #, c-format
-msgid "parse error"
-msgstr "greÅka Äitanja"
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "Prikupljam pregled podataka novih poruka u â%sâ"
 
-#: ../camel/camel-net-utils.c:703
+#: ../camel/camel-imapx-server.c:4476
 #, c-format
-msgid "Resolving: %s"
-msgstr "Nalazim: %s"
+msgid "Scanning for changed messages in '%s'"
+msgstr "Pregledam izmenjene poruke u â%sâ"
+
+#: ../camel/camel-imapx-server.c:4518
+msgid "Error fetching new messages"
+msgstr "GreÅka prilikom preuzimanja novih poruka"
+
+#: ../camel/camel-imapx-server.c:4717
+msgid "Error while fetching messages"
+msgstr "GreÅka za vreme preuzimanja poruka"
+
+#: ../camel/camel-imapx-server.c:4725 ../camel/camel-imapx-server.c:4760
+#, c-format
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "Prikupljam pregled podataka za %d poruku u â%sâ"
+msgstr[1] "Prikupljam pregled podataka za %d poruke u â%sâ"
+msgstr[2] "Prikupljam pregled podataka za %d poruka u â%sâ"
+msgstr[3] "Prikupljam pregled podataka za %d poruku u â%sâ"
+
+#: ../camel/camel-imapx-server.c:4887 ../camel/camel-imapx-server.c:4923
+msgid "Error refreshing folder"
+msgstr "GreÅka tokom pretrage"
+
+#: ../camel/camel-imapx-server.c:5016
+msgid "Error expunging message"
+msgstr "GreÅka prilikom izbacivanja poruke"
+
+#: ../camel/camel-imapx-server.c:5105
+msgid "Error fetching folders"
+msgstr "GreÅka prilikom preuzimanja fascikle"
+
+#: ../camel/camel-imapx-server.c:5184
+msgid "Error subscribing to folder"
+msgstr "GreÅka prilikom prijavljivanja na fasciklu"
+
+#: ../camel/camel-imapx-server.c:5241
+msgid "Error creating folder"
+msgstr "GreÅka prilikom stvaranja fascikle"
+
+#: ../camel/camel-imapx-server.c:5290
+msgid "Error deleting folder"
+msgstr "GreÅka prilikom brisanja fascikle"
+
+#: ../camel/camel-imapx-server.c:5344
+msgid "Error renaming folder"
+msgstr "GreÅka prilikom preimenovanja fascikle"
+
+#: ../camel/camel-imapx-server.c:5399
+msgid "Error performing NOOP"
+msgstr "GreÅka prilikom obavljanja NOOP-a"
+
+#: ../camel/camel-imapx-server.c:5497
+msgid "Error syncing changes"
+msgstr "GreÅka prilikom usklaÄivanja izmena"
+
+#: ../camel/camel-imapx-server.c:6119
+#: ../camel/providers/imap/camel-imap-folder.c:3473
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Ne mogu da nabavim poruku sa IB â%sâ: %s"
+
+#: ../camel/camel-imapx-server.c:6120
+#: ../camel/providers/imap/camel-imap-folder.c:3474
+msgid "No such message available."
+msgstr "Nema takve poruke."
+
+#: ../camel/camel-imapx-server.c:6275 ../camel/camel-imapx-server.c:6290
+msgid "Cannot create spool file: "
+msgstr "Ne mogu da napravim datoteku pripreme: "
+
+#: ../camel/camel-imapx-store.c:155
+#: ../camel/providers/imap/camel-imap-store.c:810
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server â%sâ"
+
+#: ../camel/camel-imapx-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:813
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za â%sâ na â%s"
+
+#: ../camel/camel-imapx-store.c:249
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid "Password"
+msgstr "Lozinka"
+
+#: ../camel/camel-imapx-store.c:251
+#: ../camel/providers/imap/camel-imap-provider.c:100
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Ova opcija Äe povezati na IMAP server koriÅÄenjem lozinke u obiÄnom tekstu."
+
+#: ../camel/camel-imapx-store.c:342
+#: ../camel/providers/imap/camel-imap-store.c:2033
+#: ../camel/providers/imap/camel-imap-store.c:2227
+#, c-format
+msgid "No such folder %s"
+msgstr "Nema takve fascikle â%sâ"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:367 ../camel/camel-imapx-store.c:838
+#: ../camel/providers/imap/camel-imap-store.c:272
+#: ../camel/providers/imap/camel-imap-store.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:474
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:679
+#: ../camel/providers/local/camel-maildir-store.c:685
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-spool-store.c:387
+msgid "Inbox"
+msgstr "SanduÄe"
+
+#: ../camel/camel-imapx-store.c:1070
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "DovlaÄim spisak fascikle za â%sâ"
+
+#: ../camel/camel-imapx-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1749
+#, c-format
+msgid "No such folder: %s"
+msgstr "Nema takve fascikle: %s"
+
+#: ../camel/camel-imapx-store.c:1384
+#: ../camel/providers/imap/camel-imap-store.c:2046
+#: ../camel/providers/imap/camel-imap-store.c:2484
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime fascikle â%sâ nije ispravno jer sadrÅi znak â%câ"
+
+#: ../camel/camel-imapx-store.c:1395
+#: ../camel/providers/imap/camel-imap-store.c:2497
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "Nepoznata glavna fascikla: %s"
+
+#: ../camel/camel-imapx-store.c:1405
+#: ../camel/providers/imap/camel-imap-store.c:2109
+#: ../camel/providers/imap/camel-imap-store.c:2548
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "Glavna fascikla ne moÅe da sadrÅi druge fascikle"
+
+#: ../camel/camel-imapx-stream.c:72
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Odgovor izvornog toka je bez podataka"
+
+#: ../camel/camel-imapx-stream.c:81
+#, c-format
+msgid "Source stream unavailable"
+msgstr "Tok izvora je nedostupan"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Ne mogu da napravim zakljuÄanu datoteku za â%sâ: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Isteklo je vreme prilikom pokuÅaja da pribavim zakljuÄanu datoteku na â%sâ. "
+"PokuÅajte kasnije."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Nisam uspeo da zakljuÄam koristeÄi âfcntl(2)â: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Nisam uspeo da zakljuÄam koristeÄi âflock(2)â: %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu da napravim vezu ka pomoÄniku zakljuÄavanja: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu da podelim pomoÄnika zakljuÄavanja: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Ne mogu da zakljuÄam â%sâ: greÅka u protokolu sa pomoÄnikom zakljuÄavanja"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ne mogu da zakljuÄam â%sâ"
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Ne mogu da proverim datoteku poÅte â%sâ: %s"
+
+#: ../camel/camel-movemail.c:119
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "Ne mogu da otvorim datoteku poÅte â%sâ: %s"
+
+#: ../camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "Ne mogu da otvorim privremenu datoteku poÅte â%sâ: %s"
+
+#: ../camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Nisam uspeo da smestim poÅtu u privremenu datoteku â%sâ: %s"
+
+#: ../camel/camel-movemail.c:193
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "Ne mogu da napravim vezu: %s"
+
+#: ../camel/camel-movemail.c:207
+#, c-format
+msgid "Could not fork: %s"
+msgstr "Ne mogu da podelim: %s"
+
+#: ../camel/camel-movemail.c:245
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Program za premeÅtanje poÅte je otkazao: %s"
+
+#: ../camel/camel-movemail.c:246
+msgid "(Unknown error)"
+msgstr "(Nepoznata greÅka)"
+
+#: ../camel/camel-movemail.c:273
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "GreÅka pri Äitanju datoteke poÅte: %s"
+
+#: ../camel/camel-movemail.c:286
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "GreÅka pri pisanju privremene datoteke poÅte: %s"
+
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "GreÅka pri umnoÅavanju privremene datoteke: %s"
+
+#: ../camel/camel-multipart-signed.c:297
+#, c-format
+msgid "No content available"
+msgstr "Nema dostupnog sadrÅaja"
+
+#: ../camel/camel-multipart-signed.c:305
+#, c-format
+msgid "No signature available"
+msgstr "Nema dostupnog potpisa"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
+msgid "parse error"
+msgstr "greÅka obrade"
+
+#: ../camel/camel-net-utils.c:703
+#, c-format
+msgid "Resolving: %s"
+msgstr "Nalazim: %s"
 
 #: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
@@ -2237,7 +2502,7 @@ msgstr "Nije uspelo traÅenje imena: %s"
 msgid "Could not connect to %s: "
 msgstr "Ne mogu da se poveÅem na â%sâ: "
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-offline-folder.c:207
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "UsklaÄujem poruke iz fascikle â%sâ na disk"
@@ -2270,7 +2535,7 @@ msgstr "Ne mogu da uÄitam â%sâ: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu da uÄitam â%sâ: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:410 ../camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nema dostupnog dostavljaÄa za protokol â%sâ"
@@ -2315,11 +2580,11 @@ msgstr ""
 "Neispravan podatak o poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:48
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2327,11 +2592,11 @@ msgstr ""
 "Ova opcija Äe povezati na server koriÅÄenjem sigurnosne CRAM-MD5 lozinke, ako "
 "je server podrÅava."
 
-#: ../camel/camel-sasl-digest-md5.c:55
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:61
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2339,47 +2604,47 @@ msgstr ""
 "Ova opcija Äe povezati na server koriÅÄenjem sigurnosne DIGEST-MD5 lozinke, "
 "ako je server podrÅava."
 
-#: ../camel/camel-sasl-digest-md5.c:846
+#: ../camel/camel-sasl-digest-md5.c:850
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Upit servera je suviÅe dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:857
+#: ../camel/camel-sasl-digest-md5.c:861
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:869
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Upit servera je sadrÅao neispravan unos âKvalitet zaÅtiteâ"
 
-#: ../camel/camel-sasl-digest-md5.c:898
+#: ../camel/camel-sasl-digest-md5.c:902
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Odgovor servera nije sadrÅao podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:919
+#: ../camel/camel-sasl-digest-md5.c:923
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Odgovor servera je sadrÅao nekompletne podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:932
+#: ../camel/camel-sasl-digest-md5.c:936
 #, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaÅe"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 5 potvrÄivanja "
 "identiteta."
 
-#: ../camel/camel-sasl-gssapi.c:130
+#: ../camel/camel-sasl-gssapi.c:134
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2387,11 +2652,11 @@ msgstr ""
 "Izabrani mehanizam ponuÄeni metod ne podrÅava, ili ga primenjen metod nije "
 "prepoznao."
 
-#: ../camel/camel-sasl-gssapi.c:135
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "PonuÄeni parametar ciljnog imena (target_name) nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2399,7 +2664,7 @@ msgstr ""
 "PonuÄeni parametar ciljnog imena (target_name) je sadrÅao neispravan ili "
 "nepodrÅan tip imena."
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2407,7 +2672,7 @@ msgstr ""
 "Upit unosa (input_token) sadrÅi razliÄita vezivanja kanala od onih odreÄenih "
 "preko parametra vezice lanca unosa (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:147
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2415,7 +2680,7 @@ msgstr ""
 "Upit unosa (input_token) sadrÅi neispravnu strukturu, ili potpis nije mogao "
 "biti proveren."
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:155
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2423,52 +2688,52 @@ msgstr ""
 "PruÅena uveravanja nisu bila ispravna za otpoÄinjanje procesa, ili je nosaÄ "
 "uverenja doÅao bez njih."
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "PruÅen nosaÄ sadrÅaja nije upuÄivao na ispravan sadrÅaj."
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Nisu uspele provere celovitosti na upitu unosa (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "Nisu uspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "VaÅenje traÅenih uverenja je isteklo."
 
-#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
-#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
+#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:563
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "LoÅ odgovor potvrÄivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:406
+#: ../camel/camel-sasl-gssapi.c:410
 #, c-format
 msgid "Unsupported security layer."
 msgstr "NepodrÅan sigurnosni sloj."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "Ova opcija Äe povezati na server koriÅÄenjem obiÄne lozinke."
 
-#: ../camel/camel-sasl-login.c:103
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Nepoznato stanje potvrÄivanja identiteta."
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:45
+#: ../camel/camel-sasl-ntlm.c:49
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2476,28 +2741,28 @@ msgstr ""
 "Ova opcija Äe povezati na Vindouz server koriÅÄenjem NTML / Sigurnosne "
 "provere lozinke."
 
-#: ../camel/camel-sasl-plain.c:40
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "OBIÄNO"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP pre SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Ova opcija Äe odobriti POP vezu pre pokuÅaja SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
 msgstr "POP izvorni JIB"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP pre SMTP provere koriÅÄenjem nepoznatog transporta"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP pre SMTP potvrÄivanje identiteta je pokuÅano sa â%sâ uslugom"
@@ -2507,277 +2772,271 @@ msgstr "POP pre SMTP potvrÄivanje identiteta je pokuÅano sa â%sâ uslugom"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nije uspelo prevoÄenje regularnog izraza: %s: %s"
 
-#: ../camel/camel-session.c:393
+#: ../camel/camel-session.c:407
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Neispravna Gvrsta registrovana za protokol â%sâ"
 
-#: ../camel/camel-session.c:462
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format
-msgid "No support for %s authentication"
-msgstr "Nema podrÅke za â%sâ potvrÄivanja identiteta"
-
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:501
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrÄivanje identiteta"
 
-#: ../camel/camel-session.c:1183
+#: ../camel/camel-session.c:1239
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Unesite â%sâ lozinku za â%sâ na domaÄinu â%sâ."
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1057
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ne mogu da naÄem uverenje za â%sâ"
 
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "Ne mogu da napravim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "Ne mogu da priloÅim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "Ne mogu da priloÅim CMS podatke"
 
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "Ne mogu da napravim podatak CMS potpisnika"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "Ne mogu da naÄem lanac uverenja"
 
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "Ne mogu da dodam vreme CMS potpisa"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Uverenje Åifrovanja â%sâ ne postoji"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ne mogu da dodam atribut SMIME postavki kljuÄa Åifrovanja"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ne mogu da dodam atribut MS SMIME postavki kljuÄa Åifrovanja"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "Ne mogu da dodam uverenje Åifrovanja"
 
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "Ne mogu da dodam podatak CMS potpisnika"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "Neproveren"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "LoÅ potpis"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "SadrÅaj je izmenjen ili oÅteÄen pri prenosu"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "Uverenje potpisa nije naÄeno"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "Uverenje potpisa nije poverljivo"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "Algoritam potpisa je nepoznat"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "Algoritam potpisa nije podrÅan"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "Neispravan potpis"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "GreÅka pri obradi"
 
 # hm, hm...
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "Nema naznaÄenog podatka u potpisu"
 
 # hm, moÅe to i bolje od âokruÅenihâ...
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "Nedostaju zbirke iz okruÅenih podataka"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "Ne mogu da izraÄunam zbirke"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "Ne mogu da postavim zbirke poruka"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "Nije uspeo uvoz uverenja"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Uverenje je jedina poruka, ne mogu da proverim uverenje"
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Uverenje je jedina poruka, uverenja su uveÅena i proverena"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "Ne mogu da naÄem zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:661
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
 msgid "Cannot create encoder context"
-msgstr "Ne mogu da napravim kontekst Åifrovanja."
+msgstr "Ne mogu da napravim kontekst Åifrovanja"
 
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:848
 msgid "Failed to add data to CMS encoder"
 msgstr "Nisam uspeo da dodam podatak u CMS Åifrer"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
 msgid "Failed to encode data"
 msgstr "Nisam uspeo da Åifrujem podatke"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
 msgid "Decoder failed"
 msgstr "Nisam uspeo da deÅifrujem"
 
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ne mogu da naÄem opÅti algoritam za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1073
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ne mogu da dodelim mesto kljuÄu za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create CMS Message"
 msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ne mogu da napravim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1096
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ne mogu da priloÅim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot attach CMS data object"
 msgstr "Ne mogu da priloÅim objekat CMS podataka"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Recipient information"
 msgstr "Ne mogu da napravim podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1116
 msgid "Cannot add CMS Recipient information"
 msgstr "Ne mogu da dodam podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1141
 msgid "Failed to add data to encoder"
 msgstr "Nisam uspeo da dodam podatke u Åifrer"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1250
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅifrovanje: nisu naÄeni Åifrovani podaci"
 
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1838
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji"
 
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1881
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2066
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "PretraÅujem fascikle u â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2078 ../camel/camel-store.c:2088
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "SmeÄe"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2081 ../camel/camel-store.c:2092
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Äubre"
 
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2540
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "Ne mogu da da napravim fasciklu: %s: fascikla postoji"
+msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2554
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Stvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/camel-store.c:2672 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obriÅem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2815 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:768
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim filterom toka"
 
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim Http tokom"
+
 #: ../camel/camel-stream-process.c:267
 #, c-format
 msgid "Connection cancelled"
@@ -2788,90 +3047,100 @@ msgstr "Povezivanje je otkazano"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu da se poveÅem sa naredbom â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:386
+#, c-format
+msgid "Subscribing to folder '%s'"
+msgstr "Prijavljujem se na fasciklu â%sâ"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Odjavljujem se sa fascikle â%sâ"
+
+#: ../camel/camel-tcp-stream-raw.c:310
 #, c-format
 msgid "NSPR error code %d"
 msgstr "Kod %d NSPR greÅke"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:647 ../camel/camel-tcp-stream-raw.c:658
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:669
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "DomaÄin posrednik je odbio naÅ zahtev: kÃd â%dâ"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:765 ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:777
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "Ne mogu da pronaÄem odgovarajuÄi tip potvrÄivanja identiteta: kod 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "General SOCKS server failure"
 msgstr "Neuspeh opÅteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "SOCKS server's rules do not allow connection"
 msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:791
 msgid "Network is unreachable from SOCKS server"
 msgstr "MreÅa je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:792
 msgid "Host is unreachable from SOCKS server"
 msgstr "DomaÄin je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:793
 msgid "Connection refused"
 msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:794
 msgid "Time-to-live expired"
 msgstr "Vreme Åivota je isteklo"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:795
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava naredbu"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:796
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:797
 msgid "Unknown error from SOCKS server"
 msgstr "Nepoznata greÅka sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:830
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:848
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:868
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "Ime domaÄina je predugo (najviÅe 255 znakova)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:900 ../camel/camel-tcp-stream-raw.c:910
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-ssl.c:470
+#: ../camel/camel-tcp-stream-ssl.c:502
 #, c-format
 msgid ""
 "   Issuer:       %s\n"
@@ -2884,16 +3153,16 @@ msgstr ""
 "   Otisak:       %s\n"
 "   Potpis:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-ssl.c:476
+#: ../camel/camel-tcp-stream-ssl.c:508
 msgid "BAD"
 msgstr "LOÅE"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:512
 #, c-format
 msgid ""
 "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2906,19 +3175,19 @@ msgstr ""
 "OpÅirnije obaveÅtenje o uverenju:\n"
 "%s"
 
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:516
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../camel/camel-tcp-stream-ssl.c:485
+#: ../camel/camel-tcp-stream-ssl.c:517
 msgid "Accept _Temporarily"
 msgstr "Prihvati _privremeno"
 
-#: ../camel/camel-tcp-stream-ssl.c:486
+#: ../camel/camel-tcp-stream-ssl.c:518
 msgid "_Accept Permanently"
 msgstr "Prihvati _trajno"
 
-#: ../camel/camel-tcp-stream-ssl.c:544
+#: ../camel/camel-tcp-stream-ssl.c:579
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2927,7 +3196,7 @@ msgstr ""
 "Problem sa uverenjem: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:596
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2936,7 +3205,7 @@ msgstr ""
 "LoÅ domen uverenja: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:614
+#: ../camel/camel-tcp-stream-ssl.c:649
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2945,7 +3214,7 @@ msgstr ""
 "Isteklo uverenje: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:631
+#: ../camel/camel-tcp-stream-ssl.c:666
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2959,42 +3228,50 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Ne mogu da analiziram adresu â%sâ"
 
-#: ../camel/camel-vee-folder.c:647
+#: ../camel/camel-vee-folder.c:484
 #, c-format
-msgid "Updating %s folder"
-msgstr "AÅuriram â%sâ fasciklu"
+msgid "Updating folder '%s'"
+msgstr "AÅuriram fasciklu â%sâ"
 
-#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
+#: ../camel/camel-vee-folder.c:843 ../camel/camel-vee-folder.c:953
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da umnoÅim ili premestim poruke u virtuelnu fasciklu"
 
-#: ../camel/camel-vee-folder.c:1354
+#: ../camel/camel-vee-folder.c:876
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke â%sâ u â%sâ"
 
-#: ../camel/camel-vee-folder.c:1422
+#: ../camel/camel-vee-folder.c:929
 #, c-format
 msgid "Error storing '%s': "
-msgstr "GreÅka pri smeÅtanju â%sâ:"
+msgstr "GreÅka pri smeÅtanju â%sâ: "
+
+#: ../camel/camel-vee-folder.c:1157
+msgid "Automatically _update on change in source folders"
+msgstr "Sam _aÅuriraj ori izmeni u izvornim fasciklama"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:38
 msgid "Unmatched"
 msgstr "Nepoklopljeno"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obriÅem fasciklu: %s: nema takve fascikle"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
 
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "UkljuÄi _nepoklopljene fascikle"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Ne mogu da umnoÅim poruke u fasciklu za smeÄe"
@@ -3004,23 +3281,23 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne mogu da umnoÅim poruke u fasciklu za Äubre"
 
 #: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../camel/providers/imap/camel-imap-command.c:299
 #, c-format
 msgid "No output stream"
 msgstr "Bez izlaznog toka"
 
 #: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
+#: ../camel/providers/imap/camel-imap-command.c:307
 #, c-format
 msgid "No input stream"
 msgstr "Bez ulaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s in folder %s:\n"
@@ -3029,7 +3306,7 @@ msgstr ""
 "Upozorenje sa IMAP servera %s %s u fascikli %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:426
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3038,100 +3315,78 @@ msgstr ""
 "Upozorenje od IMAP servera %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:508
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NeoÄekivan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:514
+#: ../camel/providers/imap/camel-imap-command.c:520
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Neuspela IMAP naredba: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:594
+#: ../camel/providers/imap/camel-imap-command.c:603
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Odgovor servera je prerano zavrÅen."
 
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../camel/providers/imap/camel-imap-command.c:818
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor IMAP servera nije sadrÅao â%sâ podatak"
 
-#: ../camel/providers/imap/camel-imap-command.c:844
+#: ../camel/providers/imap/camel-imap-command.c:856
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NeoÄekivan potvrdan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:344
-#| msgid "Always check for new mail in this folder"
+#: ../camel/providers/imap/camel-imap-folder.c:348
 msgid "Always check for _new mail in this folder"
 msgstr "Uvek proveri _nove poruke u ovoj fascikli"
 
-#: ../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 "Apply message filters to this folder"
-msgid "Apply message _filters to this folder"
-msgstr "Primeni _filtere poruke nad ovom fasciklom"
-
-#: ../camel/providers/imap/camel-imap-folder.c:437
+#: ../camel/providers/imap/camel-imap-folder.c:439
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne mogu da napravim direktorijum â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:458
+#: ../camel/providers/imap/camel-imap-folder.c:460
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne mogu da uÄitam pregled za â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1116
-#: ../camel/providers/imapx/camel-imapx-server.c:3949
+#: ../camel/providers/imap/camel-imap-folder.c:1127
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Pregledam izmenjene poruke u â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3473
+#: ../camel/providers/imap/camel-imap-folder.c:3436
 msgid "Unable to retrieve message: "
-msgstr "Ne mogu da dovuÄem poruku: %s"
-
-#: ../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 "Ne mogu da nabavim poruku sa IB â%sâ: %s"
+msgstr "Ne mogu da dovuÄem poruku: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3511
-#: ../camel/providers/imapx/camel-imapx-server.c:5512
-msgid "No such message available."
-msgstr "Nema takve poruke."
-
-#: ../camel/providers/imap/camel-imap-folder.c:3586
-#: ../camel/providers/imap/camel-imap-folder.c:4464
-#: ../camel/providers/nntp/camel-nntp-folder.c:511
+#: ../camel/providers/imap/camel-imap-folder.c:3547
+#: ../camel/providers/imap/camel-imap-folder.c:4417
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
 #, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4045
-#: ../camel/providers/imap/camel-imap-folder.c:4128
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../camel/providers/imap/camel-imap-folder.c:4005
+#: ../camel/providers/imap/camel-imap-folder.c:4085
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Prikupljam pregled podataka novih poruka u â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4262
+#: ../camel/providers/imap/camel-imap-folder.c:4216
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Nepotpun odgovor servera: nisu dati podaci za poruku â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4272
+#: ../camel/providers/imap/camel-imap-folder.c:4226
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Nepotpun odgovor servera: JIB nije dat za poruku â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4504
+#: ../camel/providers/imap/camel-imap-folder.c:4454
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Ne mogu da pronaÄem telo poruke u DOVUCI odgovoru."
@@ -3157,208 +3412,94 @@ msgid "Failed to cache %s: "
 msgstr "Nisam uspeo privremeno da saÄuvam â%sâ: "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "VrÅim proveru za novom poÅtom"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "P_otraÅi nove poruke u svim fasciklama"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "Povezivanje na server"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Koristi prilagoÄenu komandu za povezivanje na server"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "_Naredba:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Fascikle"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "Prik_aÅi samo prijavljene fascikle"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "P_remosti oblik imena fascikle koje daje server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
 msgid "Names_pace:"
 msgstr "Oblik _imena:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:77
+#: ../camel/providers/local/camel-local-provider.c:97
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "Primeni filtere na nove poruke u svim _fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "Primeni filtere na nove poruke u _SanduÄetu na ovom serveru"
+msgstr "_Primeni propusnike na nove poruke u sanduÄetu ovog servera"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "Proveri da nema _Äubreta meÄu novim porukama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Proveri da nema Äubreta samo u fascikli SAN_DUÄE"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imap/camel-imap-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Automatski uskladi ud_aljenu poÅtu sa lokalnom"
+msgstr "Sam uskladi ud_aljenu poÅtu sa lokalnom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
 msgid "IMAP default port"
 msgstr "Osnovni IMAP port"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP preko SSL-a"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za Äitanje i smeÅtanje poÅte na IMAP servere."
 
-#: ../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 "Lozinka"
-
-#: ../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 ""
-"Ova opcija Äe povezati na IMAP server koriÅÄenjem lozinke u obiÄnom tekstu."
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "SanduÄe"
-
-#: ../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 "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "STARTTLS nije podrÅano"
-
-#: ../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 "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: "
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP server â%sâ ne podrÅava â%sâ prijavljivanje identiteta"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za â%sâ na â%s"
-
-#: ../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 without a username"
-msgstr "Ne mogu da potvrdim identitet bez korisniÄkog imena"
-
-#: ../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 password not available"
-msgstr "Lozinka potvrÄivanja identiteta nije dostupna"
-
-#: ../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 "Nema takve fascikle â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime fascikle â%sâ nije ispravno jer sadrÅi znak â%câ"
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Glavna fascikla ne moÅe da sadrÅi druge fascikle"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/imap/camel-imap-store.c:2158
 #: ../camel/providers/local/camel-maildir-store.c:268
 #: ../camel/providers/local/camel-mbox-store.c:421
 #: ../camel/providers/local/camel-mh-store.c:558
@@ -3366,203 +3507,61 @@ msgstr "Glavna fascikla ne moÅe da sadrÅi druge fascikle"
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji."
 
-#: ../camel/providers/imap/camel-imap-store.c:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
+#: ../camel/providers/imap/camel-imap-store.c:2921
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Nepoznata glavna fascikla: %s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "DovlaÄim spisak fascikli na â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3326
+#: ../camel/providers/imap/camel-imap-store.c:3263
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena"
 
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3266
 msgid "Server unexpectedly disconnected: "
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Ne mogu da napravim saÅetak fascikle za â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "Ne mogu da napravim ostavu za â%sâ: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
 msgstr "Koristi _Brzo ponovno usaglaÅavanje ako ga server podrÅava"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr "_OsluÅkuj za obaveÅtenjima o izmenama servera"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "Naredba:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "Broj veza iz _ostave za koriÅÄenje"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "Oblik imena:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Default IMAP port"
 msgstr "Osnovni port IMAP-a"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-msgid "Server disconnected"
-msgstr "Veza sa serverom je iskljuÄena"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-msgid "Error writing to cache stream: "
-msgstr "GreÅka prilikom upisa u tok ostave:"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "NepotvrÄenog identiteta"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2005
-msgid "Error performing IDLE"
-msgstr "GreÅka prilikom izvrÅavanja IDLE-a"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3160
-msgid "Error fetching message"
-msgstr "GreÅka prilikom preuzimanja poruke"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
-msgid "Closing tmp stream failed: "
-msgstr "Zatvaranje privremenog toka nije uspelo:"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3327
-msgid "Error copying messages"
-msgstr "GreÅka prilikom umnoÅavanja poruka"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3457
-msgid "Error appending message"
-msgstr "GreÅka prilikom prikaÄinjanja poruka"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3637
-msgid "Error fetching message headers"
-msgstr "GreÅka prilikom preuzimanja zaglavlja poruke"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3778
-msgid "Error retrieving message"
-msgstr "GreÅka prilikom dovlaÄenja poruke"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
-msgid "Error fetching new messages"
-msgstr "GreÅka prilikom preuzimanja novih poruka"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4174
-msgid "Error while fetching messages"
-msgstr "GreÅka za vreme preuzimanja poruka"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4182
-#: ../camel/providers/imapx/camel-imapx-server.c:4212
-#, c-format
-msgid "Fetching summary information for %d message in %s"
-msgid_plural "Fetching summary information for %d messages in %s"
-msgstr[0] "Prikupljam pregled podataka za %d poruku u â%sâ"
-msgstr[1] "Prikupljam pregled podataka za %d poruke u â%sâ"
-msgstr[2] "Prikupljam pregled podataka za %d poruka u â%sâ"
-msgstr[3] "Prikupljam pregled podataka za %d poruku u â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4334
-#: ../camel/providers/imapx/camel-imapx-server.c:4368
-msgid "Error refreshing folder"
-msgstr "GreÅka tokom pretrage"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4457
-msgid "Error expunging message"
-msgstr "GreÅka prilikom izbacivanja poruke"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4542
-msgid "Error fetching folders"
-msgstr "GreÅka prilikom preuzimanja fascikle"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4616
-msgid "Error subscribing to folder"
-msgstr "GreÅka prilikom prijavljivanja na fasciklu"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4669
-msgid "Error creating folder"
-msgstr "GreÅka prilikom stvaranja fascikle"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4714
-msgid "Error deleting folder"
-msgstr "GreÅka prilikom brisanja fascikle"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4764
-msgid "Error renaming folder"
-msgstr "GreÅka prilikom preimenovanja fascikle"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4815
-msgid "Error performing NOOP"
-msgstr "GreÅka prilikom obavljanja NOOP-a"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4910
-msgid "Error syncing changes"
-msgstr "GreÅka prilikom usklaÄivanja izmena"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5666
-#: ../camel/providers/imapx/camel-imapx-server.c:5681
-msgid "Cannot create spool file: "
-msgstr "Ne mogu da napravim datoteku pripreme: "
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "DovlaÄim spisak fascikle za â%sâ"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve fascikle: %s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "Odgovor izvornog toka je bez podataka"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "Tok izvora je nedostupan"
-
-#: ../camel/providers/local/camel-local-folder.c:187
+#: ../camel/providers/local/camel-local-folder.c:191
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:197
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:210
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "poÅtansko sanduÄe:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:215
+#: ../camel/providers/local/camel-local-folder.c:219
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:479
-#| msgid "Index message body data"
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "_PopiÅi sadrÅaje poruka"
 
-#: ../camel/providers/local/camel-local-folder.c:710
+#: ../camel/providers/local/camel-local-folder.c:726
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3571,23 +3570,23 @@ msgstr ""
 "Ne mogu da dobavim poruku â%sâ iz fascikle â%sâ\n"
 "%s"
 
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_Koristi pregled fascikle â.foldersâ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
 msgid "MH-format mail directories"
 msgstr "MH-oblikovani direktorijumi poÅte"
 
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za smeÅtanje lokalne poÅte u direktorijume poÅte nalik MH."
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:64
 msgid "Local delivery"
 msgstr "Lokalna dostava"
 
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:65
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3595,30 +3594,29 @@ msgstr ""
 "Za dovlaÄenje (premeÅtanje) lokalne poÅte iz standardne mboks formatirane "
 "pripreme u fascikle kojima upravlja Evolucija."
 
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-#| msgid "_Apply filters to new messages in INBOX"
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "_Apply filters to new messages in Inbox"
 msgstr "_Primeni filtere na nove poruke u SANDUÄETU"
 
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Direktorijumi poÅte u Mejldir obliku"
 
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "Za smeÅtanje lokalne poÅte u mejldir direktorijume."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Smesti zaglavlja stanja u Elm/Pine/Mut formatu"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "Standard Unix mbox spool file"
 msgstr "Standardna Uniks mboks datoteka pripreme"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:120
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3627,7 +3625,7 @@ msgstr ""
 "pripreme.\n"
 "TakoÄe se moÅe koristiti za Äitanje stabla fascikli u Elm, Pine ili Mut stilu."
 
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:119
 msgid "Standard Unix mbox spool directory"
 msgstr "Standardni Uniks mboks direktorijum pripreme"
 
@@ -3724,7 +3722,7 @@ msgstr ""
 "Ne mogu da napravim fasciklu â%sâ: Naziv fascikle ne moÅe da sadrÅi taÄku"
 
 #: ../camel/providers/local/camel-maildir-store.c:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:786
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Fascikla â%sâ veÄ postoji"
@@ -3768,34 +3766,34 @@ msgid "not a maildir directory"
 msgstr "nije direktorijum poÅte"
 
 #: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-maildir-store.c:974
 #: ../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 "Ne mogu da pretraÅim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:773
+#: ../camel/providers/local/camel-maildir-store.c:777
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "Ne mogu da preimenujem fasciklu â%sâ: Naziv fascikle ne moÅe da sadrÅi taÄku"
 
-#: ../camel/providers/local/camel-maildir-summary.c:413
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne mogu da otvorim putanju direktorijuma poÅte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:537
+#: ../camel/providers/local/camel-maildir-summary.c:558
 msgid "Checking folder consistency"
 msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:630
+#: ../camel/providers/local/camel-maildir-summary.c:651
 msgid "Checking for new messages"
 msgstr "VrÅim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:649
 #: ../camel/providers/local/camel-mbox-summary.c:793
@@ -3989,7 +3987,7 @@ msgstr "Ne mogu da napravim fasciklu â%sâ: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ne mogu da dobavim fasciklu â%sâ: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:224
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne mogu da otvorim putanju MH direktorijuma: %s: %s"
@@ -4089,47 +4087,47 @@ msgstr ""
 "Ne mogu da uskladim fasciklu za pripremu â%sâ: %s\n"
 "Fascikla je moÅda oÅteÄena, umnoÅite saÄuvano u â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:286
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:497
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "UnutraÅnja greÅka: JIB u neispravnom obliku: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:336
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/pop3/camel-pop3-folder.c:613
-#: ../camel/providers/pop3/camel-pop3-folder.c:997
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:611
+#: ../camel/providers/pop3/camel-pop3-folder.c:995
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobavim poruku â%sâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:347
-#: ../camel/providers/nntp/camel-nntp-folder.c:522
-#: ../camel/providers/pop3/camel-pop3-folder.c:551
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#: ../camel/providers/pop3/camel-pop3-folder.c:622
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
+#: ../camel/providers/pop3/camel-pop3-folder.c:601
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Ne mogu da dobavim poruku â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:581
-#: ../camel/providers/nntp/camel-nntp-folder.c:587
-#: ../camel/providers/nntp/camel-nntp-folder.c:634
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Neuspela poÅiljka: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "Neuspela poÅiljka: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:658
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne moÅete da poÅaljete NNTP poruke ako niste povezani!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:678
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne moÅete da umnoÅite poruke iz NNTP fascikle!"
@@ -4167,22 +4165,22 @@ msgid ""
 msgstr ""
 "Ova opcija Äe prijaviti na NNTP server koriÅÄenjem lozinke u obiÄnom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:283
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Ne mogu da proÄitam pozdrav sa â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:295
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server â%sâ je vratio kod greÅke â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:458
 #, c-format
 msgid "USENET News via %s"
 msgstr "JUZNET vesti preko â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1044
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4193,24 +4191,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1136
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ne moÅete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Ne moÅete da preimenujete fasciklu u ostavi vesti."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1175
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ne moÅete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1371
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4221,7 +4219,7 @@ msgstr ""
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadreÄena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4232,14 +4230,14 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
 msgid "NNTP Command failed: "
 msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1691
 #, c-format
 msgid "Not connected."
-msgstr "Nepovezano."
+msgstr "Nisam povezan."
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:195
 #: ../camel/providers/nntp/camel-nntp-summary.c:322
@@ -4262,34 +4260,34 @@ msgstr "NeoÄekivan odgovor head-a: %s"
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:519
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:517
 #, c-format
 msgid "No message with UID %s"
 msgstr "Nema poruke sa JIB %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:535
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "DovlaÄim POP poruku %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:614
+#: ../camel/providers/pop3/camel-pop3-folder.c:612
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 msgid "Retrieving POP summary"
 msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#: ../camel/providers/pop3/camel-pop3-folder.c:711
 msgid "Cannot get POP summary: "
-msgstr "Ne mogu da dobavim POP pregled: %s"
+msgstr "Ne mogu da dobavim POP pregled: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:825
+#: ../camel/providers/pop3/camel-pop3-folder.c:823
 msgid "Expunging old messages"
 msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:845
+#: ../camel/providers/pop3/camel-pop3-folder.c:843
 msgid "Expunging deleted messages"
 msgstr "Izbacujem obrisane poruke"
 
@@ -4389,26 +4387,26 @@ msgstr "Ne mogu da se prijavim na POP server â%sâ: greÅka SASL protokola"
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Nisam uspeo da potvrdim identitet na POP serveru â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server za â%sâ na â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:527
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"Ne mogu da se poveÅem na POP server â%sâ: primih Neispravan APOP IB. MoguÄ "
+"Ne mogu da se poveÅem na POP server â%sâ: Primih neispravan APOP IB. MoguÄ "
 "je napad zamenom identiteta. Obratite se adminu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4419,7 +4417,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:594
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4428,17 +4426,17 @@ msgstr ""
 "Ne mogu da se poveÅem na POP server â%sâ.\n"
 "GreÅka pri slanju korisniÄkog imena%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ne mogu da se poveÅem na POP server â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ostava nema hijerarhiju fascikli"
@@ -4479,7 +4477,7 @@ msgstr "Ne mogu da podelim sendmejl: %s: poÅta nije poslata"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:184
 msgid "Could not send message: "
-msgstr "Ne mogu da poÅaljem poruku: %s"
+msgstr "Ne mogu da poÅaljem poruku: "
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:212
 #, c-format
@@ -4522,353 +4520,514 @@ msgstr ""
 msgid "Welcome response error: "
 msgstr "GreÅka odgovora dobrodoÅlice: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ne mogu da se poveÅem na SMTP server â%sâ u sigurnosnom reÅimu: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:225
 msgid "STARTTLS command failed: "
 msgstr "Neuspela STARTTLS naredba: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Ne mogu da se poveÅem na SMTP server â%sâ u sigurnosnom reÅimu: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava poÅte preko â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:369
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP server â%sâ ne podrÅava â%sâ potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:449
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Nije naveden SASL mehanizam"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP potvrÄivanje identiteta"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#: ../camel/providers/smtp/camel-smtp-transport.c:479
+#: ../camel/providers/smtp/camel-smtp-transport.c:490
+#: ../camel/providers/smtp/camel-smtp-transport.c:503
 msgid "AUTH command failed: "
 msgstr "Neuspela naredba âAUTHâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Ne mogu da poÅaljem poruku: servis nije povezan."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu da poÅaljem poruku: adresa poÅiljaoca nije ispravna."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu da poÅaljem poruku: nisu odreÄeni primaoci."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu da poÅaljem poruku: jedan ili viÅe neispravnih primalaca"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Syntax error, command unrecognized"
 msgstr "GreÅka u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Syntax error in parameters or arguments"
 msgstr "GreÅka u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "Command not implemented"
 msgstr "Naredba nije podrÅana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Command parameter not implemented"
 msgstr "Parametar naredbe nije podrÅan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:803
 msgid "System status, or system help reply"
 msgstr "Status sistema, ili odgovor na pomoÄ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
 msgid "Help message"
 msgstr "Poruka o pomoÄi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Service ready"
 msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:811
 msgid "Service not available, closing transmission channel"
 msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "Requested mail action okay, completed"
 msgstr "TraÅena radnja za poÅtu je u redu, zavrÅeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "User not local; will forward to <forward-path>"
 msgstr "Korisnik nije lokalan; biÄe prosleÄeno na <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "TraÅena radnja za poÅtu nije preduzeta: nedostupno poÅtansko sanduÄe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "TraÅena radnja nije preduzeta: poÅtansko sanduÄe je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 msgid "Requested action aborted: error in processing"
 msgstr "TraÅena radnja nije preduzeta: greÅka pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:823
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokuÅajte <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:825
 msgid "Requested action not taken: insufficient system storage"
 msgstr "TraÅena radnja nije preduzeta: nedovoljno prostora na sistemu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:827
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Prekinuta je traÅena radnja za poÅtu: premaÅen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "TraÅena radnja nije preduzeta: ime poÅtanskog sanduÄeta nije dozvoljeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:831
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "PoÄinje unos poÅte; zavrÅava sa <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:833
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:837
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:839
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizam potvrÄivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:841
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neophodno je Åifrovanje za traÅeni mehanizam potvrÄivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:843
 msgid "Temporary authentication failure"
 msgstr "Nije uspelo privremeno potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 #: ../camel/providers/smtp/camel-smtp-transport.c:1139
 #: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "Neuspela naredba âHELOâ: "
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1237
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed: "
 msgstr "Neuspela naredba âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1274
 msgid "RCPT TO command failed: "
 msgstr "Neuspela naredba âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1301
 #, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> nije uspelo"
-
-#: ../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
+msgstr "RCPT TO <%s> nije uspelo: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1343
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 #: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
 msgid "DATA command failed: "
 msgstr "Neuspela naredba âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1492
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 msgid "RSET command failed: "
 msgstr "Neuspela naredba âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1562
 msgid "QUIT command failed: "
 msgstr "Neuspela naredba âQUITâ: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "UIB kontakta korisnika"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "Podsetnik na roÄendane i godiÅnjice"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Da li da postavi podsetnik na roÄendane i godiÅnjice"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "Vrednosti podsetnika na roÄendane i godiÅnjice"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "Broj jedinica za odreÄivanje podsetnika na roÄendane ili godiÅnjice"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "Jedinice podsetnika na roÄendane i godiÅnjice"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Jedinice za podsetnik na roÄendane ili godiÅnjice, âminutiâ, âsatiâ ili âdaniâ"
+
+#: ../libebackend/e-authentication-mediator.c:145
+#: ../libebackend/e-authentication-mediator.c:156
+#: ../libebackend/e-authentication-mediator.c:612
+#: ../libebackend/e-authentication-mediator.c:973
+msgid "Bus name vanished (client terminated?)"
+msgstr "Naziv sabirnice je nestao (klijent je okonÄan?)"
+
+#: ../libebackend/e-authentication-mediator.c:204
+msgid "No response from client"
+msgstr "Nema odgovora sa klijenta"
+
+#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:275
+#: ../libebackend/e-authentication-mediator.c:606
+#: ../libebackend/e-authentication-mediator.c:967
+msgid "Client cancelled the operation"
+msgstr "Klijent je otkazao ste operaciju"
+
+#: ../libebackend/e-authentication-mediator.c:334
+msgid "Client reports password was rejected"
+msgstr "Lozinka izveÅtaja klijenta je odbijena"
+
+#: ../libebackend/e-authentication-session.c:530
+msgid "Add this password to your keyring"
+msgstr "Dodajte ovu lozinku u vaÅ privezak"
+
+#: ../libebackend/e-authentication-session.c:593
+msgid "Password was incorrect"
+msgstr "Lozinka je neispravna"
+
+#: ../libebackend/e-authentication-session.c:1322
+#: ../libebackend/e-authentication-session.c:1494
+#: ../libebackend/e-authentication-session.c:1673
+msgid "Keyring operation was cancelled"
+msgstr "Radnja priveska kljuÄeva je otkazana"
+
+#: ../libebackend/e-server-side-source.c:162
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "Izvoru podataka nedostaje [%s] grupa"
+
+#: ../libebackend/e-server-side-source.c:1079
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "Datoteka mora da ima nastavak â.sourceâ"
+
+# veÄ u upotrebi?
+#: ../libebackend/e-source-registry-server.c:598
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UIB â%sâ je veÄ u upotrebi"
+
+#: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "GodiÅnjica"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "RoÄendan"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Nadmetanje"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Ciljevi/zadaci"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Äestitke"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "VaÅni kontakti"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "International"
 msgstr "MeÄunarodno"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "VaÅna muÅterija"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "LiÄno"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Telefonski pozivi"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "DobavljaÄi"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Vreme i izdaci"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Äekanje"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source not loaded"
 msgstr "Izvor nije uÄitan"
 
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:126
 msgid "Source already loaded"
 msgstr "Izvor je veÄ uÄitan"
 
-#: ../libedataserver/e-client.c:132
+#. Translators: This means that the EClient does not support offline mode, or
+#. * it's not set to by a user, thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:136
 msgid "Offline unavailable"
 msgstr "Rad van mreÅe nije dostupan"
 
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:158
 msgid "D-Bus error"
 msgstr "GreÅka u D-magistrali"
 
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "Zahtev za prijavu na adresar"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "Zahtev za prijavu na kalendar"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "Zahtev za prijavu na poÅtu"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "Zahtev za prijavu"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "Unesite lozinku za adresar â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "Unesite lozinku za kalendar â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "Unesite lozinku za nalog poÅte â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "Unesite lozinku za prenos poÅte â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "Unesite lozinku za spisak beleÅki â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "Unesite lozinku za spisak zaduÅenja â%sâ."
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "Unesite lozinku za nalog â%sâ."
+
+#: ../libedataserver/e-source.c:603
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "Izvornoj datoteci nedostaje [%s] grupa"
+
+#: ../libedataserver/e-source.c:882
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "Izvor podataka â%sâ se ne moÅe ukloniti"
+
+#: ../libedataserver/e-source.c:964
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "Izvor podtaka â%sâ nije upisiv"
+
+#: ../libedataserver/e-source.c:1138
+msgid "Unnamed"
+msgstr "Neimenovan"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "Skripta potpisa mora da bude mesna datoteka"
+
+#: ../libedataserver/e-source-registry.c:1512
+msgid "The user declined to authenticate"
+msgstr "Korisnik je odbio da potvrdi identitet"
+
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1945
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4876,7 +5035,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1936
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4884,7 +5043,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1941
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4892,78 +5051,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1932
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1989
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1981
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4971,24 +5130,24 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1986
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1978
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1885
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5017,9 +5176,9 @@ msgid "Whether proxy server requires authentication"
 msgstr "Da li server posrednik zahteva potvrdu identiteta"
 
 #: ../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 "Da li je potrebno potvrÄivanje identiteta za pristup serveru posredniku."
+msgstr ""
+"Da li je potrebno potvrÄivanje identiteta za pristup serveru posredniku."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
 msgid "Host name for HTTP requests"
@@ -5038,24 +5197,20 @@ msgid "Port number to use for HTTP requests."
 msgstr "Broj porta koji Äe biti koriÅÄen za HTTP zahteve."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-#| msgid "Cannot authenticate without a username"
 msgid "Proxy authentication user name"
 msgstr "KorisniÄko ime potvrde identiteta posrednika"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "User name to use to authenticate against proxy server."
 msgstr ""
 "KorisniÄko ime koje Äe biti koriÅÄeno za potvrÄivanje identiteta sa serverom "
 "posrednikom."
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-#| msgid "%s authentication failed"
 msgid "Proxy authentication password"
 msgstr "Lozinka potvrde identiteta posrednika"
 
 #: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-#| msgid "Unable to authenticate to GroupWise server. "
 msgid "Password to use to authenticate against proxy server."
 msgstr ""
 "Lozimka koja Äe biti koriÅÄena za potvrÄivanje identiteta sa serverom "
@@ -5086,7 +5241,6 @@ msgid "Port number to use for HTTPS requests."
 msgstr "Broj porta koji Äe biti koriÅÄen za HTTPS zahteve."
 
 #: ../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 "Naziv domaÄina za SOCKS zahteve"
 
@@ -5110,193 +5264,134 @@ msgstr "Adresa za samopodeÅavanje posrednika"
 msgid "Where to read automatic proxy configuration from."
 msgstr "Odakle Äe biti proÄitana samopodeÅavanja posrdenika."
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupa LDAP serveru"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "Nisam uspeo da potvrdim identitet.\n"
-
-#: ../libedataserverui/e-categories-editor.c:224
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "Currently _used categories:"
 msgstr "Trenutno _koriÅÄene kategorije:"
 
-#: ../libedataserverui/e-categories-editor.c:233
+#: ../libedataserverui/e-categories-editor.c:239
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../libedataserverui/e-categories-selector.c:320
+#: ../libedataserverui/e-categories-selector.c:324
 msgid "Icon"
 msgstr "Ikonica"
 
-#: ../libedataserverui/e-categories-selector.c:325
+#: ../libedataserverui/e-categories-selector.c:329
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../libedataserverui/e-category-completion.c:294
+#: ../libedataserverui/e-category-completion.c:300
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Izrada kategorije â%sâ"
 
-#: ../libedataserverui/e-category-editor.c:132
+#: ../libedataserverui/e-category-editor.c:137
 msgid "Category Icon"
 msgstr "Ikonica kategorije"
 
-#: ../libedataserverui/e-category-editor.c:136
+#: ../libedataserverui/e-category-editor.c:141
 msgid "_No Image"
 msgstr "_Bez slike"
 
-#: ../libedataserverui/e-category-editor.c:173
+#: ../libedataserverui/e-category-editor.c:178
 msgid "Category _Name"
-msgstr "I_me kategorije"
+msgstr "_Naziv kategorije"
 
-#: ../libedataserverui/e-category-editor.c:181
+#: ../libedataserverui/e-category-editor.c:186
 msgid "Category _Icon"
 msgstr "_Ikonica kategorije"
 
-#: ../libedataserverui/e-category-editor.c:221
+#: ../libedataserverui/e-category-editor.c:226
 msgid "Category Properties"
 msgstr "Osobine kategorije"
 
-#: ../libedataserverui/e-category-editor.c:282
+#: ../libedataserverui/e-category-editor.c:287
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "U podeÅavanju veÄ postoji kategorija â%sâ. Izaberite drugo ime"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Unesite lozinku za kalendar %s (korisnik %s)\n"
-"Razlog: %s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "Unesite lozinku za kalendar %s (korisnik %s)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Unesite lozinku za spisak zadataka %s (korisnik %s)\n"
-"Razlog: %s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-msgid "Enter password for task list %s (user %s)"
-msgstr "Unesite lozinku za spisak zadataka %s (korisnik %s)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"Unesite lozinku za spisak beleÅki %s (korisnik %s)\n"
-"Razlog: %s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-msgid "Enter password for memo list %s (user %s)"
-msgstr "Unesite lozinku za spisak beleÅki %s (korisnik %s)"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "Unesi propusnu reÄ"
-
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "Unesi lozinku"
-
-#: ../libedataserverui/e-name-selector-dialog.c:184
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "PrikaÅi kontakte"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:300
 msgid "Address B_ook:"
 msgstr "A_dresar:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
+#: ../libedataserverui/e-name-selector-dialog.c:308
+msgid "Cat_egory:"
 msgstr "Katego_rija:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
+#: ../libedataserverui/e-name-selector-dialog.c:326
 msgid "_Search:"
 msgstr "_PretraÅi:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
+#: ../libedataserverui/e-name-selector-dialog.c:344
+#: ../libedataserverui/e-name-selector-dialog.c:1141
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
+#: ../libedataserverui/e-name-selector-dialog.c:346
 msgid "Co_ntacts"
 msgstr "Ko_ntakti"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
+#: ../libedataserverui/e-name-selector-dialog.c:401
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:404
 msgid "Address Book"
-msgstr "_Adresar"
+msgstr "Adresar"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:407
+#: ../modules/google-backend/module-google-backend.c:183
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
+#: ../libedataserverui/e-name-selector-dialog.c:522
 msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
+#: ../libedataserverui/e-name-selector-dialog.c:880
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
+#: ../libedataserverui/e-name-selector-dialog.c:884
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
+#: ../libedataserverui/e-name-selector-dialog.c:1056
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "GreÅka prilikom uÄitavanja adresara: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2819
+#: ../libedataserverui/e-name-selector-entry.c:2959
 #, c-format
 msgid "E_xpand %s Inline"
-msgstr "Prostri %s unutar"
+msgstr "_RaÅiri %s unutar"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2834
+#: ../libedataserverui/e-name-selector-entry.c:2974
 #, c-format
 msgid "Cop_y %s"
 msgstr "U_mnoÅi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2844
+#: ../libedataserverui/e-name-selector-entry.c:2984
 #, c-format
 msgid "C_ut %s"
 msgstr "I_seci %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2861
+#: ../libedataserverui/e-name-selector-entry.c:3001
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
 
-#: ../libedataserverui/e-name-selector-list.c:520
+#: ../libedataserverui/e-name-selector-list.c:521
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ukloni â%sâ"
@@ -5330,1448 +5425,81 @@ msgstr "_Zapamti ovu lozinku"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
-msgid "Select destination"
-msgstr "Izaberite odrediÅte"
-
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:224
 msgid "_Destination"
 msgstr "_OdrediÅte"
 
-#: ../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 "Nastavlja da radi nakon zatvaranja poslednjeg klijenta"
-
-#: ../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 "Äeka sa pokretanjem sve dok se barem jedan klijent ne poveÅe"
-
-#~ msgid "Check new messages for Jun_k contents"
-#~ msgstr "Proveri da nema _nepoÅeljnog sadrÅaja meÄu novim porukama"
-
-#~ msgid "Invalid URI"
-#~ msgstr "Neispravna adresa"
-
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "Nema pogona pozadinca za â%sâ od â%sâ"
-
-#~ msgid "Could not instantiate backend"
-#~ msgstr "Ne mogu da pokrenem pozadinca"
-
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "Ne mogu da se poveÅem na â%sâ: %s"
-
-#~ msgid "SSL unavailable"
-#~ msgstr "SSL nije dostupan"
-
-#~ msgid "URL '%s' needs a user component"
-#~ msgstr "Adresa â%sâ zahteva sadrÅalac korisnika"
-
-#~ msgid "URL '%s' needs a host component"
-#~ msgstr "Adresa â%sâ traÅi deo sa imenom domaÄina"
-
-#~ msgid "URL '%s' needs a path component"
-#~ msgstr "Adresa â%sâ traÅi deo sa putanjom"
-
-#~ msgid ""
-#~ "SSL Certificate check for %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept?"
-#~ msgstr ""
-#~ "Provera SSL uverenja za â%sâ:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Åelite li da prihvatite?"
-
-#~ msgid "SSL is not available in this build"
-#~ msgstr "SSL nije dostupan u ovoj verziji"
-
-#~ msgid "Error creating SASL authentication object."
-#~ msgstr "GreÅka pri pravljenju objekta SASL potvrÄivanja identiteta"
-
-#~ msgid "You did not enter a password."
-#~ msgstr "Niste uneli lozinku."
-
-#~ msgid ""
-#~ "Unable to authenticate to IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ne mogu da potvrdim identitet na IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "Use I_dle if the server supports it"
-#~ msgstr "Koristi _Umiren ako ga server podrÅava"
-
-#~ msgid "Authentication requested but no username provided"
-#~ msgstr "Potrebno je potvrÄivanje identiteta ali korisniÄko ime nije uneto"
-
-#~ msgid "TLS is not available in this build"
-#~ msgstr "TLS nije dostupan u ovom izdanju"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s: No support for requested "
-#~ "authentication mechanism."
-#~ msgstr ""
-#~ "Ne mogu da se poveÅem na POP server â%sâ: traÅeni naÄin potvrÄivanja "
-#~ "identiteta nije podrÅan."
-
-#~ msgid "SASL '%s' Login failed for POP server %s%s"
-#~ msgstr "Nije uspela SASL prijava â%sâ na POP server %s%s"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending password%s"
-#~ msgstr ""
-#~ "Ne mogu da se poveÅem na POP server â%sâ.\n"
-#~ "GreÅka pri slanju lozinke%s"
-
-#~ msgid ""
-#~ "Unable to authenticate to SMTP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ne mogu da potvrdim identitet na SMTP serveru.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~| msgid "Object not found"
-#~ msgctxt "BookClientError"
-#~ msgid "Contact not found"
-#~ msgstr "Kontakt nije pronaÄen"
-
-#~| msgid "Object ID already exists"
-#~ msgctxt "BookClientError"
-#~ msgid "Contact ID already exists"
-#~ msgstr "IB kontakta veÄ postoji"
-
-#~| msgid "Namespace"
-#~ msgctxt "BookClientError"
-#~ msgid "No space"
-#~ msgstr "Nema prostora"
-
-#~| msgid "Unknown error"
-#~ msgctxt "BookClientError"
-#~ msgid "Unknown error"
-#~ msgstr "Nepoznata greÅka"
-
-#~ msgid "D-Bus book proxy gone"
-#~ msgstr "OtiÅao je posrednik D-basa adresara"
-
-#~ msgid "Cannot start view, D-Bus proxy gone"
-#~ msgstr "Ne mogu da zapoÄnem pregled, posrednik D-basa je otiÅao"
-
-#~ msgid "Cannot stop view, D-Bus proxy gone"
-#~ msgstr "Ne mogu da zaustavim pregled, posrednik D-basa je otiÅao"
-
-#~ msgid "Cannot set fields of interest, D-Bus proxy gone"
-#~ msgstr "Ne mogu da podesim neophodna polja, posrednik D-basa je otiÅao"
-
-#~| msgid "No such calendar"
-#~ msgctxt "CalClientError"
-#~ msgid "No such calendar"
-#~ msgstr "Nema takvog kalendara"
-
-#~| msgid "Object not found"
-#~ msgctxt "CalClientError"
-#~ msgid "Object not found"
-#~ msgstr "Objekat nije naÄen"
-
-#~| msgid "Invalid object"
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid object"
-#~ msgstr "Neispravan objekat"
-
-#~| msgid "Unknown User"
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown user"
-#~ msgstr "Nepoznat korisnik"
-
-#~| msgid "Object ID already exists"
-#~ msgctxt "CalClientError"
-#~ msgid "Object ID already exists"
-#~ msgstr "IB objekta veÄ postoji"
-
-#~| msgid "Invalid range"
-#~ msgctxt "CalClientError"
-#~ msgid "Invalid range"
-#~ msgstr "Neispravan opseg"
-
-#~| msgid "Unknown error"
-#~ msgctxt "CalClientError"
-#~ msgid "Unknown error"
-#~ msgstr "Nepoznata greÅka"
-
-#~ msgid "D-Bus calendar proxy gone"
-#~ msgstr "OtiÅao je posrednik D-basa kalendara"
-
-#~| msgid "Invalid argument"
-#~ msgctxt "ClientError"
-#~ msgid "Invalid argument"
-#~ msgstr "Neispravan argument"
-
-#~| msgid "Backend is busy"
-#~ msgctxt "ClientError"
-#~ msgid "Backend is busy"
-#~ msgstr "Pozadinac je zauzet"
-
-#~| msgid "Authentication failed"
-#~ msgctxt "ClientError"
-#~ msgid "Authentication failed"
-#~ msgstr "PotvrÄivanje identiteta nije uspelo"
-
-#~| msgid "Authentication required"
-#~ msgctxt "ClientError"
-#~ msgid "Authentication required"
-#~ msgstr "Potrebno je potvrÄivanje identiteta"
-
-#~| msgid "Repository is offline"
-#~ msgctxt "ClientError"
-#~ msgid "Repository offline"
-#~ msgstr "SkladiÅte nije na mreÅi"
-
-#~| msgid "Permission denied"
-#~ msgctxt "ClientError"
-#~ msgid "Permission denied"
-#~ msgstr "Zabranjen pristup"
-
-#~| msgid "Canceled"
-#~ msgctxt "ClientError"
-#~ msgid "Cancelled"
-#~ msgstr "Otkazano"
-
-#~| msgid "%s: could not cancel"
-#~ msgctxt "ClientError"
-#~ msgid "Could not cancel"
-#~ msgstr "Ne mogu da otkaÅem"
-
-#~| msgid "Protocol not supported"
-#~ msgctxt "ClientError"
-#~ msgid "Not supported"
-#~ msgstr "Nije podrÅan"
-
-#~| msgid "Unsupported authentication method"
-#~ msgctxt "ClientError"
-#~ msgid "Unsupported authentication method"
-#~ msgstr "NepodrÅan naÄin autentifikacije"
-
-#~| msgid "TLS not available"
-#~ msgctxt "ClientError"
-#~ msgid "TLS not available"
-#~ msgstr "TLS nije dostupan"
-
-#~| msgid "Search size limit exceeded"
-#~ msgctxt "ClientError"
-#~ msgid "Search size limit exceeded"
-#~ msgstr "PremaÅena veliÄina pretrage"
-
-#~| msgid "Search time limit exceeded"
-#~ msgctxt "ClientError"
-#~ msgid "Search time limit exceeded"
-#~ msgstr "Isteklo vreme za pretragu"
-
-#~| msgid "Invalid query"
-#~ msgctxt "ClientError"
-#~ msgid "Invalid query"
-#~ msgstr "Neispravan upit"
-
-#~| msgid "Query refused"
-#~ msgctxt "ClientError"
-#~ msgid "Query refused"
-#~ msgstr "Upit odbijen"
-
-#~| msgid "I/O error"
-#~ msgctxt "ClientError"
-#~ msgid "Other error"
-#~ msgstr "Druga greÅka"
-
-#~| msgid "Unknown error"
-#~ msgctxt "ClientError"
-#~ msgid "Unknown error"
-#~ msgstr "Nepoznata greÅka"
-
-#~ msgid "Updating contacts cache (%d)... "
-#~ msgstr "OsveÅavam preuzete kontakte (%d)... "
-
-#~ msgid "\"%s\" on book before \"%s\""
-#~ msgstr "â%sâ u knjizi pre â%sâ"
-
-#~ msgid "book busy"
-#~ msgstr "knjiga zauzeta"
-
-#~ msgid "CORBA exception making \"%s\" call"
-#~ msgstr "CORBA izuzetak pri pozivu â%sâ"
-
-#~ msgid "%s: there is no current operation"
-#~ msgstr "%s: nema trenutne operacije"
-
-#~ msgid "\"%s\" on book after \"%s\""
-#~ msgstr "â%sâ na knjizi posle â%sâ"
-
-# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
-#~ msgid "%s: canceled"
-#~ msgstr "%s: otkazano"
-
-#~ msgid "%s: no factories available for URI `%s'"
-#~ msgstr "%s: nema dostupne proizvodnje za adresu â%s'"
-
-#~ msgid "%s: Could not create EBookListener"
-#~ msgstr "%s: nije moguÄe pravljenje EBookListener"
-
-#~ msgid "%s: there was no self contact UID stored in gconf"
-#~ msgstr "%s: nema sopstveni JIB kontakta smeÅten u gconf"
-
-#~ msgid "Could not create thread for getting deltas"
-#~ msgstr "Nije moguÄe da napraviti niz za pribavljanje delti"
-
-#~ msgid "Offline mode unavailable"
-#~ msgstr "Rad van mreÅe nije dostupan"
-
-#~ msgid "Could not create thread for populating cache"
-#~ msgstr "Nije moguÄe napraviti niz za popunjavanje ostave"
-
-#~ msgid "Reply Requested: by "
-#~ msgstr "Potreban odgovor: za "
-
-#~ msgid "Reply Requested: When convenient"
-#~ msgstr "Potreban odgovor: kada je zgodno"
-
-#~ msgid "Loading %s items"
-#~ msgstr "UÄitavanje %s predmeta"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendar"
-
-#~ msgid "Cannot open message"
-#~ msgstr "Nije moguÄe otvoriti poruku"
-
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "NepodrÅana operacija: prikljuÄenje poruke: za %s"
-
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "NepodrÅana operacija: pretraga po izrazu: za %s"
-
-#~ msgid "Unsupported operation: count by expression: for %s"
-#~ msgstr "NepodrÅana operacija: prebrojavanje po izrazu: za %s"
-
-#~ msgid "Unsupported operation: search by UIDs: for %s"
-#~ msgstr "NepodrÅana operacija: pretraga po JIB: za %s"
-
-#~ msgid "Learning junk"
-#~ msgstr "UÄenje Åta je Äubre"
-
-#~ msgid "Learning non-junk"
-#~ msgstr "UÄenje Åta nije Äubre"
-
-#~ msgid "Canceled."
-#~ msgstr "Odustato."
-
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "Ovo je deo poruke sa digitalnim potpisom"
-
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "Nije moguÄa provera potpisa poruke: nije moguÄe napraviti privremenu "
-#~ "datoteku: %s"
-
-#~ msgid "Unable to parse message content"
-#~ msgstr "Nije moguÄe proÄitati sadrÅaj poruke"
-
-#~ msgid "cannot create thread"
-#~ msgstr "nije moguÄe pravljenje niza"
-
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 4 prijave."
-
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nije moguÄe dobiti Kerberos kartu:\n"
-#~ "%s"
-
-#~ msgid "POP Before SMTP auth using a non-pop source"
-#~ msgstr "POP pre SMTP auth koriÅÄenjem izvora koji nije pop"
-
-#~ msgid ""
-#~ "Could not create directory %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nije moguÄe napraviti direktorijum %s:\n"
-#~ "%s"
-
-#~ msgid "Camel session doesn't support forwarding of a message."
-#~ msgstr "Camel sesija ne podrÅava prosleÄivanje poruke."
-
-#~ msgid "import keys: unimplemented"
-#~ msgstr "uvoz kljuÄeva: neizvedeno"
-
-#~ msgid "export keys: unimplemented"
-#~ msgstr "izvoz kljuÄeva: neizvedeno"
-
-#~ msgid "Cannot get folder: Invalid operation on this store"
-#~ msgstr "Nije moguÄe dobiti fasciklu: neispravna operacija"
-
-#~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr "Nije moguÄe napraviti fasciklu: neispravna operacija"
-
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "Nije moguÄe dobijanje sertifikata izdavaÄa"
-
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "Nije moguÄe dobiti listu povuÄenih sertifikata"
-
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "Nije moguÄe deÅifrovanje potpisa sertifikata"
-
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr "Nije moguÄe deÅifrovanje potpisa za listu povuÄenih sertifikata"
-
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "Nije moguÄe deÅifrovati javni kljuÄ izdavaÄa"
-
-#~ msgid "Certificate signature failure"
-#~ msgstr "Neuspeo potpis sertifikata"
-
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "Neuspeo potpis za listu povuÄenih sertifikata"
-
-#~ msgid "Certificate not yet valid"
-#~ msgstr "Sertifikat joÅ nije vaÅeÄi"
-
-#~ msgid "Certificate has expired"
-#~ msgstr "Sertifikat je istekao"
-
-#~ msgid "CRL not yet valid"
-#~ msgstr "CRL joÅ nije vaÅeÄi"
-
-#~ msgid "CRL has expired"
-#~ msgstr "CRL je istekao"
-
-#~ msgid "Error in CRL"
-#~ msgstr "GreÅka u CRL"
-
-#~ msgid "Out of memory"
-#~ msgstr "Nema viÅe memorije"
-
-#~ msgid "Zero-depth self-signed certificate"
-#~ msgstr "Samopotpisani sertifikat je nulte veliÄine"
-
-#~ msgid "Self-signed certificate in chain"
-#~ msgstr "Samopotpisani sertifikat u lancu"
-
-#~ msgid "Unable to get issuer's certificate locally"
-#~ msgstr "Nije moguÄe lokalno dobiti izdavaÄev sertifikat"
-
-#~ msgid "Unable to verify leaf signature"
-#~ msgstr "Nije moguÄe dobiti potpis lista"
-
-#~ msgid "Certificate chain too long"
-#~ msgstr "Lanac sertifikata je predugaÄak"
-
-#~ msgid "Certificate Revoked"
-#~ msgstr "PovuÄen sertifikat"
-
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "Neispravan izdavaÄ sertifikata (CA)"
-
-#~ msgid "Path length exceeded"
-#~ msgstr "PremaÅena duÅina putanje"
-
-#~ msgid "Invalid purpose"
-#~ msgstr "Neispravna svrha"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "Nepoverljiv sertifikat"
-
-#~ msgid "Certificate rejected"
-#~ msgstr "Odbijen sertifikat"
-
-#~ msgid "Subject/Issuer mismatch"
-#~ msgstr "Naslov/izdavaÄ neslaganje"
-
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "AKID/SKID neslaganje"
-
-#~ msgid "AKID/Issuer serial mismatch"
-#~ msgstr "AKID/izdavaÄ serijsko neslaganje"
-
-#~ msgid "Error in application verification"
-#~ msgstr "GreÅka pri proveri programa"
-
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "LoÅ sertifikat od %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Åelite li ipak da prihvatite?"
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Nije moguÄe dobiti poruku: %s\n"
-#~ "  %s"
-
-# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
-#~ msgid "User canceled"
-#~ msgstr "Korisnik odustao"
-
-#~ msgid "Could not get message"
-#~ msgstr "Nije moguÄe dobijanje poruke"
-
-#~ msgid "Trash Folder Full. Please Empty."
-#~ msgstr "Fascikla za smeÄe je puna. Ispraznite je."
-
-#~ msgid "Cannot append message to folder '%s': %s"
-#~ msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: %s"
-
-#~ msgid "Cannot append message in offline mode: cache unavailable"
-#~ msgstr "Nije moguÄe dodati poruku u reÅimu van mreÅe: nedostupna ostava"
-
-#~ msgid "Cannot append message in offline mode: %s"
-#~ msgstr "Nije moguÄe dodavati poruku u reÅimu van mreÅe: %s"
-
-#~ msgid "Checking for new mail"
-#~ msgstr "Proveravanje za novom poÅtom"
-
-#~ msgid "Check new messages for J_unk contents"
-#~ msgstr "Proveri da nema Ä_ubreta meÄu novim porukama"
-
-#~ msgid "Automatically synchroni_ze account locally"
-#~ msgstr "Automatski u_skladi nalog lokalno"
-
-#~ msgid "SOAP Settings"
-#~ msgstr "SOAP podeÅavanja"
-
-#~ msgid "Post Office Agent SOAP _Port:"
-#~ msgstr "_Port SOAP posrednika za poÅtu:"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell GroupWise"
-
-#~ msgid "For accessing Novell GroupWise servers"
-#~ msgstr "Za pristupanje Novell Groupwise serverima"
-
-#~ msgid ""
-#~ "This option will connect to the GroupWise server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "Ova opcija Äe povezati na GroupWise server koriÅÄenjem lozinke u obiÄnom "
-#~ "tekstu."
-
-#~ msgid "Host or user not available in url"
-#~ msgstr "DomaÄin ili korisnik u adresi nisu dostupni"
-
-#~ msgid ""
-#~ "Some features may not work correctly with your current server version"
-#~ msgstr "Neke opcije moÅda neÄe ispravno raditi na trenutnoj verziji servera"
-
-#~ msgid "Cannot create GroupWise folders in offline mode."
-#~ msgstr "Nije moguÄe pravljenje GroupWise fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
-#~ msgstr "Nije moguÄe preimenovati GroupWise fasciklu â%sâ u â%sâ"
-
-#~ msgid "GroupWise server %s"
-#~ msgstr "GroupWise server %s"
-
-#~ msgid "GroupWise service for %s on %s"
-#~ msgstr "GroupWise servis za %s na %s"
-
-#~ msgid "GroupWise mail delivery via %s"
-#~ msgstr "GroupWise dostava poÅte preko %s"
-
-#~ msgid "Sending Message"
-#~ msgstr "Slanje poruke"
-
-#~ msgid ""
-#~ "You have exceeded this account's storage limit. Your messages are queued "
-#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
-#~ "some of your mail.\n"
-#~ msgstr ""
-#~ "Dostigli ste smeÅtajno ograniÄenje za ovaj nalog. VaÅe poruke biÄe "
-#~ "odlagane u odlaznoj poÅti. PoÅaljite ih ponovo pritiskom na PoÅalji/Primi "
-#~ "dugme nakon Åto uklonite ili arhivirate vaÅu poÅtu.\n"
-
-#~ msgid "Hula"
-#~ msgstr "Hula"
-
-#~ msgid "For accessing Hula servers"
-#~ msgstr "Za pristupanje Hula serverima"
-
-#~ msgid ""
-#~ "This option will connect to the Hula server using a plaintext password."
-#~ msgstr ""
-#~ "Ova moguÄnost obezbeÄuje povezvanje na Hula server koriÅÄenjem lozinke u "
-#~ "obiÄnom tekstu."
-
-#~ msgid "Operation cancelled"
-#~ msgstr "Operacija otkazana"
-
-#~ msgid "Unexpected response status '%s' after APPEND command"
-#~ msgstr "NeoÄekivani status odgovora â%sââ nakon naredbe APPEND"
-
-#~ msgid "No response on continuation after APPEND command"
-#~ msgstr "Nema odziva nakon naredbe APPEND"
-
-#~ msgid "Unknown error occurred during APPEND command!"
-#~ msgstr "Nepoznata greÅka se javila tokom naredbe APPEND!"
-
-#~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr "Pri_meni filtere na nove poruke u SANDUÄETU ovog servera"
-
-#~ msgid "SSL negotiations failed"
-#~ msgstr "SSL pregovori nisu uspeli"
-
-#~ msgid "Drafts"
-#~ msgstr "Priprema"
-
-#~ msgid "Sent"
-#~ msgstr "Poslato"
-
-#~ msgid "Templates"
-#~ msgstr "Åabloni"
-
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
-
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "NeoÄekivan odgovor od IMAP4 servera %s: %s"
-
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "NeoÄekivan pozdrav od IMAP servera: %s."
-
-#~ msgid "Cannot select folder '%s': Invalid mailbox name"
-#~ msgstr "Nije moguÄe izabrati fasciklu â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot select folder '%s': Bad command"
-#~ msgstr "Nije moguÄe izabrati fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
-
-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "Veza sa IMAP4 serverom %s je neoÄekivano prekinuta: %s"
-
-#~ msgid ""
-#~ "Enable extended Mailing-List detection required for some filter and "
-#~ "vFolder rules"
-#~ msgstr ""
-#~ "OmoguÄavanje otkrivanja dopisne liste je potrebno nekim filterima i "
-#~ "pravilima za vFascikle"
-
-#~ msgid "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "Isticanje zapamÄenih poruka koje nisu proÄitane za X sekundi"
-
-#~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "Isticanje zapamÄenih porukastarijih od X sekundi"
-
-#~ msgid "Cannot access folder '%s': %s"
-#~ msgstr "Nije moguÄe pristupiti fascikli â%sâ: %s"
-
-#~ msgid "Cannot sync flags to folder '%s': Unknown error"
-#~ msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: nepoznata greÅka"
-
-#~ msgid "Cannot sync flags to folder '%s': Bad command"
-#~ msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot expunge folder '%s': Unknown error"
-#~ msgstr "Nije moguÄe isprazniti fasciklu â%sâ: nepoznata greÅka"
-
-#~ msgid "Cannot expunge folder '%s': Bad command"
-#~ msgstr "Nije moguÄe isprazniti fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: nema takve poruke"
-
-#~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: loÅa naredba"
-
-#~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr ""
-#~ "Nije moguÄe dodati poruku u fasciklu â%sâ: fascikla je samo za Äitanje"
-
-#~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: nepoznata greÅka"
-
-#~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "Nije moguÄe premestiti poruku iz fascikle â%sâ u fasciklu â%sâ: nepoznata "
-#~ "greÅka"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr ""
-#~ "Nije moguÄe umnoÅiti poruke iz fascikle â%sâ u fasciklu â%sâ: nepoznata "
-#~ "greÅka"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "Nije moguÄe premestiti poruke iz fascikle â%sâ u fasciklu â%sâ: loÅa "
-#~ "naredba"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "Nije moguÄe umnoÅiti poruku iz fascikle â%sâ u fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr "Proveri da nema Äubreta samo u fascikli SANDUÄE"
-
-#~ msgid "IMAP4rev1"
-#~ msgstr "IMAPv4rev1"
-
-#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
-#~ msgstr "Za Äitanje i smeÅtanje poÅte na IMAPv4rev1 servere."
-
-#~ msgid ""
-#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "Ova opcija Äe povezati na IMAPv4rev1 server koriÅÄenjem lozinke u obiÄnom "
-#~ "tekstu."
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "Neuspelo povezivanje na IMAP server %s u bezbednosnom reÅimu: server ne "
-#~ "podrÅava STARTTLS"
-
-#~ msgid "TLS negotiations failed"
-#~ msgstr "TLS pregovori nisu uspeli"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu mehanizma prijave %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu %s"
-
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "Nije moguÄe pravljenje IMAP fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#~ msgstr ""
-#~ "Nije moguÄe dobiti fasciklu â%sâ sa IMAP servera %s: nepoznata greÅka"
-
-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#~ msgstr "Nije moguÄe dobiti LIST informaciju za â%sâ sa IMAP servera %s: %s"
-
-#~ msgid "Bad command"
-#~ msgstr "LoÅa komanda"
-
-#~ msgid "Cannot create folder '%s': Invalid mailbox name"
-#~ msgstr "Nije moguÄe napraviti fasciklu â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot create folder '%s': Bad command"
-#~ msgstr "Nije moguÄe napraviti fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot delete folder '%s': Special folder"
-#~ msgstr "Nije moguÄe obrisati fasciklu â%sâ: specijalna fascikla"
-
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "Nije moguÄe brisanje IMAP fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
-#~ msgstr "Nije moguÄe obrisati fasciklu â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot delete folder '%s': Bad command"
-#~ msgstr "Nije moguÄe obrisati fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
-#~ msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: specijalna fascikla"
-
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "Nije moguÄe preimenovanje IMAP fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
-#~ msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: loÅa naredba"
-
-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr ""
-#~ "Nije moguÄe dobiti podatke %s za obrazac â%sâ sa IMAP servera %s: %s"
-
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "Nije moguÄa prijava na IMAP fascikle u reÅimu van mreÅe."
-
-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-#~ msgstr "Nije moguÄa prijava na fasciklu â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot subscribe to folder '%s': Bad command"
-#~ msgstr "Nije moguÄa prijava na fasciklu â%sâ: loÅa naredba"
-
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "Nije moguÄe odjavljivanje sa IMAP fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr "Nije moguÄa odjava sa fascikle â%sâ: neispravno ime sanduÄeta"
-
-#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
-#~ msgstr "Nije moguÄa odjava sa fascikle â%sâ: loÅa naredba"
-
-#~ msgid "Scanning for changed messages"
-#~ msgstr "Pretraga za izmenjenim porukama"
-
-#~ msgid "IMAP server %s is in an inconsistent state."
-#~ msgstr "IMAP server %s nije usklaÄen."
-
-#~ msgid "Fetching envelopes of new messages"
-#~ msgstr "Pribavljanje omota za nove poruke"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "NeoÄekivani element u odgovoru IMAP servera %s: "
-
-#~ msgid "No data"
-#~ msgstr "Nema podataka"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Veza sa IMAP serverom %s je neoÄekivano prekinuta: %s"
-
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-#~ msgstr ""
-#~ "Eksperimentalni IMAP 4(.1) klijent\n"
-#~ "Ovo je neproveren i nepodrÅan kod, bolje koristite obiÄan imap.\n"
-#~ "\n"
-#~ " !!! NE KORISTITE OVO ZA VAÅNU POÅTU  !!!\n"
-
-#~ msgid "Could not connect to %s (port %s): %s"
-#~ msgstr "Nije moguÄe povezivanje na %s (port %s): %s"
-
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "Nije moguÄe povezivanje na POP server %s"
-
-#~ msgid "Maildir append message canceled"
-#~ msgstr "Prododata maildir poruka poniÅtena"
-
-#~ msgid "Invalid message contents"
-#~ msgstr "Neispravan sadrÅaj poruke"
-
-#~ msgid "Mail append canceled"
-#~ msgstr "Dodavanje poÅte otkazano"
-
-#~ msgid "Message construction failed."
-#~ msgstr "Sastavljanje poruke neuspelo."
-
-#~ msgid "MH append message canceled"
-#~ msgstr "MH dodavanje poruke otkazano"
-
-#~ msgid "Use cancel"
-#~ msgstr "Koristite odustani"
-
-#~ msgid "STARTTLS command failed"
-#~ msgstr "Neuspela STARTTLS komanda"
-
-#~ msgid "HELO command failed"
-#~ msgstr "Neuspela HELO komanda"
-
-#~ msgid "AUTH command failed"
-#~ msgstr "Neuspela AUTH komanda"
-
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "LoÅ odgovor na autentifikaciju od servera.\n"
-
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "Neuspela MAIL FROM komanda: %s: poÅta nije poslata"
-
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "Neuspela RCPT TO komanda: %s: poÅta nije poslata"
-
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "Neuspela DATA komanda: %s: poÅta nije poslata"
-
-#~ msgid "RSET command failed"
-#~ msgstr "Neuspela RSET komanda"
-
-#~ msgid "QUIT command failed"
-#~ msgstr "Neuspela QUIT komanda"
-
-#~ msgid "Item(s) belong to these _categories:"
-#~ msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
-
-#~ msgid "_Edit"
-#~ msgstr "_UreÄivanje"
-
-#~ msgid "categories"
-#~ msgstr "kategorije"
-
-#~ msgid "Color Info"
-#~ msgstr "Podaci o bojama"
-
-#~ msgid "The color to render"
-#~ msgstr "Boja za obradu"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "<b>Co_ntacts</b>"
-#~ msgstr "<b>Ko_ntakti</b>"
-
-#~ msgid "<b>Show Contacts</b>"
-#~ msgstr "<b>PrikaÅi kontakte</b>"
-
-#~ msgid "Enter password for %s"
-#~ msgstr "Unesite lozinku za %s"
-
-#~ msgid "Enter password"
-#~ msgstr "Unesite lozinku"
-
-#~ msgid "Owner"
-#~ msgstr "Vlasnik"
-
-#~ msgid "Publishing Editor"
-#~ msgstr "UreÄivaÄ za objavljivanje"
-
-#~ msgid "Editor"
-#~ msgstr "UreÄivaÄ"
-
-#~ msgid "Publishing Author"
-#~ msgstr "Autor za objavljivanje"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Non-editing Author"
-#~ msgstr "Autor koji ne ureÄuje"
-
-#~ msgid "Reviewer"
-#~ msgstr "Recenzent"
-
-#~ msgid "Contributor"
-#~ msgstr "Saradnik"
-
-#~ msgid "None"
-#~ msgstr "NiÅta"
-
-#~ msgid "Custom"
-#~ msgstr "PrilagoÄeno"
-
-#~ msgid "Generic error"
-#~ msgstr "OpÅta greÅka"
-
-#~ msgid "A folder with the same name already exists"
-#~ msgstr "Fascikla istog imena veÄ postoji"
-
-#~ msgid "The specified folder type is not valid"
-#~ msgstr "Naveden tip fascikle nije ispravan"
-
-#~ msgid "Not enough space to create the folder"
-#~ msgstr "Nema dovoljno prostora za pravljenje fascikle"
-
-#~ msgid "The folder is not empty"
-#~ msgstr "Fascikla nije prazna"
-
-#~ msgid "The specified folder was not found"
-#~ msgstr "Navedena fascikla nije pronaÄena"
-
-#~ msgid "Function not implemented in this storage"
-#~ msgstr "Funkcija nije primenjena u ovoj ostavi"
-
-#~ msgid "Operation not supported"
-#~ msgstr "Operacija nije podrÅana"
-
-#~ msgid "The specified type is not supported in this storage"
-#~ msgstr "Navedeni tip u ovoj ostavi nije podrÅan"
-
-#~ msgid "The specified folder cannot be modified or removed"
-#~ msgstr "Navedena fascikla ne moÅe biti izmenjena niti uklonjena"
-
-#~ msgid "Cannot make a folder a child of one of its descendants"
-#~ msgstr "Nije moguÄe napraviti fasciklu tako da se nalazi u njoj samoj"
-
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "Nije moguÄe napraviti fasciklu toga imena"
-
-#~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "Ova operacija ne moÅe biti izvedena u reÅimu van mreÅe."
-
-#~ msgid "%s's Folders"
-#~ msgstr "Fascikle Äiji je vlasnik %s"
-
-#~ msgid "Personal Folders"
-#~ msgstr "LiÄne fascikle"
-
-#~ msgid "Favorite Public Folders"
-#~ msgstr "Omiljene javne fascikle"
-
-#~ msgid "All Public Folders"
-#~ msgstr "Sve javne fascikle"
-
-#~ msgid "Global Address List"
-#~ msgstr "Globalna lista adresa"
-
-#~ msgid "Deleted Items"
-#~ msgstr "Obrisani predmeti"
-
-#~ msgid "Journal"
-#~ msgstr "Dnevnik"
-
-#~ msgid "Notes"
-#~ msgstr "BeleÅke"
-
-#~ msgid "Outbox"
-#~ msgstr "Odlazna"
-
-#~ msgid "Sent Items"
-#~ msgstr "Poslati predmeti"
-
-#~ msgid "Tasks"
-#~ msgstr "ZaduÅenja"
-
-#~ msgid "Invalid connection"
-#~ msgstr "Neispravno povezivanje"
-
-#~ msgid "No response from the server"
-#~ msgstr "Nema odgovora servera"
-
-#~ msgid "Bad parameter"
-#~ msgstr "LoÅ parametar"
-
-#~ msgid "Evolution Addressbook file backend"
-#~ msgstr "PodrÅka datoteke adresara za Evoluciju"
-
-#~ msgid "Evolution Calendar file and webcal backend"
-#~ msgstr "Datoteka kalendara i webcal podrÅka za Evoluciju"
-
-#~ msgid "Evolution Data Server interface check service"
-#~ msgstr "Servis za proveru suÄelja Servera podataka Evolucije"
-
-#~ msgid "Evolution Data Server logging service"
-#~ msgstr "Servis za prijavu Servera podataka Evolucije"
-
-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr ""
-#~ "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazati "
-#~ "prozorÄe za greÅke\n"
-
-#~ msgid "Fair"
-#~ msgstr "Äisto"
-
-#~ msgid "Snow showers"
-#~ msgstr "MeÄava"
-
-#~ msgid "Snow"
-#~ msgstr "Sneg"
-
-#~ msgid "Partly cloudy"
-#~ msgstr "MestimiÄno oblaÄno"
-
-#~ msgid "Smoke"
-#~ msgstr "Dim"
-
-#~ msgid "Thunderstorms"
-#~ msgstr "Grmljavine"
-
-#~ msgid "Cloudy"
-#~ msgstr "OblaÄno"
-
-#~ msgid "Drizzle"
-#~ msgstr "Slaba kiÅa"
-
-#~ msgid "Sunny"
-#~ msgstr "SunÄano"
-
-#~ msgid "Dust"
-#~ msgstr "PraÅina"
-
-#~ msgid "Clear"
-#~ msgstr "Vedro"
-
-#~ msgid "Mostly cloudy"
-#~ msgstr "PreteÅno oblaÄno"
-
-#~ msgid "Windy"
-#~ msgstr "Vetrovito"
-
-#~ msgid "Rain showers"
-#~ msgstr "Jaka kiÅa"
-
-#~ msgid "Foggy"
-#~ msgstr "Maglovito"
-
-#~ msgid "Rain/snow mixed"
-#~ msgstr "KiÅa i sneg"
-
-#~ msgid "Sleet"
-#~ msgstr "KiÅa praÄena snegom"
-
-#~ msgid "Very hot/humid"
-#~ msgstr "Veoma toplo/vlaÅno"
-
-#~ msgid "Blizzard"
-#~ msgstr "Ledena oluja"
-
-#~ msgid "Freezing rain"
-#~ msgstr "Ledena kiÅa"
-
-#~ msgid "Haze"
-#~ msgstr "Izmaglica"
-
-#~ msgid "Blowing snow"
-#~ msgstr "SneÅni naleti"
-
-#~ msgid "Freezing drizzle"
-#~ msgstr "Ledena slaba kiÅa"
-
-#~ msgid "Very cold/wind chill"
-#~ msgstr "Veoma hladno/vetrovito"
-
-#~ msgid "Rain"
-#~ msgstr "KiÅa"
-
-#~ msgid "Weather: Partly Cloudy"
-#~ msgstr "Vreme: mestimiÄno oblaÄno"
-
-#~ msgid "%.1fÂC - %s"
-#~ msgstr "%.1fÂC - %s"
-
-#~ msgid "%.1fÂF - %s"
-#~ msgstr "%.1fÂF - %s"
-
-#~ msgid "%.1f/%.1fÂC - %s"
-#~ msgstr "%.1f/%.1fÂC - %s"
-
-#~ msgid "%.1f/%.1fÂF - %s"
-#~ msgstr "%.1f/%.1fÂF - %s"
-
-#~ msgid "%d%% chance of precipitation\n"
-#~ msgstr "Åansa od %d%% za padavine\n"
-
-#~ msgid "%.1fcm snow\n"
-#~ msgstr "%.1fcm sneg\n"
-
-#~ msgid "%.1fin snow\n"
-#~ msgstr "%.1fin sneg\n"
-
-#~ msgid "%.1f-%.1fcm snow\n"
-#~ msgstr "%.1f-%.1fcm sneg\n"
-
-#~ msgid "%.1f-%.1fin snow\n"
-#~ msgstr "%.1f-%.1fin sneg\n"
-
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Neuspelo pravljenje sadrÅanog procesa â%sâ: %s"
-
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "IzvrÅavanje pretrage na nepoznatom zaglavlju: %s"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Dekodiranje neuspelo, greÅka %d"
-
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "Nije moguÄe naÄi sertifikat za â%sâ"
-
-#~ msgid "%sPlease enter the GroupWise password for %s %s"
-#~ msgstr "%sUnesite Groupwise lozinku za %s %s"
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "Fascikla je uniÅtena i ponovo na serveru napravljena."
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr "NeoÄekivan odgovor servera: istovetni JIB za poruke %d i %d"
-
-#~ msgid "%sPlease enter the IMAP password for %s %s"
-#~ msgstr "%sUnesite IMAP lozinku za %s %s"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sUnesite IMAP lozinku korisnika %s na domaÄinu %s"
-
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Nije moguÄe Äuvanje pregleda: %s: %s"
-
-#~ msgid "Please enter the NNTP password for %s %s"
-#~ msgstr "Unesite NNTP lozinku za %s %s"
-
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sUnesite SMTP lozinku za %s na domaÄinu %s"
-
-#~ msgid "Category _Color"
-#~ msgstr "_Boja kategorije"
-
-#~ msgid "Select User"
-#~ msgstr "Izaberite korisnika"
-
-#~ msgid "Addressbook..."
-#~ msgstr "Adresar..."
-
-#~ msgid "\t\t\t\t\t\t"
-#~ msgstr "\t\t\t\t\t\t"
-
-#~ msgid "Cannot get folder info in offline mode."
-#~ msgstr "Nije moguÄe dobiti podatke za fasciklu u reÅimu van mreÅe."
-
-#~ msgid "Cannot delete GroupWise folders in offline mode."
-#~ msgstr "Nije moguÄe brisanje GroupWise fascikli u reÅimu van mreÅe."
-
-#~ msgid "Cannot rename GroupWise folders in offline mode."
-#~ msgstr "Nije moguÄe preimenovanje GroupWise fascikli u reÅimu van mreÅe."
-
-#~ msgid "%sEnter password for %s"
-#~ msgstr "%sUnesite lozinku za %s"
-
-#~ msgid ""
-#~ "Could not authenticate to server. (Password incorrect?)\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nije moguÄa prijava na server. (NetaÄna lozinka?)\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Could not authenticate to server.\n"
-#~ "\n"
-#~ "This probably means that your server requires you\n"
-#~ "to specify the Windows domain name as part of your\n"
-#~ "username (eg, \"DOMAIN\\user\").\n"
-#~ "\n"
-#~ "Or you might have just typed your password wrong.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nije moguÄa prijava na server.\n"
-#~ "\n"
-#~ "Ovo verovatno znaÄi da je serveru potrebno da\n"
-#~ "navedete ime Windows domena kao deo korisniÄkog\n"
-#~ "imena (npr. âDOMEN\\korisnik\").\n"
-#~ "Ili ste moÅda samo pogreÅno ukucali lozinku.\n"
-#~ "\n"
-
-#~ msgid "Mailbox for %s is not on this server."
-#~ msgstr "Mailbox za %s nije na ovom serveru."
-
-#~ msgid ""
-#~ "The server '%s' is running Exchange 5.5 and is\n"
-#~ "therefore not compatible with Ximian Connector"
-#~ msgstr ""
-#~ "Server '%s' koristi Exchange 5.5 i stoga\n"
-#~ "nije kompatibilan sa Ximian Connector-om"
-
-#~ msgid ""
-#~ "Could not find Exchange Web Storage System at %s.\n"
-#~ "If OWA is running on a different path, you must specify that in the\n"
-#~ "account configuration dialog."
-#~ msgstr ""
-#~ "Nije moguÄe pronaÄi Exchange Web Storage System na %s.\n"
-#~ "Ukoliko OWA radi na drugoj putanji, morate je navesti u\n"
-#~ "podeÅavanju naloga."
-
-#~ msgid "No mailbox for user %s on %s.\n"
-#~ msgstr "Nema mailbox-a za korisnika %s na %s.\n"
-
-#~ msgid "Could not connect to server %s: %s"
-#~ msgstr "Nije moguÄe povezivanje na server %s: %s"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nije moguÄe povezivanje na domaÄina"
-
-#~ msgid "Network error"
-#~ msgstr "GreÅka na mreÅi"
-
-#~ msgid "Folder Name"
-#~ msgstr "Ime fascikle"
-
-#~ msgid "Folder Size"
-#~ msgstr "VeliÄina fascikle"
-
-#~ msgid "Groupwise server %s"
-#~ msgstr "GroupWise server %s"
-
-#~ msgid "e_book_open: cancelled"
-#~ msgstr "e_book_open: otkazan"
-
-#~ msgid "e_book_load_uri: no factories available for uri `%s'"
-#~ msgstr "e_book_load_uri: nema dostupnih tvornica za adresu â%sâ"
-
-#~ msgid "File As"
-#~ msgstr "Zavedi kao"
-
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisam mogao da primenim GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Nisam mogao da primenim GPG %s: %s\n"
-
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Adresar i kalendar"
-
-#~ msgid "Post Office Agent:"
-#~ msgstr "Agent za poÅtu:"
-
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Koristi bezbednu vezu (SSL)"
-
-#~ msgid "Checklist"
-#~ msgstr "Spisak za overu"
-
-#~ msgid "Server rejected username"
-#~ msgstr "Server je odbio korisnika"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "NeuspeÅno slanje korisniÄkog imena serveru"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "Server je odbio korisnika/lozinku"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Ne mogu da uÄitam datoteku sa spiskom grupa za %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Ne mogu da saÄuvam datoteku sa spiskom grupa za %s: %s"
-
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "Datoteka adresara i LDAP podrÅka za Evoluciju"
-
-#~ msgid "uid? expects 1 argument"
-#~ msgstr "uid? oÄekuje 1 argument"
-
-#~ msgid "uid? expects argument 1 to be a string"
-#~ msgstr "uid? oÄekuje 1 argument da bude niska"
-
-#~ msgid "e_book_add_contact called on book before e_book_load_uri"
-#~ msgstr "pozvan je e_book_add_contact na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::addContact call"
-#~ msgstr "Corba izuzetak poziva Book::addContact"
-
-#~ msgid "e_book_commit_contact called on book before e_book_load_uri"
-#~ msgstr "pozvan je e_book_commit_contact na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::modifyContact call"
-#~ msgstr "Corba izuzetak poziva Book::modifyContact"
-
-#~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_fields na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getSupportedFields call"
-#~ msgstr "Corba izuzetak poziva Book::getSupportedFields"
-
-#~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_auth_methods na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getSupportedAuthMethods call"
-#~ msgstr "Corba izuzetak poziva Book::getSupportedAuthMethods"
-
-#~ msgid "e_book_authenticate_user on book before e_book_load_uri"
-#~ msgstr "e_book_authenticate_user na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::authenticateUser call"
-#~ msgstr "Corba izuzetak poziva Book::authenticateUser"
-
-#~ msgid "e_book_get_contact on book before e_book_load_uri"
-#~ msgstr "e_book_get_contact na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getContact call"
-#~ msgstr "Corba izuzetak poziva Book::getContact"
-
-#~ msgid "e_book_remove_contact on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contact na imeniku pre e_book_load_uri"
-
-#~ msgid "e_book_remove_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contacts na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::removeContacts call"
-#~ msgstr "Corba izuzetak poziva Book::removeContacts"
-
-#~ msgid "e_book_get_book_view on book before e_book_load_uri"
-#~ msgstr "e_book_get_book_view na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getBookView call"
-#~ msgstr "Corba izuzetak poziva Book::getBookView"
-
-#~ msgid "e_book_get_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_get_contacts na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getContactList call"
-#~ msgstr "Corba izuzetak poziva Book::getContactList"
-
-#~ msgid "e_book_get_changes on book before e_book_load_uri"
-#~ msgstr "e_book_get_changes na imeniku pre e_book_load_uri"
-
-#~ msgid "Corba exception making Book::getChanges call"
-#~ msgstr "Corba izuzetak poziva Book::getChanges"
-
-#~ msgid "Corba exception making Book::cancelOperation call"
-#~ msgstr "Corba izuzetak poziva Book::cancelOperation"
+#: ../libedataserverui/e-source-selector-dialog.c:326
+msgid "Select destination"
+msgstr "Izaberite odrediÅte"
 
-#~ msgid "e_book_remove on book before e_book_load_uri"
-#~ msgstr "e_book_remove na imeniku pre e_book_load_uri"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "Kalendar"
 
-#~ msgid "time-now expects 0 arguments"
-#~ msgstr "vreme-sada oÄekuje 0 argumenata"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:184
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "Kod: %u â NeoÄekivani odgovor sa servera"
 
-#~ msgid "make-time expects argument 1 to be a string"
-#~ msgstr "unesi-vreme oÄekuje da argument 1 bude niz"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:205
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Nisam uspeo da obradim samootkrivajuÄi odgovor IksML"
 
-#~ msgid "time-add-day expects 2 arguments"
-#~ msgstr "dodaj-vreme oÄekuje 2 argumenta"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:214
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Nisam uspeo da pronaÄem element samootkrivanja"
 
-#~ msgid "time-day-begin expects 1 argument"
-#~ msgstr "vreme-poÄetka-dana oÄekuje 1 argument"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:226
+#, c-format
+msgid "Failed to find Response element"
+msgstr "Nisam uspeo da pronaÄem element odgovora"
 
-#~ msgid "time-day-begin expects argument 1 to be a time_t"
-#~ msgstr "vreme-poÄetka-dana oÄekuje da argument 1 bude time_t"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:238
+#, c-format
+msgid "Failed to find Account element"
+msgstr "Nisam uspeo da pronaÄem element naloga"
 
-#~ msgid "time-day-end expects 1 argument"
-#~ msgstr "vreme-kraja-dana oÄekuje 1 argument"
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "Nisam uspeo da pronaÄem ASadresu i OABadresu u odgovoru samootkrivanja"
 
-#~ msgid "occur-in-time-range? expects 2 arguments"
-#~ msgstr "desi-se-u-periodu? oÄekuje 2 argumenta"
+#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+msgid "Tasks"
+msgstr "ZaduÅenja"
 
-#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
-#~ msgstr "desi-se-u-periodu? oÄekuje da argument 1 bude time_t"
+#: ../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 "Nastavlja da radi nakon zatvaranja poslednjeg klijenta"
 
-#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
-#~ msgstr "desi-se-u-periodu? oÄekuje da argument 2 bude time_t"
+#: ../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 "Äeka sa pokretanjem sve dok se barem jedan klijent ne poveÅe"
 
-#~ msgid "has-recurrences? expects no arguments"
-#~ msgstr "ponavlja-se? ne oÄekuje argumente"
+#: ../tests/libedataserverui/evolution-source-viewer.c:569
+msgid "Evolution Source Viewer"
+msgstr "Prikazivanje izvora Evolucije"
 
-#~ msgid "is-completed? expects 0 arguments"
-#~ msgstr "je-gotov? oÄekuje 0 argumenata"
+#: ../tests/libedataserverui/evolution-source-viewer.c:598
+msgid "Display Name"
+msgstr "Naziv prikaza"
 
-#~ msgid "completed-before? expects 1 argument"
-#~ msgstr "gotov-pre? oÄekuje 1 argument"
+#: ../tests/libedataserverui/evolution-source-viewer.c:607
+msgid "Flags"
+msgstr "Opcije"
 
-#~ msgid "completed-before? expects argument 1 to be a time_t"
-#~ msgstr "gotov-pre? oÄekuje da argument 1 bude time_t"
+#: ../tests/libedataserverui/evolution-source-viewer.c:635
+msgid "Identity"
+msgstr "Identitet"



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