[evolution-data-server] Updated Serbian translation



commit fc9945c90bd0cd595d39cc7bcc10a5b26d69c545
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Sat Feb 11 10:51:29 2012 +0100

    Updated Serbian translation

 po/sr.po       | 2546 +++++++++++++++++++++++++++++++-------------------------
 po/sr latin po | 2546 +++++++++++++++++++++++++++++++-------------------------
 2 files changed, 2802 insertions(+), 2290 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 6e7f2d7..086c2c7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,85 +1,150 @@
 # Serbian translation of evolution-data-server
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
 # This file is distributed under the same license as the evolution-data-server package.
 # Maintainer: ÐÐÐÐÐÐ ÐÐÐÐÐ <dsegan gmx net>
 # Reviewed on 2005-08-20 by: ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-09-18 16:38+0000\n"
-"PO-Revision-Date: 2011-09-18 10:10+0200\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-07 11:57+0000\n"
+"PO-Revision-Date: 2012-02-11 10:36+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.7.0-beta5\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"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:828
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#: ../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:4595 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:161
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:150
+#, c-format
+#| msgid "Failed to create pipe to '%s': %s"
+msgid "Failed to remove file '%s': %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÑ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:173
+#, c-format
+#| msgid "Could not create directory %s: %s"
+msgid "Failed to make directory %s: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:468
+#, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÑÑ ÐÐÐÑ ÐÐ ÐÐÐÐÑ â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/file/e-book-backend-file.c:1125
+msgid "No UID in the contact"
+msgstr "ÐÐÐÐ ÐÐÐ-Ð Ñ ÐÐÐÑÐÐÑÑ"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1559
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
 msgid "Loading..."
 msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:831
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+#: ../addressbook/backends/file/e-book-backend-file.c:1562
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4863
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
 msgid "Searching..."
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐÑ â%sâ"
+
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:840
+#: ../addressbook/backends/google/e-book-backend-google.c:831
 msgid "Querying for updated contactsâ"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
-#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1951
+#: ../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:893
+#: ../addressbook/backends/google/e-book-backend-google.c:882
 msgid "Friends"
 msgstr "ÐÑÐÑÐÑÐÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:895
+#: ../addressbook/backends/google/e-book-backend-google.c:884
 msgid "Family"
 msgstr "ÐÐÑÐÐÐÑÐ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:897
+#: ../addressbook/backends/google/e-book-backend-google.c:886
 msgid "Coworkers"
 msgstr "ÐÐÑÐÐÐÐÑÐ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:981
+#: ../addressbook/backends/google/e-book-backend-google.c:970
 msgid "Querying for updated groupsâ"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÑÑÐÐÐÐ..."
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1362
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+msgid "The backend does not support bulk additions"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐÑÐ"
+
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1400
+#: ../addressbook/backends/google/e-book-backend-google.c:1389
 msgid "Creating new contactâ"
 msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1510
+#: ../addressbook/backends/google/e-book-backend-google.c:1476
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:431
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "The backend does not support bulk removals"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÐÐÐÑÐÑÐ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1504
 msgid "Deleting contactâ"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÑÐÐÑ..."
 
+#: ../addressbook/backends/google/e-book-backend-google.c:1749
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
+#| msgid "Key usage does not support certificate signing"
+msgid "The backend does not support bulk modifications"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
+
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1791
+#: ../addressbook/backends/google/e-book-backend-google.c:1782
 msgid "Modifying contactâ"
 msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1998
+#: ../addressbook/backends/google/e-book-backend-google.c:1983
 msgid "Loadingâ"
 msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2156
+#: ../addressbook/backends/google/e-book-backend-google.c:2108
 msgid "Authenticating with the serverâ"
 msgstr "ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÑÐÑÐÐÑÐÐ..."
 
@@ -88,81 +153,65 @@ msgstr "ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÑÐÑÐÐÑÐÐ..."
 msgid "Not connected"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "ÐÐÑÐÑÑÐÐ ÐÑÑÐÐÐÑÑÐ ÐÐÐ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
 msgid "Invalid DN syntax"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
 msgid "Adding contact to LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
 msgid "Removing contact from LDAP server..."
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
 msgid "Modifying contact from LDAP server..."
 msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4713
 msgid "Receiving LDAP search results..."
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4884
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5005
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:452
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
-#: ../calendar/backends/http/e-cal-backend-http.c:433
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:411
-#: ../camel/providers/imapx/camel-imapx-server.c:2280
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
-#: ../libedataserver/e-client.c:159
-msgid "Unknown error"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐ â%sâ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3216
+#: ../addressbook/libebook/e-book.c:3196
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ â%sâ ÑÐÐÑÑÐÐÐÐ Ñ ÐÐÐÐÑÑ."
 
-#: ../addressbook/libebook/e-book.c:3532 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1946
+#: ../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:3658
-#: ../addressbook/libebook/e-book-client.c:678
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../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 "ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
@@ -171,12 +220,12 @@ msgid "No such book"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
 #: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
@@ -185,57 +234,58 @@ msgid "No such source"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "ÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:491
+#: ../addressbook/libebook/e-book-client.c:512
 msgid "Failed to run book factory"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-book-client.c:501
-#: ../addressbook/libedata-book/e-data-book-factory.c:379
-#: ../addressbook/libedata-book/e-data-book-factory.c:437
+#: ../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:399
+#: ../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:603
+#: ../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:641
+#: ../addressbook/libebook/e-book-client.c:662
 msgid "Failed to find system book"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../addressbook/libebook/e-book-client.c:750
+#: ../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:2280
-#: ../calendar/libecal/e-cal-client.c:4475
+#: ../addressbook/libebook/e-book-client.c:2563
+#: ../calendar/libecal/e-cal-client.c:4480
 msgid "Cannot get connection to view"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:117
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:120
 msgid "File Under"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Book URI"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
 
@@ -243,546 +293,546 @@ msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Full Name"
 msgstr "ÐÑÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Given Name"
 msgstr "ÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Family Name"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Nickname"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 1"
 msgstr "1Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 2"
 msgstr "2Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 3"
 msgstr "3Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Email 4"
 msgstr "4Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Mailer"
 msgstr "ÐÐÑÐÑÐÐÐÑ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Home Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Work Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Other Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Phone 2"
 msgstr "2Â ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Business Fax"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Callback Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Phone 2"
 msgstr "2Â ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Home Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "ISDN"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Other Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Pager"
 msgstr "ÐÐÑÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Primary Phone"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Office"
 msgstr "ÐÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Title"
 msgstr "ÐÐÑÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Role"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:187
 msgid "ICS Calendar"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐÑÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Home Screen Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Work Screen Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Address List"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Home Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Work Address"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Other Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Category List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Photo"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Email List"
-msgstr "ÐÐÐÑÐÐ Ð-ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐ ÐÐ. ÐÐÑÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:253
 msgid "AIM Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "GroupWise ID List"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Jabber ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Yahoo! Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "MSN Screen Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:258
 msgid "ICQ ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Wants HTML Mail"
 msgstr "ÐÐÐÐ ÐÐÐÐ ÐÐÑÑÑ"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "List Show Addresses"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Birth Date"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:266
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÑÐÑÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:269
 msgid "X.509 Certificate"
 msgstr "X.509 ÑÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Home ID 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Work ID 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu ID List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐÐÐÐÐ"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Home Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Work Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:292
 msgid "SIP address"
 msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Google Talk Home Name 1"
 msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Google Talk Home Name 2"
 msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:296
 msgid "Google Talk Home Name 3"
 msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:297
 msgid "Google Talk Work Name 1"
 msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Google Talk Work Name 2"
 msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:299
 msgid "Google Talk Work Name 3"
 msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Google Talk Name List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-contact.c:1601
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐ"
@@ -791,231 +841,238 @@ msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 msgid "Cannot process, book backend is opening"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:96
+#: ../addressbook/libedata-book/e-book-backend.c:87
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:113
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#, c-format
+#| msgid "Contact not found"
+msgid "Contact '%s' not found"
+msgstr "ÐÐÐÑÐÐÑ â%sâ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
+
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../addressbook/libedata-book/e-data-book.c:212
-#: ../addressbook/libedata-book/e-data-book.c:744
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
 msgid "Invalid query: "
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ: "
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "ÐÑÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:120
 msgid "Backend is busy"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
 msgid "Repository offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
-#: ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:134
 msgid "Permission denied"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
 msgid "Unsupported authentication method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
 msgid "TLS not available"
 msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "ÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
 msgid "Search size limit exceeded"
 msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
 msgid "Search time limit exceeded"
 msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
 msgid "Invalid query"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
 msgid "Query refused"
 msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
 msgid "Could not cancel"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
-#: ../libedataserver/e-client.c:116
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:118
 msgid "Invalid argument"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:140
 msgid "Not supported"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
 msgid "Backend is not opened yet"
 msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÐÑÐÐ ÑÐÑ ÑÐÐÐ"
 
-#: ../addressbook/libedata-book/e-data-book.c:337
+#: ../addressbook/libedata-book/e-data-book.c:344
 #: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
 msgid "Other error"
 msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:562
-#: ../addressbook/libedata-book/e-data-book.c:954
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 msgid "Cannot get contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:587
-#: ../addressbook/libedata-book/e-data-book.c:612
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
 msgstr "ÐÑÐÐÐÐ ÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:637
-#: ../addressbook/libedata-book/e-data-book.c:1036
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 msgid "Cannot add contact: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:662
-#: ../addressbook/libedata-book/e-data-book.c:1058
-msgid "Cannot modify contact: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#| msgid "Cannot modify contact: "
+msgid "Cannot modify contacts: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:770
-#: ../calendar/libedata-cal/e-data-cal.c:893
+#: ../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:841
+#: ../addressbook/libedata-book/e-data-book.c:830
 msgid "Cannot open book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:857
+#: ../addressbook/libedata-book/e-data-book.c:846
 msgid "Cannot remove book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:884
+#: ../addressbook/libedata-book/e-data-book.c:873
 msgid "Cannot refresh address book: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:910
+#: ../addressbook/libedata-book/e-data-book.c:899
 msgid "Cannot get backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:935
-#: ../calendar/libedata-cal/e-data-cal.c:1096
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 msgid "Cannot set backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:972
+#: ../addressbook/libedata-book/e-data-book.c:961
 msgid "Cannot get contact list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1006
+#: ../addressbook/libedata-book/e-data-book.c:995
 msgid "Cannot get contact list uids: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐ-ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1079
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:363
-#: ../addressbook/libedata-book/e-data-book-factory.c:396
-#: ../calendar/libedata-cal/e-data-cal-factory.c:414
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
 #, c-format
 msgid "Empty URI"
 msgstr "ÐÑÐÐÐÐ ÐÑÑÐÑÐ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐ â%dâ ÐÐÐÐ ÑÑÐÑÐ (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2603
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1024,92 +1081,108 @@ msgstr ""
 "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑ ÑÐ ÐÑÐÐÑÐÐ Ñ ÑÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ.\n"
 "ÐÐÑÑÐÐ ÐÑÐÑÐÐ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4562
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ / ÐÐÑÐÐÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+#: ../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/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/contacts/e-cal-backend-contacts.c:1059
 msgid "Birthday"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
 #, c-format
 msgid "Birthday: %s"
 msgstr "ÐÐÑÐÐÐÐÐ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ÐÐÐÐÑÑÐÑÐ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ: ÐÐÑÐ ÐÐÑÐÑÐ."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:255
+#: ../calendar/backends/file/e-cal-backend-file.c:261
 msgid "Cannot save calendar data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:416
+#: ../calendar/backends/http/e-cal-backend-http.c:418
 msgid "Redirected to Invalid URI"
 msgstr "ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:459
 msgid "Bad file format."
 msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:461
+#: ../calendar/backends/http/e-cal-backend-http.c:467
 msgid "Not a calendar."
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+#: ../calendar/backends/http/e-cal-backend-http.c:793
+#: ../calendar/backends/http/e-cal-backend-http.c:794
+#: ../calendar/backends/weather/e-cal-backend-weather.c:522
 msgid "Could not create cache file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/weather/e-cal-backend-weather.c:181
 msgid "Could not retrieve weather data"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "ÐÑÐÐÐ: ÐÑÑÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "ÐÑÐÐÐ: ÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "ÐÑÐÐÐ: ÐÐÐÑÐ ÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "ÐÑÐÐÐ: ÑÑÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "ÐÑÐÐÐ: ÐÑÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:444
+#: ../calendar/backends/weather/e-cal-backend-weather.c:433
 msgid "Forecast"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
@@ -1137,12 +1210,12 @@ msgid "No such calendar"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐ"
 
 #: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
@@ -1159,7 +1232,7 @@ msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
 #: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "ÐÐ ÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
@@ -1175,13 +1248,13 @@ msgstr "ÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 msgid "Could not cancel operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:126
 msgid "Authentication failed"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
 #: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
-#: ../libedataserver/e-client.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:128
 msgid "Authentication required"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
@@ -1194,12 +1267,12 @@ msgid "No error"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÐ"
 
 #: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
 #: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
 
@@ -1212,7 +1285,7 @@ msgid "Failed to find system calendar"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
 
 #: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libedata-cal/e-data-cal.c:441
 msgid "Calendar does not exist"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
@@ -1220,7 +1293,7 @@ msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 msgid "Invalid source type"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÑÑÐ ÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1362
 msgid "Untitled appointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
@@ -1373,88 +1446,107 @@ msgstr "ÐÐÐÐÑÐÑÐÐÐ"
 msgid "Cannot process, calendar backend is opening"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ, ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:212
+#: ../calendar/libedata-cal/e-cal-backend.c:142
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:229
+#: ../calendar/libedata-cal/e-cal-backend.c:159
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:808
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:976
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1206
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1247
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../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:875
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ ÐÐÐ 8601 ÐÐÑÑÐÐ/ÐÑÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
+#: ../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:869
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1011
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1017
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1253
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÑÐÐ ÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:402
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects two or three arguments"
+msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÑÐ ÐÑÐÑÐÐÐÑÐ"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects none or two arguments"
+msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:883
 #, 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:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:913
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1464,12 +1556,12 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ âanyâ, âsummaryâ, âdescriptionâ, "
 "âlocationâ, âattendeeâ, âorganizerâ, ÐÐÐ âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1075
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1089
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1478,115 +1570,100 @@ msgstr ""
 "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐ Ð ÑÐÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ "
 "ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐ (#f)"
 
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:989
+#: ../calendar/libedata-cal/e-data-cal.c:962
 msgid "Cannot open calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:987
 msgid "Cannot remove calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 msgid "Cannot refresh calendar: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1070
+#: ../calendar/libedata-cal/e-data-cal.c:1043
 msgid "Cannot retrieve backend property: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1125
+#: ../calendar/libedata-cal/e-data-cal.c:1098
 msgid "Cannot retrieve calendar object path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1155
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 msgid "Cannot retrieve calendar object list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1184
+#: ../calendar/libedata-cal/e-data-cal.c:1157
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1215
+#: ../calendar/libedata-cal/e-data-cal.c:1188
 msgid "Cannot create calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1247
+#: ../calendar/libedata-cal/e-data-cal.c:1220
 msgid "Cannot modify calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 msgid "Cannot remove calendar object: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1308
+#: ../calendar/libedata-cal/e-data-cal.c:1281
 msgid "Cannot receive calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1339
+#: ../calendar/libedata-cal/e-data-cal.c:1312
 msgid "Cannot send calendar objects: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1371
+#: ../calendar/libedata-cal/e-data-cal.c:1344
 msgid "Could not retrieve attachment uris: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1399
+#: ../calendar/libedata-cal/e-data-cal.c:1372
 msgid "Could not discard reminder: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1428
+#: ../calendar/libedata-cal/e-data-cal.c:1401
 msgid "Could not get calendar view path: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÑÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1458
+#: ../calendar/libedata-cal/e-data-cal.c:1431
 msgid "Could not retrieve calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1484
+#: ../calendar/libedata-cal/e-data-cal.c:1457
 msgid "Could not add calendar time zone: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
 msgid "Invalid call"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:428
-#, c-format
-msgid "Invalid URI"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:446
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ ÐÐ â%sâ"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:489
-#, c-format
-msgid "Could not instantiate backend"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
-
 #: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
@@ -1617,15 +1694,15 @@ msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:812
+#: ../camel/camel-cipher-context.c:800
 msgid "Signing message"
 msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1041
 msgid "Encrypting message"
 msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1168
 msgid "Decrypting message"
 msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
 
@@ -1670,31 +1747,38 @@ msgstr "ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 msgid "Downloading new messages for offline mode"
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:412
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
+#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
 msgid "Copy folder content locally for offline operation"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1157
-#: ../camel/providers/imap/camel-imap-store.c:1935
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap/camel-imap-store.c:3192
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:411
-#: ../camel/providers/imapx/camel-imapx-folder.c:457
-#: ../camel/providers/imapx/camel-imapx-folder.c:491
-#: ../camel/providers/imapx/camel-imapx-folder.c:531
-#: ../camel/providers/imapx/camel-imapx-folder.c:567
-#: ../camel/providers/imapx/camel-imapx-store.c:242
-#: ../camel/providers/imapx/camel-imapx-store.c:1306
-#: ../camel/providers/imapx/camel-imapx-store.c:1394
-#: ../camel/providers/imapx/camel-imapx-store.c:1440
+#: ../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:396
+#: ../camel/providers/pop3/camel-pop3-store.c:808
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÑÐÑÑ"
@@ -1704,86 +1788,86 @@ msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐ
 msgid "Canceled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:883 ../camel/camel-filter-search.c:695
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:926
+#: ../camel/camel-filter-driver.c:931
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1136 ../camel/camel-filter-driver.c:1145
 msgid "Syncing folders"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1697
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÑÐÑÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1708
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1349
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1360
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1378
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1385 ../camel/camel-filter-driver.c:1407
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1529
 msgid "Syncing folder"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1535
 msgid "Complete"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1487
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1505
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d ÐÐ %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:445
 msgid "Invalid arguments to (system-flag)"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÑÐÑÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
 
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:463
 msgid "Invalid arguments to (user-tag)"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÐÐÑÐÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
 
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:872 ../camel/camel-filter-search.c:881
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:258
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1792,7 +1876,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:298
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1801,7 +1885,7 @@ msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÑÐÐ ÐÐÐÑ ÑÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:346
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1810,32 +1894,32 @@ msgstr[1] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[2] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 msgstr[3] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÑ ÐÐÑÑÐÑ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:914
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:917
 msgid "Copying messages"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1230
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-folder.c:3271
+#: ../camel/camel-folder.c:3537
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÑÐÑ â%sâ Ñ %s"
 
-#: ../camel/camel-folder.c:3404
+#: ../camel/camel-folder.c:3683
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
+#: ../camel/camel-folder-search.c:651
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1844,8 +1928,8 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:663
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1855,68 +1939,68 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:877 ../camel/camel-folder-search.c:920
 #, 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:960
+#: ../camel/camel-folder-search.c:981
 #, 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:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:988 ../camel/camel-folder-search.c:996
 #, 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:1003
+#: ../camel/camel-folder-search.c:1024
 #, 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:1013
+#: ../camel/camel-folder-search.c:1034
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
+#: ../camel/camel-gpg-context.c:1323
 #, c-format
 msgid "Failed to execute gpg: %s"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ: %s"
 
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/camel-gpg-context.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:729
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÑÐÑÐ:\n"
+"ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ ÑÑÐÑÐ ÐÐÑÐÐ-Ð:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:765
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÑÐ ÐÐ-Ð ÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
 #, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1925,7 +2009,7 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÐÐÑÐÐ ÐÐÑÑÐÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1934,85 +2018,90 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÑÐÑÐÐÐÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ-Ð ÐÐ â%sâ"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ-Ð ÐÐ â%sâ"
+
+#: ../camel/camel-gpg-context.c:846
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"ÐÐÐÑÑÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑÑ, ÑÐÐÐ ÐÐ ÑÐ ÐÐÑÐ "
+"ÐÐÑÑÐÐÑÐÐ ÑÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐ ÐÑÑÑ."
 
-#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:5014
-#: ../camel/providers/imapx/camel-imapx-server.c:5031
-#: ../camel/providers/imapx/camel-imapx-store.c:161
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:896
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐ ÑÐÑÐÐ ÐÑÑÑ: ÑÐÐÑÐ ÑÑ 3 ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:909
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ-Ð: %s"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ-Ð: %s"
 
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1040
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ: ÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ:"
 
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
+#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
+#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
 msgid "Failed to execute gpg."
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
+#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
 #: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
 #: ../camel/camel-smime-context.c:976
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1758
+#: ../camel/camel-gpg-context.c:1793
 msgid "Cannot verify message signature: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ:"
 
-#: ../camel/camel-gpg-context.c:1881
+#: ../camel/camel-gpg-context.c:1916
 msgid "Could not generate encrypting data: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ:"
 
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1969
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2059
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÑÑÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2047
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐ ÐÐÐ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÑ"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑÑÐÐÐÐÐÐ (CamelHttpStream) "
+msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÑÐÐÐÐ"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2125,20 +2214,6 @@ msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÐÑÐ"
 msgid "parse error"
 msgstr "ÐÑÐÑÐÐ ÑÐÑÐÑÐ"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: "
-
 #: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
@@ -2166,12 +2241,17 @@ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ"
 msgid "Name lookup failed: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ: %s"
 
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: "
+
 #: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐ ÐÐÑÐ"
 
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐ ÑÐÐÑ Ñ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
@@ -2199,7 +2279,7 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÑ."
 
-#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:401 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
@@ -2244,11 +2324,11 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:42
 msgid "CRAM-MD5"
 msgstr "ÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2256,11 +2336,11 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, ÐÐÐ "
 "ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:55
 msgid "DIGEST-MD5"
 msgstr "ÐÐÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2268,47 +2348,47 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, "
 "ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:830
+#: ../camel/camel-sasl-digest-md5.c:846
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÑÐÐÑÐ ÐÑÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:841
+#: ../camel/camel-sasl-digest-md5.c:857
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:849
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ âÐÐÐÐÐÑÐÑ ÐÐÑÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:883
+#: ../camel/camel-sasl-digest-md5.c:898
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:904
+#: ../camel/camel-sasl-digest-md5.c:919
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:932
 #, c-format
 msgid "Server response does not match"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "GSSAPI"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÐÐÑÐÑ 5 ÐÐÑÐÑÑÐÐÐÑÐ "
 "ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:130
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2316,11 +2396,11 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ, ÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐ "
 "ÐÑÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:135
 msgid "The provided target_name parameter was ill-formed."
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2328,7 +2408,7 @@ msgstr ""
 "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ "
 "ÐÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2336,7 +2416,7 @@ msgstr ""
 "ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÐÑ "
 "ÐÑÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÑÐÐÑÐ (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:147
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2344,7 +2424,7 @@ msgstr ""
 "ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐÑ ÑÑÑÑÐÑÑÑÑ, ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐ "
 "ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2352,52 +2432,52 @@ msgstr ""
 "ÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐÑÐ ÐÑÐÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑ "
 "ÑÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐÐÑÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:159
 msgid "The consistency checks performed on the input_token failed."
 msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÑ ÑÐÐÑÐ (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the credential failed."
 msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÑÐ ÑÑÐÐÐÐÐÑ ÑÐÐÑÐÑÐ ÑÐ ÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
+#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:406
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐÑÐÐ ÑÐÐÑ."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "ÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:103
 #, c-format
 msgid "Unknown authentication state."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÑÐÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:43
 msgid "NTLM / SPA"
 msgstr "ÐÐÐÐ / ÐÐÐ"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:45
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2405,7 +2485,7 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐ / ÐÐÐÑÑÐÐÑÐÐ "
 "ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:40
 msgid "PLAIN"
 msgstr "ÐÐÐÐÐÐ"
 
@@ -2436,27 +2516,29 @@ msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-service.c:524
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a user component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÐÐÑÑÐÐÐ ÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ"
-
-#: ../camel/camel-service.c:535
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
 
-#: ../camel/camel-service.c:546
+#: ../camel/camel-session.c:462
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2947
+#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/pop3/camel-pop3-store.c:569
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÑÑÐÑÐÐ"
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-session.c:361
+#: ../camel/camel-session.c:477
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÑÑÐ ÑÐÐÐÑÑÑÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ %s ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-session.c:941
+#: ../camel/camel-session.c:1186
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "ÐÐÐÑÐÑÐ â%sâ ÐÐÐÐÐÐÑ ÐÐ â%sâ ÐÐ ÐÐÐÐÑÐÐÑ â%sâ."
@@ -2654,59 +2736,58 @@ msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÑÑÐÑ"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Ð/ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../camel/camel-store.c:1815
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:1858
+#: ../camel/camel-store.c:1842
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2043
+#: ../camel/camel-store.c:2027
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÐÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2520
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-store.c:2534
+#: ../camel/camel-store.c:2515
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:710
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
 #: ../camel/camel-stream-filter.c:327
 msgid "Only reset to beginning is supported with CamelStreamFilter"
-msgstr ""
-"ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑÑÐÐÐÐÑÐÑÐÐ (CamelStreamFilter) "
+msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÑÐÐ ÑÐÐÐ"
 
 #: ../camel/camel-stream-process.c:267
 #, c-format
@@ -2718,122 +2799,142 @@ msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr "ÐÐÐ %d ÐÐÐÐ ÐÑÐÑÐÐ"
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ4"
 
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÐ: ÐÃÐ â%dâ"
 
-#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ5"
 
-#: ../camel/camel-tcp-stream-raw.c:886
+#: ../camel/camel-tcp-stream-raw.c:770
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "ÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:904
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÑÑ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:906
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐ (ÐÐÑÐÐÑÐ 255 ÐÐÐÐÐÐÐ)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:462
+#: ../camel/camel-tcp-stream-ssl.c:470
 #, c-format
+#| msgid ""
+#| "Issuer:            %s\n"
+#| "Subject:           %s\n"
+#| "Fingerprint:       %s\n"
+#| "Signature:         %s"
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"ÐÐÐÐÐÐÑ:            %s\n"
-"ÐÐÑÐÐÐ:           %s\n"
-"ÐÑÐÑÐÐ:       %s\n"
-"ÐÐÑÐÐÑ:         %s"
+"   ÐÐÐÐÐÐÑ:      %s\n"
+"   ÐÐÑÐÐÐ:       %s\n"
+"   ÐÑÐÑÐÐ:       %s\n"
+"   ÐÐÑÐÐÑ:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "GOOD"
 msgstr "ÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "BAD"
 msgstr "ÐÐÐÐ"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:472
+#: ../camel/camel-tcp-stream-ssl.c:480
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"ÐÑÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ:\n"
+"ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?\n"
 "\n"
-"%s\n"
-"\n"
-"ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+"ÐÐÑÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÑÐÐÑÐÑÑ:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:484
+msgid "_Reject"
+msgstr "_ÐÐÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-ssl.c:516
+#: ../camel/camel-tcp-stream-ssl.c:485
+msgid "Accept _Temporarily"
+msgstr "ÐÑÐÑÐÐÑÐ _ÐÑÐÐÑÐÐÐÐÐ"
+
+#: ../camel/camel-tcp-stream-ssl.c:486
+msgid "_Accept Permanently"
+msgstr "ÐÑÐÑÐÐÑÐ _ÑÑÐÑÐÐ"
+
+#: ../camel/camel-tcp-stream-ssl.c:544
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2842,7 +2943,7 @@ msgstr ""
 "ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÑÐÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:568
+#: ../camel/camel-tcp-stream-ssl.c:596
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2851,7 +2952,7 @@ msgstr ""
 "ÐÐÑ ÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:586
+#: ../camel/camel-tcp-stream-ssl.c:614
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2860,7 +2961,7 @@ msgstr ""
 "ÐÑÑÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:603
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2869,22 +2970,28 @@ msgstr ""
 "ÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÑ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-url.c:333
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÑ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
+#: ../camel/camel-vee-folder.c:647
+#, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr "ÐÐÑÑÐÑÐÐ â%sâ ÑÐÑÑÐÐÐÑ"
+
+#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÑÐÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-vee-folder.c:1343
+#: ../camel/camel-vee-folder.c:1354
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ â%sâ Ñ â%sâ"
 
-#: ../camel/camel-vee-folder.c:1411
+#: ../camel/camel-vee-folder.c:1422
 #, c-format
 msgid "Error storing '%s': "
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÑÑ â%sâ:"
@@ -2913,24 +3020,36 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s Ñ ÑÐÑÑÐÐÐÐ %s:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2939,112 +3058,119 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ â%sâ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:813
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/imap/camel-imap-folder.c:344
 msgid "Always check for new mail in this folder"
 msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:355
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:756
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message filters to this folder"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-folder.c:437
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:458
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1054
-#: ../camel/providers/imapx/camel-imapx-server.c:4065
+#: ../camel/providers/imap/camel-imap-folder.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:3950
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:3473
 msgid "Unable to retrieve message: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3520
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imap/camel-imap-folder.c:3510
+#: ../camel/providers/imapx/camel-imapx-server.c:5508
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÐÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3521
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imap/camel-imap-folder.c:3511
+#: ../camel/providers/imapx/camel-imapx-server.c:5509
 msgid "No such message available."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3596
-#: ../camel/providers/imap/camel-imap-folder.c:4503
-#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#: ../camel/providers/imap/camel-imap-folder.c:3586
+#: ../camel/providers/imap/camel-imap-folder.c:4464
+#: ../camel/providers/nntp/camel-nntp-folder.c:511
 #, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4087
-#: ../camel/providers/imap/camel-imap-folder.c:4170
-#: ../camel/providers/imapx/camel-imapx-server.c:4023
-#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#: ../camel/providers/imap/camel-imap-folder.c:4045
+#: ../camel/providers/imap/camel-imap-folder.c:4128
+#: ../camel/providers/imapx/camel-imapx-server.c:3902
+#: ../camel/providers/imapx/camel-imapx-server.c:4082
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4304
+#: ../camel/providers/imap/camel-imap-folder.c:4262
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÑÑ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4314
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÐ ÐÐÑ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4543
+#: ../camel/providers/imap/camel-imap-folder.c:4504
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:197
-#: ../camel/providers/imap/camel-imap-message-cache.c:257
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÑÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ â%sâ: "
@@ -3055,12 +3181,12 @@ msgid "Checking for New Mail"
 msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "Ð_ÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐ_ÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
@@ -3080,7 +3206,7 @@ msgstr "_ÐÐÑÐÐÐÐ:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
@@ -3103,210 +3229,198 @@ msgstr "ÐÐÐÐÐ _ÐÐÐÐÐ:"
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ _ÑÐÑÑÐÐÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÐÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ _ÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ_ÐÐÐÐ"
+msgid "Check new messages for Jun_k contents"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÐÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ_ÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÑÑÐÐÐÐÐ ÑÐ_ÐÑÐÐÑ ÐÐÑÑÑ ÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ ÐÐÐ-Ð"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:224
-#: ../camel/providers/imap/camel-imap-store.c:2601
-#: ../camel/providers/imapx/camel-imapx-store.c:340
-#: ../camel/providers/imapx/camel-imapx-store.c:796
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:711
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../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:356
-#: ../camel/providers/imap/camel-imap-store.c:383
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:3042
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:357
-#: ../camel/providers/imapx/camel-imapx-server.c:3043
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2830
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "STARTTLS not supported"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:376
-#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2869
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:384
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÑ ÐÐÑÐÐÑÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:3176
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:720
-#: ../camel/providers/imapx/camel-imapx-server.c:3189
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:731
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:779
-#: ../camel/providers/imapx/camel-imapx-server.c:3234
-#, c-format
-msgid "You did not enter a password."
-msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÑ."
-
-#: ../camel/providers/imap/camel-imap-store.c:820
-#: ../camel/providers/imapx/camel-imapx-server.c:3279
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2936
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ.\n"
-"%s\n"
-"\n"
+#| msgid "IMAP server %s does not support requested authentication type %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:878
-#: ../camel/providers/imapx/camel-imapx-store.c:144
+#: ../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:881
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../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:1972
-#: ../camel/providers/imap/camel-imap-store.c:2176
-#: ../camel/providers/imapx/camel-imapx-store.c:315
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2966
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate without a username"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:1119
+#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:514
+#| msgid "Authentication Failed"
+msgid "Authentication password not available"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/imap/camel-imap-store.c:2269
+#: ../camel/providers/imapx/camel-imapx-store.c:348
 #, c-format
 msgid "No such folder %s"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1986
-#: ../camel/providers/imap/camel-imap-store.c:2445
-#: ../camel/providers/imapx/camel-imapx-store.c:1327
+#: ../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:2050
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#: ../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:2103
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-store.c:2458
-#: ../camel/providers/imapx/camel-imapx-store.c:1338
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3235
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:3238
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../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:99
+#: ../camel/providers/imapx/camel-imapx-folder.c:109
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "ÐÐÑÐÑÑÐ _ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr "_ÐÑÐÑÑÐÑÑ ÐÐ ÐÐÐÐÐÑÑÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3320,34 +3434,139 @@ msgstr "ÐÑÐÑ ÐÐÐÐ ÐÐ _ÐÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 msgid "Namespace:"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "Default IMAP port"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐ-Ð"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "ÐÐÐÐ+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1504
+#: ../camel/providers/imapx/camel-imapx-server.c:816
+#| msgid "Server unexpectedly disconnected"
+msgid "Server disconnected"
+msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÑÐÑÑÑÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1205
 msgid "Error writing to cache stream: "
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#: ../camel/providers/imapx/camel-imapx-server.c:1939
 #, c-format
 msgid "Not authenticated"
 msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3452
+#: ../camel/providers/imapx/camel-imapx-server.c:2004
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ-Ð"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3161
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3229
 msgid "Closing tmp stream failed: "
 msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5490
-#: ../camel/providers/imapx/camel-imapx-server.c:5505
+#: ../camel/providers/imapx/camel-imapx-server.c:3328
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3458
+#| msgid "Sending message"
+msgid "Error appending message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3638
+msgid "Error fetching message headers"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3779
+#| msgid ""
+#| "Error retrieving newsgroups:\n"
+#| "\n"
+#| "%s"
+msgid "Error retrieving message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3983
+#| msgid "Checking for new messages"
+msgid "Error fetching new messages"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4177
+#| msgid "Verifying message"
+msgid "Error while fetching messages"
+msgstr "ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4183
+#: ../camel/providers/imapx/camel-imapx-server.c:4211
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for %d messages in %s"
+msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ %d ÐÐÑÑÐÐ Ñ â%sâ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4331
+#: ../camel/providers/imapx/camel-imapx-server.c:4366
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4454
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4539
+#| msgid "Creating folder '%s'"
+msgid "Error fetching folders"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4613
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4666
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4711
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4761
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4812
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ-Ð"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4907
+msgid "Error syncing changes"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5663
+#: ../camel/providers/imapx/camel-imapx-server.c:5678
 msgid "Cannot create spool file: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÑÐÐÐ: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1115
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+#| msgid "Retrieving quota information for '%s'"
+msgid "Retrieving folder list for %s"
+msgstr "ÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1176
+#: ../camel/providers/nntp/camel-nntp-store.c:1785
 #, c-format
 msgid "No such folder: %s"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
@@ -3362,27 +3581,27 @@ msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 msgid "Source stream unavailable"
 msgstr "ÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
 #: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
+#: ../camel/providers/local/camel-local-folder.c:479
 msgid "Index message body data"
 msgstr "ÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:710
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3450,226 +3669,227 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ÐÐÐÐÐÐÑÑÑÐÑÐÑÑÐÐ ÐÑÑÐÐÐ â%sâ ÐÐÑÐ ÐÐÑÐÐÑÑÐÐ ÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ÐÐÐÐÐÐÑÑÑÐÑÐÑÑÐÐ ÐÑÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÐÐÐÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:569
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÐÑ Ñ ÐÐÑÐÐÐÑÐÑ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ."
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:728
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
 msgid "Folder %s already exists"
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:885
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:719
+#: ../camel/providers/local/camel-maildir-store.c:773
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ."
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:413
+#: ../camel/providers/local/camel-maildir-summary.c:546
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:537
 msgid "Checking folder consistency"
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐÑÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:630
 msgid "Checking for new messages"
 msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:485
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:795
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÐÐÐÐÑ ÐÐÑÐÑÐÐÑ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3678,90 +3898,90 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÐÐÐ. ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "ÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ: â%sâ: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ Ñ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:495
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:556
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÑÐ ÐÐ ÐÐÑÑÑ %s Ñ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:804
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:818
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:925
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:857
+#: ../camel/providers/local/camel-mbox-summary.c:1117
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3770,65 +3990,80 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÑÐÑÐÐÐ, ÐÐÐÑÐÐÐÑÐ ÑÐ. (ÐÑÐÐÐÐÐÐÐ ÑÐ âÐÐ ÑÐÐÐâ, ÐÐÐ ÐÐÑÐÐ "
 "ÐÐÐÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1126
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ, ÑÐÐ Ð ÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
-#: ../camel/providers/local/camel-mbox-summary.c:1293
+#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:1214
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÐÑ ÑÐÑÑÐÐÐÑ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:226
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "ÐÑÐÐÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ â%sâ"
 
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:423
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐ"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÑÑÐÐÐÐ â%s/%sâ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3837,12 +4072,12 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:506
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3851,51 +4086,41 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:518
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:582
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:601
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:616
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:583
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "ÐÑÐÐÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3904,110 +4129,100 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÑÐÐÐ, ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:213
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/nntp/camel-nntp-folder.c:286
+#: ../camel/providers/nntp/camel-nntp-folder.c:375
+#: ../camel/providers/nntp/camel-nntp-folder.c:497
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ: ÐÐÐ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
-#: ../camel/providers/nntp/camel-nntp-folder.c:267
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/nntp/camel-nntp-folder.c:336
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/pop3/camel-pop3-folder.c:613
+#: ../camel/providers/pop3/camel-pop3-folder.c:997
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:368
-#: ../camel/providers/pop3/camel-pop3-folder.c:420
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/nntp/camel-nntp-folder.c:347
+#: ../camel/providers/nntp/camel-nntp-folder.c:522
+#: ../camel/providers/pop3/camel-pop3-folder.c:551
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
+#: ../camel/providers/pop3/camel-pop3-folder.c:622
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
-#: ../camel/providers/nntp/camel-nntp-folder.c:514
-#: ../camel/providers/nntp/camel-nntp-folder.c:561
+#: ../camel/providers/nntp/camel-nntp-folder.c:581
+#: ../camel/providers/nntp/camel-nntp-folder.c:587
+#: ../camel/providers/nntp/camel-nntp-folder.c:634
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:556
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
 msgid "Posting failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:658
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#: ../camel/providers/nntp/camel-nntp-folder.c:678
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÑÐÑÐÐÐ ÐÐÐÐÑÑ (ÐÐÑ. âc.o.linuxâ ÑÐÐÑÑÐ âcomp.os.linuxâ)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Ð Ð_ÑÐÐÐÑÑÐÑÑ ÐÐ ÐÑÐÑÐÐÑ, ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑ ÐÐÐÐ-Ð"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ ÐÐÐ-Ð"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÑ ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐ"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÑÐÑÐÐÑÑ: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÑÐ ÐÑÐÑÐÐ ÐÐÐ ÐÑÐÑÐÐ â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:528
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1060
+#: ../camel/providers/nntp/camel-nntp-store.c:1067
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4018,24 +4233,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÑÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#: ../camel/providers/nntp/camel-nntp-store.c:1176
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1199
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1338
+#: ../camel/providers/nntp/camel-nntp-store.c:1397
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4046,7 +4261,7 @@ msgstr ""
 "\n"
 "ÐÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ. ÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#: ../camel/providers/nntp/camel-nntp-store.c:1448
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4057,64 +4272,64 @@ msgstr ""
 "\n"
 "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1582
+#: ../camel/providers/nntp/camel-nntp-store.c:1642
 msgid "NNTP Command failed: "
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1656
+#: ../camel/providers/nntp/camel-nntp-store.c:1727
 #, c-format
 msgid "Not connected."
 msgstr "ÐÐÐÐÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:240
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: ÐÑÐÑÑÐÐÑÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:256
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ head-Ð: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:419
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:285
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:519
 #, c-format
 msgid "No message with UID %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#: ../camel/providers/pop3/camel-pop3-folder.c:535
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:432
+#: ../camel/providers/pop3/camel-pop3-folder.c:614
 msgid "Unknown reason"
 msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:472
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
 msgid "Retrieving POP summary"
 msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
 msgid "Cannot get POP summary: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:557
+#: ../camel/providers/pop3/camel-pop3-folder.c:825
 msgid "Expunging old messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÑÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:569
+#: ../camel/providers/pop3/camel-pop3-folder.c:845
 msgid "Expunging deleted messages"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
@@ -4156,7 +4371,7 @@ msgstr "ÐÐÐ"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "ÐÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4164,7 +4379,7 @@ msgstr ""
 "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ. "
 "ÐÐÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4179,63 +4394,52 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:137
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:157
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:158
 msgid "STLS not supported by server"
 msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐ"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÑÑÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ "
-"ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐ â%sâ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:291
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:313
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐ ÑÐÑÐÐÑÑ â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server %s"
+msgstr "ÐÐÐ3 ÑÐÑÐÐÑ â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:365
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "ÐÐÐ3 ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:528
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4244,7 +4448,7 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÐÐÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐ. ÐÐÐÑÑ "
 "ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:427
+#: ../camel/providers/pop3/camel-pop3-store.c:580
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4253,8 +4457,9 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐÐÐÐ: "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:595
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4263,37 +4468,17 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ%s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
-"ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐÐÐÐ%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "POP3 server %s"
-msgstr "ÐÐÐ3 ÑÐÑÐÐÑ â%sâ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "ÐÐÐ3 ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:653
+#: ../camel/providers/pop3/camel-pop3-store.c:681
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:698
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "ÐÐÐ3 ÐÑÑÐÐÐ ÐÐÐÐ ÑÐÑÐÑÐÑÑÐÑÑ ÑÐÑÑÐÐÐÐ"
@@ -4372,229 +4557,223 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÑÑÐ Ñ ÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
 msgid "STARTTLS command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ."
+#| msgid "SMTP server %s does not support requested authentication type %s."
+msgid "SMTP server %s does not support %s authentication"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ â%sâ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:440
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ.\n"
-"%s\n"
-"\n"
+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:557
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+msgid "AUTH command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âAUTHâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ, ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:715
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "ÐÐÑÐÐÐÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÑÑÑ ÑÐÑÑÐÐÐ, ÐÐÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "ÐÐÑÑÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ, ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 msgid "Requested mail action okay, completed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÑÐ Ñ ÑÐÐÑ, ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÑÐ ÐÑÐÑÐÐÑÐÐÐ ÐÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÐÑÑÐÑÑÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐ ÑÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ: ÐÑÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑ ÐÐÑÑÐ; ÐÐÐÑÑÐÐÐ ÑÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÐ ÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 msgid "Encryption required for requested authentication mechanism"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1035
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1129
-msgid "SMTP Authentication"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1148
-#: ../camel/providers/smtp/camel-smtp-transport.c:1159
-#: ../camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "AUTH command failed: "
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âAUTHâ: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1280
-#: ../camel/providers/smtp/camel-smtp-transport.c:1294
-#: ../camel/providers/smtp/camel-smtp-transport.c:1303
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1346
-#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#: ../camel/providers/smtp/camel-smtp-transport.c:1495
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1516
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 msgid "DATA command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1541
-#: ../camel/providers/smtp/camel-smtp-transport.c:1555
-#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 msgid "RSET command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1602
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "QUIT command failed: "
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âQUITâ: "
 
@@ -4710,19 +4889,19 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-client.c:120
+#: ../libedataserver/e-client.c:122
 msgid "Source not loaded"
 msgstr "ÐÐÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source already loaded"
 msgstr "ÐÐÐÐÑ ÑÐ ÐÐÑ ÑÑÐÑÐÐ"
 
-#: ../libedataserver/e-client.c:130
+#: ../libedataserver/e-client.c:132
 msgid "Offline unavailable"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../libedataserver/e-client.c:152
+#: ../libedataserver/e-client.c:154
 msgid "D-Bus error"
 msgstr "ÐÑÐÑÐÐ Ñ Ð-ÐÐÐÐÑÑÑÐÐÐ"
 
@@ -4855,7 +5034,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:662
+#: ../libedataserverui/e-book-auth-util.c:656
 msgid "Accessing LDAP Server anonymously"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
 
@@ -4864,11 +5043,11 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
 msgid "Failed to authenticate.\n"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ.\n"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:224
 msgid "Currently _used categories:"
 msgstr "ÐÑÐÐÑÑÐÐ _ÐÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:233
 msgid "_Available Categories:"
 msgstr "_ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
 
@@ -4954,20 +5133,6 @@ msgstr ""
 msgid "Enter password for memo list %s (user %s)"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
 
-#: ../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"
-
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÑ %s (ÐÐÑÐÑÐÐÐ %s)"
-
 #: ../libedataserverui/e-client-utils.c:981
 msgid "Enter Passphrase"
 msgstr "ÐÐÐÑÐ ÐÑÐÐÑÑÐÑ ÑÐÑ"
@@ -5031,25 +5196,25 @@ 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:2816
+#: ../libedataserverui/e-name-selector-entry.c:2819
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "ÐÑÐÑÑÑÐ %s ÑÐÑÑÐÑ"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2831
+#: ../libedataserverui/e-name-selector-entry.c:2834
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð_ÐÐÐÐÐ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2841
+#: ../libedataserverui/e-name-selector-entry.c:2844
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð_ÑÐÑÐ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2858
+#: ../libedataserverui/e-name-selector-entry.c:2861
 #, c-format
 msgid "_Edit %s"
 msgstr "_ÐÑÐÐÐ %s"
@@ -5097,6 +5262,106 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
 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 "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"
@@ -5304,9 +5569,6 @@ msgstr "_ÐÐÑÐÐÐÑÑÐ"
 #~ msgid "Calendar"
 #~ msgstr "ÐÐÐÐÐÐÐÑ"
 
-#~ msgid "Verifying message"
-#~ msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
 #~ msgid "Cannot open message"
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
@@ -5465,9 +5727,6 @@ msgstr "_ÐÐÑÐÐÐÑÑÐ"
 #~ msgid "AKID/Issuer serial mismatch"
 #~ msgstr "AKID/ÐÐÐÐÐÐÑ ÑÐÑÐÑÑÐÐ ÐÐÑÐÐÐÐÑÐ"
 
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐÐ"
-
 #~ msgid "Error in application verification"
 #~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
 
@@ -6198,9 +6457,6 @@ msgstr "_ÐÐÑÐÐÐÑÑÐ"
 #~ msgid "\t\t\t\t\t\t"
 #~ msgstr "\t\t\t\t\t\t"
 
-#~ msgid "Failed to create pipe to '%s': %s"
-#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ ÐÐ â%sâ: %s"
-
 #~ msgid "Cannot get folder info in offline mode."
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
diff --git a/po/sr latin po b/po/sr latin po
index 18abcaf..a146719 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,85 +1,150 @@
 # Serbian translation of evolution-data-server
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003â2012.
 # This file is distributed under the same license as the evolution-data-server package.
 # Maintainer: Danilo Åegan <dsegan gmx net>
 # Reviewed on 2005-08-20 by: Igor NestoroviÄ <igor prevod org>
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-09-18 16:38+0000\n"
-"PO-Revision-Date: 2011-09-18 10:10+0200\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-07 11:57+0000\n"
+"PO-Revision-Date: 2012-02-11 10:36+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.7.0-beta5\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"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:828
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#: ../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:4595 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:515
+#: ../camel/providers/imap/camel-imap-store.c:464
+#: ../camel/providers/imapx/camel-imapx-command.c:538
+#: ../libedataserver/e-client.c:161
+msgid "Unknown error"
+msgstr "Nepoznata greÅka"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:150
+#, c-format
+#| msgid "Failed to create pipe to '%s': %s"
+msgid "Failed to remove file '%s': %s"
+msgstr "Nisam uspeo da uklonim datoteku â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:173
+#, c-format
+#| msgid "Could not create directory %s: %s"
+msgid "Failed to make directory %s: %s"
+msgstr "Nisam uspeo da napravim direktorijum â%sâ: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:468
+#, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "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
+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
 msgid "Loading..."
 msgstr "UÄitavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:831
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+#: ../addressbook/backends/file/e-book-backend-file.c:1562
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4863
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
 msgid "Searching..."
 msgstr "PretraÅujem..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#, 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:840
+#: ../addressbook/backends/google/e-book-backend-google.c:831
 msgid "Querying for updated contactsâ"
 msgstr "Propitujem za aÅuriranim kontaktima..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
-#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1951
+#: ../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:893
+#: ../addressbook/backends/google/e-book-backend-google.c:882
 msgid "Friends"
 msgstr "Prijatelji"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:895
+#: ../addressbook/backends/google/e-book-backend-google.c:884
 msgid "Family"
 msgstr "Porodica"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:897
+#: ../addressbook/backends/google/e-book-backend-google.c:886
 msgid "Coworkers"
 msgstr "Saradnici"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:981
+#: ../addressbook/backends/google/e-book-backend-google.c:970
 msgid "Querying for updated groupsâ"
 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
+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:1400
+#: ../addressbook/backends/google/e-book-backend-google.c:1389
 msgid "Creating new contactâ"
 msgstr "Stvaram novi kontakt..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1510
+#: ../addressbook/backends/google/e-book-backend-google.c:1476
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:431
+#| msgid "Calendar doesn't support Free/Busy"
+msgid "The backend does not support bulk removals"
+msgstr "Pozadinac ne podrÅava grupno uklanjanje"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1504
 msgid "Deleting contactâ"
 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
+#| msgid "Key usage does not support certificate signing"
+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:1791
+#: ../addressbook/backends/google/e-book-backend-google.c:1782
 msgid "Modifying contactâ"
 msgstr "Menjam kontakt..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1998
+#: ../addressbook/backends/google/e-book-backend-google.c:1983
 msgid "Loadingâ"
 msgstr "UÄitavam..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2156
+#: ../addressbook/backends/google/e-book-backend-google.c:2108
 msgid "Authenticating with the serverâ"
 msgstr "PotvrÄujem identitet sa serverom..."
 
@@ -88,81 +153,65 @@ msgstr "PotvrÄujem identitet sa serverom..."
 msgid "Not connected"
 msgstr "Nisam povezan"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
 msgid "Using Distinguished Name (DN)"
 msgstr "Koristim istaknuto ime (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
 msgid "Using Email Address"
 msgstr "KoriÅÄenje elektronske adrese"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovo se povezujem na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
 msgid "Invalid DN syntax"
 msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
 msgid "Adding contact to LDAP server..."
 msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
 msgid "Removing contact from LDAP server..."
 msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
 msgid "Modifying contact from LDAP server..."
 msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4713
 msgid "Receiving LDAP search results..."
 msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4884
 msgid "Error performing search"
 msgstr "GreÅka tokom pretrage"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5005
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:452
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
-#: ../calendar/backends/http/e-cal-backend-http.c:433
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:411
-#: ../camel/providers/imapx/camel-imapx-server.c:2280
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
-#: ../libedataserver/e-client.c:159
-msgid "Unknown error"
-msgstr "Nepoznata greÅka"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
 #, c-format
 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.c:3216
+#: ../addressbook/libebook/e-book.c:3196
 #, 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:3532 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1946
+#: ../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:3658
-#: ../addressbook/libebook/e-book-client.c:678
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../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"
 
@@ -171,12 +220,12 @@ msgid "No such book"
 msgstr "Nema takvog adresara"
 
 #: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Contact not found"
 msgstr "Kontakt nije pronaÄen"
 
 #: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Contact ID already exists"
 msgstr "IB kontakta veÄ postoji"
 
@@ -185,57 +234,58 @@ msgid "No such source"
 msgstr "Nema takvog izvora"
 
 #: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../addressbook/libedata-book/e-data-book.c:332
 msgid "No space"
 msgstr "Nema prostora"
 
-#: ../addressbook/libebook/e-book-client.c:491
+#: ../addressbook/libebook/e-book-client.c:512
 msgid "Failed to run book factory"
 msgstr "Nisam uspeo da pokrenem pogon adresara"
 
-#: ../addressbook/libebook/e-book-client.c:501
-#: ../addressbook/libedata-book/e-data-book-factory.c:379
-#: ../addressbook/libedata-book/e-data-book-factory.c:437
+#: ../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:399
+#: ../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:603
+#: ../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:641
+#: ../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:750
+#: ../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:2280
-#: ../calendar/libecal/e-cal-client.c:4475
+#: ../addressbook/libebook/e-book-client.c:2563
+#: ../calendar/libecal/e-cal-client.c:4480
 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:116
+#: ../addressbook/libebook/e-contact.c:117
 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:119
+#: ../addressbook/libebook/e-contact.c:120
 msgid "File Under"
 msgstr "Smesti pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Book URI"
 msgstr "Adresa adresara"
 
@@ -243,546 +293,546 @@ msgstr "Adresa adresara"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 1"
 msgstr "1Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 2"
 msgstr "2Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 3"
 msgstr "3Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Email 4"
 msgstr "4Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Mailer"
 msgstr "PoÅiljalac"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Home Address Label"
 msgstr "Oznaka kuÄne adrese"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Work Address Label"
 msgstr "Oznaka adrese na poslu"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Other Address Label"
 msgstr "Oznaka druge adrese"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Assistant Phone"
 msgstr "Telefon pomoÄnika"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Phone 2"
 msgstr "2Â telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Callback Phone"
 msgstr "Telefon za pozivanje"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Company Phone"
 msgstr "Telefon preduzeÄa"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone"
 msgstr "KuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Phone 2"
 msgstr "2Â kuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Home Fax"
 msgstr "KuÄni faks"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Pager"
 msgstr "PejdÅer"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Organizational Unit"
 msgstr "Organizaciona jedinica"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Title"
 msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Assistant"
 msgstr "PomoÄnik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Homepage URL"
 msgstr "LiÄna stranica"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Weblog URL"
 msgstr "Adresa veb dnevnika"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Free/Busy URL"
 msgstr "Adresa za slobodno/zauzeto"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:187
 msgid "ICS Calendar"
 msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Video Conferencing URL"
 msgstr "Adresa video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Spouse's Name"
 msgstr "Ime supruÅnika"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Note"
 msgstr "Napomena"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 1"
 msgstr "1Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 2"
 msgstr "2Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Home Screen Name 3"
 msgstr "3Â kuÄni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 1"
 msgstr "1Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 2"
 msgstr "2Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Work Screen Name 3"
 msgstr "3Â poslovni AIM nadimak"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 1"
 msgstr "1Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 2"
 msgstr "2Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Home Screen Name 3"
 msgstr "3Â kuÄni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 1"
 msgstr "1Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 2"
 msgstr "2Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Work Screen Name 3"
 msgstr "3Â poslovni GroupVajz nadimak"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 1"
 msgstr "1Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 2"
 msgstr "2Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Home ID 3"
 msgstr "3Â kuÄni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 1"
 msgstr "1Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 2"
 msgstr "2Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Work ID 3"
 msgstr "3Â poslovni DÅaber IB"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3Â kuÄni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3Â poslovni Jahu! nadimak"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 1"
 msgstr "1Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 2"
 msgstr "2Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Home Screen Name 3"
 msgstr "3Â kuÄni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 1"
 msgstr "1Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 2"
 msgstr "2Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Work Screen Name 3"
 msgstr "3Â poslovni MSN nadimak"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 1"
 msgstr "1Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 2"
 msgstr "2Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Home ID 3"
 msgstr "3Â kuÄni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 1"
 msgstr "1Â poslovni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 2"
 msgstr "2Â poslovni ICKu IB"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Work ID 3"
 msgstr "3Â poslovni ICKu IB"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Last Revision"
 msgstr "Poslednja revizija"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Name or Org"
 msgstr "Ime ili org."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Address List"
 msgstr "Razne adrese"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Home Address"
 msgstr "KuÄna adresa"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Category List"
 msgstr "Spisak kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Photo"
 msgstr "Slika"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Email List"
-msgstr "Spisak e-adresa"
+msgstr "Spisak el. adresa"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:253
 msgid "AIM Screen Name List"
 msgstr "Spisak AIM nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "GroupWise ID List"
 msgstr "Spisak GroupVajz naloga"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Jabber ID List"
 msgstr "Spisak DÅaber naloga"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Yahoo! Screen Name List"
 msgstr "Spisak Jahu! nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "MSN Screen Name List"
 msgstr "Spisak MSN nadimaka"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:258
 msgid "ICQ ID List"
 msgstr "Spisak ICKu naloga"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Wants HTML Mail"
 msgstr "Åeli HTML poÅtu"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List"
 msgstr "Spisak"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "List Show Addresses"
 msgstr "Spisak prikazanih adresa"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Birth Date"
 msgstr "RoÄendan"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:266
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
 msgid "Anniversary"
 msgstr "GodiÅnjica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:269
 msgid "X.509 Certificate"
 msgstr "X.509 uverenje"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 1"
 msgstr "1Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 2"
 msgstr "2Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Home ID 3"
 msgstr "3Â kuÄni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 1"
 msgstr "1Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 2"
 msgstr "2Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Work ID 3"
 msgstr "3Â poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu ID List"
 msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 1"
 msgstr "1Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 2"
 msgstr "2Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Home Name 3"
 msgstr "3Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 1"
 msgstr "1Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 2"
 msgstr "2Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Work Name 3"
 msgstr "3Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Name List"
 msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:292
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:294
 msgid "Google Talk Home Name 1"
 msgstr "1Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:295
 msgid "Google Talk Home Name 2"
 msgstr "2Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:296
 msgid "Google Talk Home Name 3"
 msgstr "3Â kuÄno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:297
 msgid "Google Talk Work Name 1"
 msgstr "1Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:298
 msgid "Google Talk Work Name 2"
 msgstr "2Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:299
 msgid "Google Talk Work Name 3"
 msgstr "3Â poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:300
 msgid "Google Talk Name List"
 msgstr "Spisak imena Gugl razgovora"
 
-#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-contact.c:1601
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "Neimenovani spisak"
@@ -791,231 +841,238 @@ msgstr "Neimenovani spisak"
 msgid "Cannot process, book backend is opening"
 msgstr "Ne mogu da obradim, pozadinac adresara se otvara"
 
-#: ../addressbook/libedata-book/e-book-backend.c:96
+#: ../addressbook/libedata-book/e-book-backend.c:87
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "Nepoznato svojstvo adresara â%sâ"
 
-#: ../addressbook/libedata-book/e-book-backend.c:113
+#: ../addressbook/libedata-book/e-book-backend.c:104
 #, 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:470
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:503
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1095
+#, c-format
+#| msgid "Contact not found"
+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:199
-#: ../addressbook/libedata-book/e-data-book.c:212
-#: ../addressbook/libedata-book/e-data-book.c:744
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../addressbook/libedata-book/e-data-book.c:219
+#: ../addressbook/libedata-book/e-data-book.c:733
 msgid "Invalid query: "
 msgstr "Neispravan upit: "
 
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Success"
 msgstr "UspeÅno"
 
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../libedataserver/e-client.c:120
 msgid "Backend is busy"
 msgstr "Pozadinac je zauzet"
 
-#: ../addressbook/libedata-book/e-data-book.c:306
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
 msgid "Repository offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../addressbook/libedata-book/e-data-book.c:307
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
-#: ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../libedataserver/e-client.c:134
 msgid "Permission denied"
 msgstr "Zabranjen pristup"
 
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Authentication Failed"
 msgstr "Neuspela autentifikacija"
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436
 msgid "Authentication Required"
 msgstr "Potrebna je autentifikacija"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437
 msgid "Unsupported field"
 msgstr "NepodrÅano polje"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
 msgid "Unsupported authentication method"
 msgstr "NepodrÅan naÄin autentifikacije"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
 msgid "TLS not available"
 msgstr "TLS nije dostupan"
 
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:323
 msgid "Book removed"
 msgstr "Knjiga je uklonjena"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:443
 msgid "Not available in offline mode"
 msgstr "Nije dostupno u reÅimu van mreÅe"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:325
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
 msgid "Search size limit exceeded"
 msgstr "PremaÅena veliÄina pretrage"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
 msgid "Search time limit exceeded"
 msgstr "Isteklo vreme za pretragu"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
 msgid "Invalid query"
 msgstr "Neispravan upit"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
 msgid "Query refused"
 msgstr "Upit je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
 msgid "Could not cancel"
 msgstr "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:324
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../calendar/libedata-cal/e-data-cal.c:450
 msgid "Invalid server version"
 msgstr "Neispravna verzija servera"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
-#: ../libedataserver/e-client.c:116
+#: ../addressbook/libedata-book/e-data-book.c:333
+#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../libedataserver/e-client.c:118
 msgid "Invalid argument"
 msgstr "Neispravan argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:335
+#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:453
+#: ../libedataserver/e-client.c:140
 msgid "Not supported"
 msgstr "Nije podrÅan"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:336
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
 msgid "Backend is not opened yet"
 msgstr "Pozadinac nije otvoren joÅ uvek"
 
-#: ../addressbook/libedata-book/e-data-book.c:337
+#: ../addressbook/libedata-book/e-data-book.c:344
 #: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
+#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
 msgid "Other error"
 msgstr "Druga greÅka"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:562
-#: ../addressbook/libedata-book/e-data-book.c:954
+#: ../addressbook/libedata-book/e-data-book.c:551
+#: ../addressbook/libedata-book/e-data-book.c:943
 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:587
-#: ../addressbook/libedata-book/e-data-book.c:612
+#: ../addressbook/libedata-book/e-data-book.c:576
+#: ../addressbook/libedata-book/e-data-book.c:601
 msgid "Empty query: "
 msgstr "Prazan upit: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:637
-#: ../addressbook/libedata-book/e-data-book.c:1036
+#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:1041
 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:662
-#: ../addressbook/libedata-book/e-data-book.c:1058
-msgid "Cannot modify contact: "
-msgstr "Ne mogu da izmenim kontakt: "
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:1075
+#| msgid "Cannot modify contact: "
+msgid "Cannot modify contacts: "
+msgstr "Ne mogu da izmenim kontakte: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:770
-#: ../calendar/libedata-cal/e-data-cal.c:893
+#: ../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:841
+#: ../addressbook/libedata-book/e-data-book.c:830
 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:857
+#: ../addressbook/libedata-book/e-data-book.c:846
 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:884
+#: ../addressbook/libedata-book/e-data-book.c:873
 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:910
+#: ../addressbook/libedata-book/e-data-book.c:899
 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:935
-#: ../calendar/libedata-cal/e-data-cal.c:1096
+#: ../addressbook/libedata-book/e-data-book.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:1069
 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:972
+#: ../addressbook/libedata-book/e-data-book.c:961
 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:1006
+#: ../addressbook/libedata-book/e-data-book.c:995
 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:1079
+#: ../addressbook/libedata-book/e-data-book.c:1100
 msgid "Cannot remove contacts: "
 msgstr "Ne mogu da uklonim kontakte: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:363
-#: ../addressbook/libedata-book/e-data-book-factory.c:396
-#: ../calendar/libedata-cal/e-data-cal-factory.c:414
+#: ../addressbook/libedata-book/e-data-book-factory.c:184
+#: ../addressbook/libedata-book/e-data-book-factory.c:212
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
 #, c-format
 msgid "Empty URI"
 msgstr "Prazna afresa"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:543
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server je nedostupan (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
 #, 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:2183
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2242
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2603
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1024,92 +1081,108 @@ 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:4476
+#: ../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/contacts/e-cal-backend-contacts.c:758
+#: ../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/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/contacts/e-cal-backend-contacts.c:1059
 msgid "Birthday"
 msgstr "RoÄendan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
 #, c-format
 msgid "Birthday: %s"
 msgstr "RoÄendan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
 #, c-format
 msgid "Anniversary: %s"
 msgstr "GodiÅnjica: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 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:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:255
+#: ../calendar/backends/file/e-cal-backend-file.c:261
 msgid "Cannot save calendar data"
 msgstr "Ne mogu da saÄuvam podatke kalendara"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:416
+#: ../calendar/backends/http/e-cal-backend-http.c:418
 msgid "Redirected to Invalid URI"
 msgstr "Preusmereno na neispravnu adresu"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:459
 msgid "Bad file format."
 msgstr "LoÅ oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:461
+#: ../calendar/backends/http/e-cal-backend-http.c:467
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+#: ../calendar/backends/http/e-cal-backend-http.c:793
+#: ../calendar/backends/http/e-cal-backend-http.c:794
+#: ../calendar/backends/weather/e-cal-backend-weather.c:522
 msgid "Could not create cache file"
 msgstr "Ne mogu da napravim datoteku za ostavu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+#: ../calendar/backends/weather/e-cal-backend-weather.c:181
 msgid "Could not retrieve weather data"
 msgstr "Ne mogu da dobijem podatke o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblaÄna noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "Vreme: oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "Vreme: mestimiÄno oblaÄno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noÄ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "Vreme: sunÄano"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:444
+#: ../calendar/backends/weather/e-cal-backend-weather.c:433
 msgid "Forecast"
 msgstr "Prognoza"
 
@@ -1137,12 +1210,12 @@ msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
 #: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "Objekat nije naÄen"
 
 #: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
@@ -1159,7 +1232,7 @@ msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
 #: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ postoji"
 
@@ -1175,13 +1248,13 @@ msgstr "Operacija je otkazana"
 msgid "Could not cancel operation"
 msgstr "Ne mogu da otkaÅem operaciju"
 
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:126
 msgid "Authentication failed"
 msgstr "PotvrÄivanje identiteta nije uspelo"
 
 #: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
-#: ../libedataserver/e-client.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../libedataserver/e-client.c:128
 msgid "Authentication required"
 msgstr "Potrebno je potvrÄivanje identiteta"
 
@@ -1194,12 +1267,12 @@ msgid "No error"
 msgstr "Nema greÅke"
 
 #: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "Nepoznat korisnik"
 
 #: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
@@ -1212,7 +1285,7 @@ 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:433
+#: ../calendar/libedata-cal/e-data-cal.c:441
 msgid "Calendar does not exist"
 msgstr "Kalendar ne postoji"
 
@@ -1220,7 +1293,7 @@ msgstr "Kalendar ne postoji"
 msgid "Invalid source type"
 msgstr "Neispravna vrsta izvora"
 
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1362
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
@@ -1373,88 +1446,107 @@ msgstr "NeodreÄeno"
 msgid "Cannot process, calendar backend is opening"
 msgstr "Ne mogu da obradim, pozadinac kalendara se otvara"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:212
+#: ../calendar/libedata-cal/e-cal-backend.c:142
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Nepoznato svojstvo kalendara â%sâ"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:229
+#: ../calendar/libedata-cal/e-cal-backend.c:159
 #, 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:72
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:808
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:976
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1206
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ne oÄekuje argumente"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1247
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ oÄekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../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:875
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ oÄekuje da prvi argument bude niska"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â%sâ oÄekuje da prvi argument bude niska ISO 8601 datuma/vremena"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
+#: ../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:869
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1011
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ oÄekuje dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1017
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1253
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â%sâ oÄekuje da prvi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ oÄekuje da drugi argument bude ceo broj"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:402
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects two or three arguments"
+msgstr "â%sâ 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:1025
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ oÄekuje da drugi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "â%sâ oÄekuje da treÄi argument bude niska"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects none or two arguments"
+msgstr "â%sâ oÄekuje nijedan ili dva argumenta"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:883
 #, 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:819
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:913
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1464,12 +1556,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:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1075
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ oÄekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1089
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1478,115 +1570,100 @@ 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:430
+#: ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Unsupported method"
 msgstr "NepodrÅan metod"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:989
+#: ../calendar/libedata-cal/e-data-cal.c:962
 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:1014
+#: ../calendar/libedata-cal/e-data-cal.c:987
 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:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 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:1070
+#: ../calendar/libedata-cal/e-data-cal.c:1043
 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:1125
+#: ../calendar/libedata-cal/e-data-cal.c:1098
 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:1155
+#: ../calendar/libedata-cal/e-data-cal.c:1128
 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:1184
+#: ../calendar/libedata-cal/e-data-cal.c:1157
 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:1215
+#: ../calendar/libedata-cal/e-data-cal.c:1188
 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:1247
+#: ../calendar/libedata-cal/e-data-cal.c:1220
 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:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
 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:1308
+#: ../calendar/libedata-cal/e-data-cal.c:1281
 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:1339
+#: ../calendar/libedata-cal/e-data-cal.c:1312
 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:1371
+#: ../calendar/libedata-cal/e-data-cal.c:1344
 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:1399
+#: ../calendar/libedata-cal/e-data-cal.c:1372
 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:1428
+#: ../calendar/libedata-cal/e-data-cal.c:1401
 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:1458
+#: ../calendar/libedata-cal/e-data-cal.c:1431
 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:1484
+#: ../calendar/libedata-cal/e-data-cal.c:1457
 msgid "Could not add calendar time zone: "
 msgstr "Ne mogu da dodam vremensku zonu kalendara: "
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, c-format
 msgid "Invalid call"
 msgstr "Neispravan poziv"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:428
-#, c-format
-msgid "Invalid URI"
-msgstr "Neispravna adresa"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:446
-#, c-format
-msgid "No backend factory for '%s' of '%s'"
-msgstr "Nema pogona pozadinca za â%sâ od â%sâ"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:489
-#, c-format
-msgid "Could not instantiate backend"
-msgstr "Ne mogu da pokrenem pozadinca"
-
 #: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
@@ -1617,15 +1694,15 @@ msgstr "MoÅda neÄete moÄi da uvezete kljuÄeve sa ovim algoritmom"
 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:812
+#: ../camel/camel-cipher-context.c:800
 msgid "Signing message"
 msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:1053
+#: ../camel/camel-cipher-context.c:1041
 msgid "Encrypting message"
 msgstr "Åifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:1180
+#: ../camel/camel-cipher-context.c:1168
 msgid "Decrypting message"
 msgstr "DeÅifrovanje poruke"
 
@@ -1670,31 +1747,38 @@ msgstr "VrÅim ponovno usklaÄivanje sa serverom"
 msgid "Downloading new messages for offline mode"
 msgstr "Preuzimam nove poruke za rad van mreÅe"
 
-#: ../camel/camel-disco-folder.c:410
+#: ../camel/camel-disco-folder.c:412
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam fasciklu â%sâ za rad van mreÅe"
 
-#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
+#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
 msgid "Copy folder content locally for offline operation"
 msgstr "UmnoÅi sadrÅaj fascikle lokalno za rad van mreÅe"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1157
-#: ../camel/providers/imap/camel-imap-store.c:1935
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap/camel-imap-store.c:3192
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:411
-#: ../camel/providers/imapx/camel-imapx-folder.c:457
-#: ../camel/providers/imapx/camel-imapx-folder.c:491
-#: ../camel/providers/imapx/camel-imapx-folder.c:531
-#: ../camel/providers/imapx/camel-imapx-folder.c:567
-#: ../camel/providers/imapx/camel-imapx-store.c:242
-#: ../camel/providers/imapx/camel-imapx-store.c:1306
-#: ../camel/providers/imapx/camel-imapx-store.c:1394
-#: ../camel/providers/imapx/camel-imapx-store.c:1440
+#: ../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:396
+#: ../camel/providers/pop3/camel-pop3-store.c:808
 #, 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"
@@ -1704,86 +1788,86 @@ msgstr "Morate da budete na mreÅi da bi zavrÅili ovu operaciju"
 msgid "Canceled"
 msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:883 ../camel/camel-filter-search.c:695
 #, 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:926
+#: ../camel/camel-filter-driver.c:931
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1136 ../camel/camel-filter-driver.c:1145
 msgid "Syncing folders"
 msgstr "UsklaÄujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1697
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "GreÅka prilikom Äitanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1708
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "GreÅka prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1349
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1360
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1378
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1385 ../camel/camel-filter-driver.c:1407
 #, c-format
 msgid "Failed on message %d"
 msgstr "GreÅka kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1529
 msgid "Syncing folder"
 msgstr "UsklaÄujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1535
 msgid "Complete"
 msgstr "ZavrÅeno"
 
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1487
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1505
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "GreÅka kod poruke %d od %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nisam uspeo da dovuÄem poruku"
 
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:445
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:463
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neispravni argumenti za (korisniÄka-oznaka)"
 
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:872 ../camel/camel-filter-search.c:881
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "GreÅka u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:258
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -1792,7 +1876,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:283
+#: ../camel/camel-folder.c:298
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -1801,7 +1885,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:331
+#: ../camel/camel-folder.c:346
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
@@ -1810,32 +1894,32 @@ 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:902
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:914
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "PremeÅtam poruke"
 
-#: ../camel/camel-folder.c:905
+#: ../camel/camel-folder.c:917
 msgid "Copying messages"
 msgstr "UmnoÅavam poruke"
 
-#: ../camel/camel-folder.c:1160
+#: ../camel/camel-folder.c:1230
 #, 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:3271
+#: ../camel/camel-folder.c:3537
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "DovlaÄim poruku â%sâ u %s"
 
-#: ../camel/camel-folder.c:3404
+#: ../camel/camel-folder.c:3683
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "DovlaÄim obaveÅtenje o koliÄini za â%sâ"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:362 ../camel/camel-folder-search.c:476
+#: ../camel/camel-folder-search.c:651
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1844,8 +1928,8 @@ msgstr ""
 "Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:374 ../camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:663
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1855,68 +1939,68 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:877 ../camel/camel-folder-search.c:920
 #, 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:960
+#: ../camel/camel-folder-search.c:981
 #, 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:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:988 ../camel/camel-folder-search.c:996
 #, 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:1003
+#: ../camel/camel-folder-search.c:1024
 #, 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:1013
+#: ../camel/camel-folder-search.c:1034
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
+#: ../camel/camel-gpg-context.c:1323
 #, c-format
 msgid "Failed to execute gpg: %s"
-msgstr "Nisam uspeo da izvrÅim gpg: %s"
+msgstr "Nisam uspeo da izvrÅim gÄp: %s"
 
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/camel-gpg-context.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:729
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"DoÅlo je do neoÄekivane poruke GnuPG stanja:\n"
+"DoÅlo je do neoÄekivane poruke stanja GnuÄP-a:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:765
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Nisam uspeo da analiziram podsetnik gpg ib korisnika."
+msgstr "Nisam uspeo da analiziram podsetnik gÄp ib-a korisnika."
 
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
 #, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Nisam uspeo da analiziram zahtev za gpg lozinkom."
+msgstr "Nisam uspeo da analiziram zahtev za gÄp lozinkom."
 
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1925,7 +2009,7 @@ msgstr ""
 "Potreban vam je PIN da otkljuÄate kljuÄ\n"
 "Pametne kartice: â%sâ"
 
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1934,85 +2018,90 @@ msgstr ""
 "Potrebna vam je lozinka da otkljuÄate kljuÄ\n"
 "korisnika: â%sâ"
 
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "NeoÄekivan zahtev GnuPG-a za â%sâ"
+msgstr "NeoÄekivan zahtev GnuÄP-a za â%sâ"
+
+#: ../camel/camel-gpg-context.c:846
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+"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:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:5014
-#: ../camel/providers/imapx/camel-imapx-server.c:5031
-#: ../camel/providers/imapx/camel-imapx-store.c:161
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:382
+#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:896
 #, 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:874
+#: ../camel/camel-gpg-context.c:909
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "NeoÄekivan odgovor GnuPG-a: %s"
+msgstr "NeoÄekivan odgovor GnuÄP-a: %s"
 
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1040
 #, 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:1552 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "Ne mogu da napravim podatke za potpisivanje:"
 
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
+#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
+#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
 msgid "Failed to execute gpg."
-msgstr "Nisam uspeo da izvrÅim gpg."
+msgstr "Nisam uspeo da izvrÅim gÄp."
 
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
+#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
 #: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
 #: ../camel/camel-smime-context.c:976
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1758
+#: ../camel/camel-gpg-context.c:1793
 msgid "Cannot verify message signature: "
 msgstr "Ne mogu da proverim potpis poruke:"
 
-#: ../camel/camel-gpg-context.c:1881
+#: ../camel/camel-gpg-context.c:1916
 msgid "Could not generate encrypting data: "
 msgstr "Ne mogu da napravim podatke za Åifrovanje:"
 
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1969
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno Åifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2059
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ne mogu da deÅifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2047
 #, 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:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "Åifrovan sadrÅaj"
 
-#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "Samo vraÄanje na poÄetak je podrÅano KamelHttpTokom (CamelHttpStream) "
+msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim Http tokom"
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2125,20 +2214,6 @@ msgstr "Nema dostupnog potpisa"
 msgid "parse error"
 msgstr "greÅka Äitanja"
 
-#: ../camel/camel-network-service.c:99
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Ne mogu da se poveÅem na â%sâ: %s"
-
-#: ../camel/camel-network-service.c:100
-msgid "SSL unavailable"
-msgstr "SSL nije dostupan"
-
-#: ../camel/camel-network-service.c:123
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "Ne mogu da se poveÅem na â%sâ: "
-
 #: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
@@ -2166,12 +2241,17 @@ msgstr "Nije uspelo traÅenje imena"
 msgid "Name lookup failed: %s"
 msgstr "Nije uspelo traÅenje imena: %s"
 
+#: ../camel/camel-network-service.c:112
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ne mogu da se poveÅem na â%sâ: "
+
 #: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "UsklaÄujem poruke iz fascikle â%sâ na disk"
 
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Ne mogu da zapiÅem van mreÅni unos u dnevnik za fasciklu â%sâ: %s"
@@ -2199,7 +2279,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:394 ../camel/camel-session.c:351
+#: ../camel/camel-provider.c:401 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nema dostupnog dostavljaÄa za protokol â%sâ"
@@ -2244,11 +2324,11 @@ msgstr ""
 "Neispravan podatak o poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:42
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2256,11 +2336,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:54
+#: ../camel/camel-sasl-digest-md5.c:55
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2268,47 +2348,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:830
+#: ../camel/camel-sasl-digest-md5.c:846
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Upit servera je suviÅe dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:841
+#: ../camel/camel-sasl-digest-md5.c:857
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:849
+#: ../camel/camel-sasl-digest-md5.c:865
 #, 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:883
+#: ../camel/camel-sasl-digest-md5.c:898
 #, 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:904
+#: ../camel/camel-sasl-digest-md5.c:919
 #, 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:917
+#: ../camel/camel-sasl-digest-md5.c:932
 #, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaÅe"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 5 potvrÄivanja "
 "identiteta."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:130
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2316,11 +2396,11 @@ msgstr ""
 "Izabrani mehanizam ponuÄeni metod ne podrÅava, ili ga primenjen metod nije "
 "prepoznao."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:135
 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:137
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2328,7 +2408,7 @@ msgstr ""
 "PonuÄeni parametar ciljnog imena (target_name) je sadrÅao neispravan ili "
 "nepodrÅan tip imena."
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2336,7 +2416,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:146
+#: ../camel/camel-sasl-gssapi.c:147
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2344,7 +2424,7 @@ msgstr ""
 "Upit unosa (input_token) sadrÅi neispravnu strukturu, ili potpis nije mogao "
 "biti proveren."
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2352,52 +2432,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:155
+#: ../camel/camel-sasl-gssapi.c:156
 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:158
+#: ../camel/camel-sasl-gssapi.c:159
 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:161
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the credential failed."
 msgstr "Nisu uspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The referenced credentials have expired."
 msgstr "VaÅenje traÅenih uverenja je isteklo."
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
+#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "LoÅ odgovor potvrÄivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:406
 #, c-format
 msgid "Unsupported security layer."
 msgstr "NepodrÅan sigurnosni sloj."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
 msgid "This option will connect to the server using a simple password."
 msgstr "Ova opcija Äe povezati na server koriÅÄenjem obiÄne lozinke."
 
-#: ../camel/camel-sasl-login.c:92
+#: ../camel/camel-sasl-login.c:103
 #, c-format
 msgid "Unknown authentication state."
 msgstr "Nepoznato stanje potvrÄivanja identiteta."
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:43
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:45
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2405,7 +2485,7 @@ msgstr ""
 "Ova opcija Äe povezati na Vindouz server koriÅÄenjem NTML / Sigurnosne "
 "provere lozinke."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:40
 msgid "PLAIN"
 msgstr "OBIÄNO"
 
@@ -2436,27 +2516,29 @@ 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-service.c:524
+#: ../camel/camel-session.c:393
 #, c-format
-msgid "URL '%s' needs a user component"
-msgstr "Adresa â%sâ zahteva sadrÅalac korisnika"
-
-#: ../camel/camel-service.c:535
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "Adresa â%sâ traÅi deo sa imenom domaÄina"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "Neispravna Gvrsta registrovana za protokol â%sâ"
 
-#: ../camel/camel-service.c:546
+#: ../camel/camel-session.c:462
+#: ../camel/providers/imap/camel-imap-store.c:1143
+#: ../camel/providers/imapx/camel-imapx-server.c:2947
+#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/pop3/camel-pop3-store.c:569
+#: ../camel/providers/smtp/camel-smtp-transport.c:455
 #, c-format
-msgid "URL '%s' needs a path component"
-msgstr "Adresa â%sâ traÅi deo sa putanjom"
+#| msgid "No support for authentication type %s"
+msgid "No support for %s authentication"
+msgstr "Nema podrÅke za â%sâ potvrÄivanja identiteta"
 
-#: ../camel/camel-session.c:361
+#: ../camel/camel-session.c:477
 #, c-format
-msgid "Invalid GType registered for protocol '%s'"
-msgstr "Neispravna Gvrsta registrovana za protokol â%sâ"
+#| msgid "Authentication failed"
+msgid "%s authentication failed"
+msgstr "Nije uspelo %s potvrÄivanje identiteta"
 
-#: ../camel/camel-session.c:941
+#: ../camel/camel-session.c:1186
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Unesite â%sâ lozinku za â%sâ na domaÄinu â%sâ."
@@ -2654,59 +2736,58 @@ msgstr "Nisam uspeo da dodam podatke u Åifrer"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅifrovanje: nisu naÄeni Åifrovani podaci"
 
-#: ../camel/camel-store.c:1815
+#: ../camel/camel-store.c:1799
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji"
 
-#: ../camel/camel-store.c:1858
+#: ../camel/camel-store.c:1842
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2043
+#: ../camel/camel-store.c:2027
 #, 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:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
 #: ../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:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Äubre"
 
-#: ../camel/camel-store.c:2520
+#: ../camel/camel-store.c:2501
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne mogu da da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-store.c:2534
+#: ../camel/camel-store.c:2515
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Stvaram fasciklu â%sâ"
 
-#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obriÅem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:710
+#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:764
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
 
 #: ../camel/camel-stream-filter.c:327
 msgid "Only reset to beginning is supported with CamelStreamFilter"
-msgstr ""
-"Samo vraÄanje na poÄetak je podrÅano KamelHttpFilterom (CamelStreamFilter) "
+msgstr "Samo vraÄanje na poÄetak je podrÅano Kamelovim filterom toka"
 
 #: ../camel/camel-stream-process.c:267
 #, c-format
@@ -2718,122 +2799,142 @@ 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:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, 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
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
 #, 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:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "DomaÄin posrednik ne podrÅava SOCKS5"
 
-#: ../camel/camel-tcp-stream-raw.c:886
+#: ../camel/camel-tcp-stream-raw.c:770
 #, 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:898
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "Neuspeh opÅteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "MreÅa je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "DomaÄin je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "Vreme Åivota je isteklo"
 
-#: ../camel/camel-tcp-stream-raw.c:904
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava naredbu"
 
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS server ne podrÅava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-raw.c:906
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "Nepoznata greÅka sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
 #, 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:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-ssl.c:462
+#: ../camel/camel-tcp-stream-ssl.c:470
 #, c-format
+#| msgid ""
+#| "Issuer:            %s\n"
+#| "Subject:           %s\n"
+#| "Fingerprint:       %s\n"
+#| "Signature:         %s"
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
-"IzdavaÄ:            %s\n"
-"Naslov:           %s\n"
-"Otisak:       %s\n"
-"Potpis:         %s"
+"   IzdavaÄ:      %s\n"
+"   Naslov:       %s\n"
+"   Otisak:       %s\n"
+"   Potpis:       %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-ssl.c:468
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "BAD"
 msgstr "LOÅE"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:472
+#: ../camel/camel-tcp-stream-ssl.c:480
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
 msgstr ""
-"Provera SSL uverenja za â%sâ:\n"
+"SSL uverenje za â%sâ nije od poverenja. Da li Åelite da ga prihvatite?\n"
 "\n"
-"%s\n"
-"\n"
-"Åelite li da prihvatite?"
+"OpÅirnije obaveÅtenje o uverenju:\n"
+"%s"
+
+#: ../camel/camel-tcp-stream-ssl.c:484
+msgid "_Reject"
+msgstr "_Odbaci"
 
-#: ../camel/camel-tcp-stream-ssl.c:516
+#: ../camel/camel-tcp-stream-ssl.c:485
+msgid "Accept _Temporarily"
+msgstr "Prihvati _privremeno"
+
+#: ../camel/camel-tcp-stream-ssl.c:486
+msgid "_Accept Permanently"
+msgstr "Prihvati _trajno"
+
+#: ../camel/camel-tcp-stream-ssl.c:544
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2842,7 +2943,7 @@ msgstr ""
 "Problem sa uverenjem: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:568
+#: ../camel/camel-tcp-stream-ssl.c:596
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2851,7 +2952,7 @@ msgstr ""
 "LoÅ domen uverenja: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:586
+#: ../camel/camel-tcp-stream-ssl.c:614
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2860,7 +2961,7 @@ msgstr ""
 "Isteklo uverenje: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:603
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2869,22 +2970,28 @@ msgstr ""
 "Istekao je spisak povuÄenih uverenja: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-url.c:333
+#: ../camel/camel-url.c:330
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Ne mogu da analiziram adresu â%sâ"
 
-#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
+#: ../camel/camel-vee-folder.c:647
+#, c-format
+#| msgid "Storing folder"
+msgid "Updating %s folder"
+msgstr "AÅuriram â%sâ fasciklu"
+
+#: ../camel/camel-vee-folder.c:1321 ../camel/camel-vee-folder.c:1478
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da umnoÅim ili premestim poruke u virtuelnu fasciklu"
 
-#: ../camel/camel-vee-folder.c:1343
+#: ../camel/camel-vee-folder.c:1354
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke â%sâ u â%sâ"
 
-#: ../camel/camel-vee-folder.c:1411
+#: ../camel/camel-vee-folder.c:1422
 #, c-format
 msgid "Error storing '%s': "
 msgstr "GreÅka pri smeÅtanju â%sâ:"
@@ -2913,24 +3020,36 @@ msgstr "Ne mogu da umnoÅim poruke u fasciklu za smeÄe"
 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:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "Bez izlaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "Bez ulaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:383
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:416
+#, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"Upozorenje sa IMAP servera %s %s u fascikli %s:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:420
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2939,112 +3058,119 @@ msgstr ""
 "Upozorenje od IMAP servera %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:502
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NeoÄekivan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:514
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Neuspela IMAP naredba: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:594
 #, c-format
 msgid "Server response ended too soon."
 msgstr "Odgovor servera je prerano zavrÅen."
 
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:806
 #, 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:813
+#: ../camel/providers/imap/camel-imap-command.c:844
 #, 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:296
+#: ../camel/providers/imap/camel-imap-folder.c:344
 msgid "Always check for new mail in this folder"
 msgstr "Uvek proveri nove poruke u ovoj fascikli"
 
-#: ../camel/providers/imap/camel-imap-folder.c:372
+#: ../camel/providers/imap/camel-imap-folder.c:355
+#: ../camel/providers/imapx/camel-imapx-folder.c:747
+#: ../camel/providers/nntp/camel-nntp-folder.c:756
+#| msgid "Cannot copy messages to the Trash folder"
+msgid "Apply message filters to this folder"
+msgstr "Primeni filtere poruke nad ovom fasciklom"
+
+#: ../camel/providers/imap/camel-imap-folder.c:437
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne mogu da napravim direktorijum â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:395
+#: ../camel/providers/imap/camel-imap-folder.c:458
 #, 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:1054
-#: ../camel/providers/imapx/camel-imapx-server.c:4065
+#: ../camel/providers/imap/camel-imap-folder.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:3950
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Pregledam izmenjene poruke u â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imap/camel-imap-folder.c:3473
 msgid "Unable to retrieve message: "
 msgstr "Ne mogu da dovuÄem poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3520
-#: ../camel/providers/imapx/camel-imapx-server.c:5344
+#: ../camel/providers/imap/camel-imap-folder.c:3510
+#: ../camel/providers/imapx/camel-imapx-server.c:5508
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ne mogu da nabavim poruku sa IB â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3521
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imap/camel-imap-folder.c:3511
+#: ../camel/providers/imapx/camel-imapx-server.c:5509
 msgid "No such message available."
 msgstr "Nema takve poruke."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3596
-#: ../camel/providers/imap/camel-imap-folder.c:4503
-#: ../camel/providers/nntp/camel-nntp-folder.c:438
+#: ../camel/providers/imap/camel-imap-folder.c:3586
+#: ../camel/providers/imap/camel-imap-folder.c:4464
+#: ../camel/providers/nntp/camel-nntp-folder.c:511
 #, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4087
-#: ../camel/providers/imap/camel-imap-folder.c:4170
-#: ../camel/providers/imapx/camel-imapx-server.c:4023
-#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#: ../camel/providers/imap/camel-imap-folder.c:4045
+#: ../camel/providers/imap/camel-imap-folder.c:4128
+#: ../camel/providers/imapx/camel-imapx-server.c:3902
+#: ../camel/providers/imapx/camel-imapx-server.c:4082
 #, 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:4304
+#: ../camel/providers/imap/camel-imap-folder.c:4262
 #, 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:4314
+#: ../camel/providers/imap/camel-imap-folder.c:4272
 #, 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:4543
+#: ../camel/providers/imap/camel-imap-folder.c:4504
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Ne mogu da pronaÄem telo poruke u DOVUCI odgovoru."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:197
-#: ../camel/providers/imap/camel-imap-message-cache.c:257
+#: ../camel/providers/imap/camel-imap-message-cache.c:196
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
 msgid "Could not open cache directory: "
 msgstr "Ne mogu da otvorim direktorijum ostave: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:335
+#: ../camel/providers/imap/camel-imap-message-cache.c:331
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#: ../camel/providers/imap/camel-imap-message-cache.c:397
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#: ../camel/providers/imap/camel-imap-message-cache.c:539
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "Nisam uspeo privremeno da saÄuvam â%sâ: "
@@ -3055,12 +3181,12 @@ 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:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 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:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
@@ -3080,7 +3206,7 @@ msgstr "_Naredba:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Fascikle"
 
@@ -3103,210 +3229,198 @@ msgstr "Oblik _imena:"
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "Opcije"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "_Primeni filtere na nove poruke u SanduÄetu na ovom serveru"
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#| msgid "_Apply filters to new messages in INBOX"
+msgid "Apply _filters to new messages in all folders"
+msgstr "Primeni filtere na nove poruke u svim _fasciklama"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "Proveri da nema _nepoÅeljnog sadrÅaja meÄu novim porukama"
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "Primeni filtere na nove poruke u _SanduÄetu na ovom serveru"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Proveri da nema Äubreta samo u fascikli SAN_DUÄE"
+msgid "Check new messages for Jun_k contents"
+msgstr "Proveri da nema _nepoÅeljnog sadrÅaja meÄu novim porukama"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "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
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatski uskladi ud_aljenu poÅtu sa lokalnom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
+#: ../camel/providers/imap/camel-imap-provider.c:80
 msgid "IMAP default port"
 msgstr "Osnovni IMAP port"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP over SSL"
 msgstr "IMAP preko SSL-a"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:87
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imap/camel-imap-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za Äitanje i smeÅtanje poÅte na IMAP servere."
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:118
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
+#: ../camel/providers/imap/camel-imap-provider.c:109
+#: ../camel/providers/imapx/camel-imapx-provider.c:120
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "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:224
-#: ../camel/providers/imap/camel-imap-store.c:2601
-#: ../camel/providers/imapx/camel-imapx-store.c:340
-#: ../camel/providers/imapx/camel-imapx-store.c:796
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:711
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../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:356
-#: ../camel/providers/imap/camel-imap-store.c:383
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:3042
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/imap/camel-imap-store.c:463
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
 #, 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:357
-#: ../camel/providers/imapx/camel-imapx-server.c:3043
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:2830
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podrÅano"
 
-#: ../camel/providers/imap/camel-imap-store.c:376
-#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imapx/camel-imapx-server.c:2869
 #, 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:384
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-msgid "SSL is not available in this build"
-msgstr "SSL nije dostupan u ovoj verziji"
-
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:3176
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP server â%sâ ne podrÅava traÅeni tip prijavljivanja identiteta â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:720
-#: ../camel/providers/imapx/camel-imapx-server.c:3189
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "Nema podrÅke za tip potvrÄivanja identiteta â%sâ"
-
-#: ../camel/providers/imap/camel-imap-store.c:731
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "GreÅka pri pravljenju objekta SASL potvrÄivanja identiteta"
-
-#: ../camel/providers/imap/camel-imap-store.c:779
-#: ../camel/providers/imapx/camel-imapx-server.c:3234
-#, c-format
-msgid "You did not enter a password."
-msgstr "Niste uneli lozinku."
-
-#: ../camel/providers/imap/camel-imap-store.c:820
-#: ../camel/providers/imapx/camel-imapx-server.c:3279
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imapx/camel-imapx-server.c:2936
 #, c-format
-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 "IMAP server %s does not support requested authentication type %s"
+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:878
-#: ../camel/providers/imapx/camel-imapx-store.c:144
+#: ../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:881
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../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:1972
-#: ../camel/providers/imap/camel-imap-store.c:2176
-#: ../camel/providers/imapx/camel-imapx-store.c:315
+#: ../camel/providers/imap/camel-imap-store.c:1111
+#: ../camel/providers/imapx/camel-imapx-server.c:2966
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#| msgid "Cannot authenticate to server: %s"
+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:2975
+#: ../camel/providers/nntp/camel-nntp-store.c:514
+#: ../camel/providers/pop3/camel-pop3-store.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:514
+#| msgid "Authentication Failed"
+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:1986
-#: ../camel/providers/imap/camel-imap-store.c:2445
-#: ../camel/providers/imapx/camel-imapx-store.c:1327
+#: ../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:2050
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#: ../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:2103
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2196
+#: ../camel/providers/local/camel-maildir-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji."
 
-#: ../camel/providers/imap/camel-imap-store.c:2458
-#: ../camel/providers/imapx/camel-imapx-store.c:1338
+#: ../camel/providers/imap/camel-imap-store.c:2551
+#: ../camel/providers/imapx/camel-imapx-store.c:1399
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna fascikla: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3235
+#: ../camel/providers/imap/camel-imap-store.c:3326
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena"
 
-#: ../camel/providers/imap/camel-imap-store.c:3238
+#: ../camel/providers/imap/camel-imap-store.c:3329
 msgid "Server unexpectedly disconnected: "
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../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:99
+#: ../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:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 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:44
-msgid "Use I_dle if the server supports it"
-msgstr "Koristi _Umiren ako ga server podrÅava"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+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:"
@@ -3320,34 +3434,139 @@ msgstr "Broj veza iz _ostave za koriÅÄenje"
 msgid "Namespace:"
 msgstr "Oblik imena:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "Default IMAP port"
 msgstr "Osnovni port IMAP-a"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1504
+#: ../camel/providers/imapx/camel-imapx-server.c:816
+#| msgid "Server unexpectedly disconnected"
+msgid "Server disconnected"
+msgstr "Veza sa serverom je iskljuÄena"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1205
 msgid "Error writing to cache stream: "
 msgstr "GreÅka prilikom upisa u tok ostave:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#: ../camel/providers/imapx/camel-imapx-server.c:1939
 #, c-format
 msgid "Not authenticated"
 msgstr "NepotvrÄenog identiteta"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3452
+#: ../camel/providers/imapx/camel-imapx-server.c:2004
+#| msgid "Error performing search"
+msgid "Error performing IDLE"
+msgstr "GreÅka prilikom izvrÅavanja IDLE-a"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3161
+#| msgid "Encrypting message"
+msgid "Error fetching message"
+msgstr "GreÅka prilikom preuzimanja poruke"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3229
 msgid "Closing tmp stream failed: "
 msgstr "Zatvaranje privremenog toka nije uspelo:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5490
-#: ../camel/providers/imapx/camel-imapx-server.c:5505
+#: ../camel/providers/imapx/camel-imapx-server.c:3328
+#| msgid "Copying messages"
+msgid "Error copying messages"
+msgstr "GreÅka prilikom umnoÅavanja poruka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3458
+#| msgid "Sending message"
+msgid "Error appending message"
+msgstr "GreÅka prilikom prikaÄinjanja poruka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3638
+msgid "Error fetching message headers"
+msgstr "GreÅka prilikom preuzimanja zaglavlja poruke"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3779
+#| msgid ""
+#| "Error retrieving newsgroups:\n"
+#| "\n"
+#| "%s"
+msgid "Error retrieving message"
+msgstr "GreÅka prilikom dovlaÄenja poruke"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3983
+#| msgid "Checking for new messages"
+msgid "Error fetching new messages"
+msgstr "GreÅka prilikom preuzimanja novih poruka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4177
+#| msgid "Verifying message"
+msgid "Error while fetching messages"
+msgstr "GreÅka za vreme preuzimanja poruka"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4183
+#: ../camel/providers/imapx/camel-imapx-server.c:4211
+#, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Fetching summary information for %d messages in %s"
+msgstr "Prikupljam pregled podataka za %d poruke u â%sâ"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4331
+#: ../camel/providers/imapx/camel-imapx-server.c:4366
+#| msgid "Error performing search"
+msgid "Error refreshing folder"
+msgstr "GreÅka tokom pretrage"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4454
+#| msgid "Expunging old messages"
+msgid "Error expunging message"
+msgstr "GreÅka prilikom izbacivanja poruke"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4539
+#| msgid "Creating folder '%s'"
+msgid "Error fetching folders"
+msgstr "GreÅka prilikom preuzimanja fascikle"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4613
+#| msgid "_Show only subscribed folders"
+msgid "Error subscribing to folder"
+msgstr "GreÅka prilikom prijavljivanja na fasciklu"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4666
+#| msgid "Storing folder"
+msgid "Error creating folder"
+msgstr "GreÅka prilikom stvaranja fascikle"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4711
+#| msgid "Storing folder"
+msgid "Error deleting folder"
+msgstr "GreÅka prilikom brisanja fascikle"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4761
+#| msgid "Storing folder"
+msgid "Error renaming folder"
+msgstr "GreÅka prilikom preimenovanja fascikle"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4812
+#| msgid "Error performing search"
+msgid "Error performing NOOP"
+msgstr "GreÅka prilikom obavljanja NOOP-a"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4907
+msgid "Error syncing changes"
+msgstr "GreÅka prilikom usklaÄivanja izmena"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5663
+#: ../camel/providers/imapx/camel-imapx-server.c:5678
 msgid "Cannot create spool file: "
 msgstr "Ne mogu da napravim datoteku pripreme: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1115
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/imapx/camel-imapx-store.c:1076
+#, c-format
+#| msgid "Retrieving quota information for '%s'"
+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:1785
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve fascikle: %s"
@@ -3362,27 +3581,27 @@ msgstr "Odgovor izvornog toka je bez podataka"
 msgid "Source stream unavailable"
 msgstr "Tok izvora je nedostupan"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
 #: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "poÅtansko sanduÄe:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
+#: ../camel/providers/local/camel-local-folder.c:479
 msgid "Index message body data"
 msgstr "PopiÅi sadrÅaje poruka"
 
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:710
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3450,226 +3669,227 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Standardni Uniks mboks direktorijum pripreme"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ne mogu da preimenujem fasciklu â%sâ u â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka poÅte %s"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:218
+#: ../camel/providers/local/camel-local-store.c:375
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-spool-store.c:86
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Administratorska ostava â%sâ nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:227
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Administratorska ostava â%sâ nije regularan direktorijum"
 
-#: ../camel/providers/local/camel-local-store.c:255
-#: ../camel/providers/local/camel-local-store.c:265
-#: ../camel/providers/local/camel-local-store.c:390
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:239
+#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:388
+#: ../camel/providers/local/camel-maildir-store.c:134
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne mogu da dobavim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:286
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduÄe"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:445
+#: ../camel/providers/local/camel-mbox-store.c:722
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ne mogu da obriÅem indeksnu datoteku fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:463
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:752
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ne mogu da obriÅem meta datoteku fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:549
+#: ../camel/providers/local/camel-local-store.c:581
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ne mogu da preimenujem â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:569
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu da dodam poruku pregledu: nepoznat razlog"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "Nema takve poruke"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Ne mogu da dodam poruku u fasciklu direktorijuma poÅte: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "Ne mogu da dobavim poruku â%sâ iz fascikle â%sâ: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "Ne mogu da prebacim poruku u odrediÅnu fasciklu: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+#| msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgid "Cannot create folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"Ne mogu da napravim fasciklu â%sâ: naziv fascikle ne moÅe da sadrÅi taÄku."
+"Ne mogu da napravim fasciklu â%sâ: Naziv fascikle ne moÅe da sadrÅi taÄku"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:728
+#: ../camel/providers/local/camel-maildir-store.c:119
+#: ../camel/providers/local/camel-maildir-store.c:782
 #, c-format
 msgid "Folder %s already exists"
 msgstr "Fascikla â%sâ veÄ postoji"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Ne mogu da napravim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:516
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Ne mogu da preuzmem fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Ne mogu da preuzmem fasciklu â%sâ: fascikla ne postoji."
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:263
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Ne mogu da preuzmem fasciklu â%sâ: nije direktorijum poÅte."
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:329
+#: ../camel/providers/local/camel-maildir-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:670
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Ne mogu da obriÅem fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:331
 msgid "not a maildir directory"
 msgstr "nije direktorijum poÅte"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:885
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:569
+#: ../camel/providers/local/camel-maildir-store.c:970
+#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:228
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ne mogu da pretraÅim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:719
+#: ../camel/providers/local/camel-maildir-store.c:773
 #, 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."
+"Ne mogu da preimenujem fasciklu â%sâ: Naziv fascikle ne moÅe da sadrÅi taÄku"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:413
+#: ../camel/providers/local/camel-maildir-summary.c:546
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne mogu da otvorim putanju direktorijuma poÅte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:537
 msgid "Checking folder consistency"
 msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:630
 msgid "Checking for new messages"
 msgstr "VrÅim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:485
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
-#: ../camel/providers/local/camel-spool-summary.c:131
+#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:795
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "SmeÅtam fasciklu"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "Ne mogu da otvorim poÅtansko sanduÄe: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "Ne mogu da dodam poruku u mboks datoteku: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Fascikla izgleda da je nepopravljivo oÅteÄena."
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne mogu da zakljuÄam fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:563
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Ne mogu da napravim fasciklu ovog imena."
 
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ne mogu da dobavim fasciklu â%sâ: nije obiÄna datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ne mogu da napravim direktorijum â%sâ: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:591
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu da napravim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:593
 msgid "Folder already exists"
 msgstr "Fascikla veÄ postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:633
+#: ../camel/providers/local/camel-mbox-store.c:646
+#: ../camel/providers/local/camel-mbox-store.c:675
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3678,90 +3898,90 @@ msgstr ""
 "Ne mogu da obriÅem fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:656
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ nije obiÄna datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:665
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Fascikla â%sâ nije prazna. Nije obrisana."
 
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:692
+#: ../camel/providers/local/camel-mbox-store.c:707
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ne mogu da obriÅem pregled fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:789
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "Novo ime fascikle je neispravno."
 
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:805
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ne mogu da preimenujem â%sâ: â%sâ: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:888
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu da preimenujem â%sâ u â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:495
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ne mogu da otvorim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:556
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Kobna greÅka pri Äitanju poÅte na mestu %s u fascikli â%sâ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne mogu da proverim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
-#: ../camel/providers/local/camel-spool-summary.c:138
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:804
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ne mogu da otvorim datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne mogu da otvorim privremeno poÅtansko sanduÄe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ne mogu da zatvorim izvornu fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ne mogu da preimenujem fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:818
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ne mogu da saÄuvam fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:925
-#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:857
+#: ../camel/providers/local/camel-mbox-summary.c:1117
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3770,65 +3990,80 @@ msgstr ""
 "MBOKS datoteka je oÅteÄena, popravite je. (OÄekivano je âIz redaâ, ali nisam "
 "dobio.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1126
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje pregleda i fascikle, Äak i nakon usklaÄivanja"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-spool-summary.c:343
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greÅka: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1263
-#: ../camel/providers/local/camel-mbox-summary.c:1293
+#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:1214
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Ne mogu da dodam poruku u mh fasciklu: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:535
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Ne mogu da napravim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:551
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ne mogu da dobavim fasciklu â%sâ: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:226
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne mogu da otvorim putanju MH direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "Ne mogu da otvorim pripremu â%sâ: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "Priprema â%sâ nije regularna datoteka ili direktorijum"
+
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Pripremna datoteka poÅte â%sâ"
 
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:420
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Stablo fascikle za pripremu â%sâ"
 
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:423
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr "Neispravna priprema"
+
+#: ../camel/providers/local/camel-spool-store.c:480
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Fascikla â%s/%sâ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:493
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3837,12 +4072,12 @@ msgstr ""
 "Ne mogu da otvorim fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:499
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Fascikla â%sâ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:506
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3851,51 +4086,41 @@ msgstr ""
 "Ne mogu da napravim fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:518
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ nije datoteka sanduÄeta."
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:582
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ostava ne podrÅava SANDUÄE"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:601
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Fascikle za pripremu ne mogu biti obrisane"
 
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:616
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Fascikle za pripremu ne mogu biti preimenovane"
 
-#: ../camel/providers/local/camel-spool-store.c:583
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "Ne mogu da otvorim pripremu â%sâ: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "Priprema â%sâ nije regularna datoteka ili direktorijum"
-
-#: ../camel/providers/local/camel-spool-summary.c:169
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:193
+#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:192
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Ne mogu da uskladim privremenu fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:210
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "Ne mogu da uskladim fasciklu za pripremu â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:243
-#: ../camel/providers/local/camel-spool-summary.c:262
-#: ../camel/providers/local/camel-spool-summary.c:275
+#: ../camel/providers/local/camel-spool-summary.c:242
+#: ../camel/providers/local/camel-spool-summary.c:261
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3904,110 +4129,100 @@ 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:213
-#: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/nntp/camel-nntp-folder.c:424
+#: ../camel/providers/nntp/camel-nntp-folder.c:286
+#: ../camel/providers/nntp/camel-nntp-folder.c:375
+#: ../camel/providers/nntp/camel-nntp-folder.c:497
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "UnutraÅnja greÅka: JIB u neispravnom obliku: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:263
-#: ../camel/providers/nntp/camel-nntp-folder.c:267
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/nntp/camel-nntp-folder.c:336
+#: ../camel/providers/nntp/camel-nntp-folder.c:340
+#: ../camel/providers/pop3/camel-pop3-folder.c:613
+#: ../camel/providers/pop3/camel-pop3-folder.c:997
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobavim poruku â%sâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:449
-#: ../camel/providers/pop3/camel-pop3-folder.c:368
-#: ../camel/providers/pop3/camel-pop3-folder.c:420
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/nntp/camel-nntp-folder.c:347
+#: ../camel/providers/nntp/camel-nntp-folder.c:522
+#: ../camel/providers/pop3/camel-pop3-folder.c:551
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
+#: ../camel/providers/pop3/camel-pop3-folder.c:622
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Ne mogu da dobavim poruku â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:508
-#: ../camel/providers/nntp/camel-nntp-folder.c:514
-#: ../camel/providers/nntp/camel-nntp-folder.c:561
+#: ../camel/providers/nntp/camel-nntp-folder.c:581
+#: ../camel/providers/nntp/camel-nntp-folder.c:587
+#: ../camel/providers/nntp/camel-nntp-folder.c:634
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Neuspela poÅiljka: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:556
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
 msgid "Posting failed: "
 msgstr "Neuspela poÅiljka: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#: ../camel/providers/nntp/camel-nntp-folder.c:658
 #, 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:605
+#: ../camel/providers/nntp/camel-nntp-folder.c:678
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne moÅete da umnoÅite poruke iz NNTP fascikle!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_PrikaÅi fascikle u kratkom zapisu (npr. âc.o.linuxâ umesto âcomp.os.linuxâ)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:50
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "U p_rozorÄetu za prijavu, prikaÅi relativna imena fascikli"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "Default NNTP port"
 msgstr "Osnovni port NNTP-a"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "NNTP over SSL"
 msgstr "NNTP preko SSL-a"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "USENET news"
 msgstr "JUZNET vesti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:65
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Ovo je dostavljaÄ za Äitanje i slanje na JUZNET grupe vesti."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
+#: ../camel/providers/nntp/camel-nntp-provider.c:86
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Ova opcija Äe prijaviti na NNTP server koriÅÄenjem lozinke u obiÄnom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:97
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "Potrebno je potvrÄivanje identiteta ali korisniÄko ime nije uneto"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:109
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Ne mogu da potvrdim identitet na serveru: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:357
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Ne mogu da proÄitam pozdrav sa â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server â%sâ je vratio kod greÅke â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:528
+#: ../camel/providers/nntp/camel-nntp-store.c:469
 #, c-format
 msgid "USENET News via %s"
 msgstr "JUZNET vesti preko â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1060
+#: ../camel/providers/nntp/camel-nntp-store.c:1067
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4018,24 +4233,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
 #, 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:1169
+#: ../camel/providers/nntp/camel-nntp-store.c:1176
 #, 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:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1199
 #, 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:1338
+#: ../camel/providers/nntp/camel-nntp-store.c:1397
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4046,7 +4261,7 @@ msgstr ""
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadreÄena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#: ../camel/providers/nntp/camel-nntp-store.c:1448
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4057,64 +4272,64 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1582
+#: ../camel/providers/nntp/camel-nntp-store.c:1642
 msgid "NNTP Command failed: "
 msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1656
+#: ../camel/providers/nntp/camel-nntp-store.c:1727
 #, c-format
 msgid "Not connected."
 msgstr "Nepovezano."
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:240
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:195
+#: ../camel/providers/nntp/camel-nntp-summary.c:322
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: pretraÅujem nove poruke"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:256
+#: ../camel/providers/nntp/camel-nntp-summary.c:213
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "NeoÄekivan odgovor ksovera: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "NeoÄekivan odgovor head-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:419
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:285
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:519
 #, c-format
 msgid "No message with UID %s"
 msgstr "Nema poruke sa JIB %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#: ../camel/providers/pop3/camel-pop3-folder.c:535
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "DovlaÄim POP poruku %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:432
+#: ../camel/providers/pop3/camel-pop3-folder.c:614
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:472
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
 msgid "Retrieving POP summary"
 msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
 msgid "Cannot get POP summary: "
 msgstr "Ne mogu da dobavim POP pregled: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:557
+#: ../camel/providers/pop3/camel-pop3-folder.c:825
 msgid "Expunging old messages"
 msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:569
+#: ../camel/providers/pop3/camel-pop3-folder.c:845
 msgid "Expunging deleted messages"
 msgstr "Izbacujem obrisane poruke"
 
@@ -4156,7 +4371,7 @@ msgstr "POP"
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Za povezivanje i preuzimanje poÅte sa POP servera."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4164,7 +4379,7 @@ msgstr ""
 "Ova opcija Äe povezati na POP server koriÅÄenjem lozinke u obiÄnom tekstu. "
 "Ovo je jedina opcija koju podrÅavaju mnogi POP serveri."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:94
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4179,63 +4394,52 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:137
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Neuspelo Äitanje ispravnog pozdrava POP servera â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:150
-#: ../camel/providers/pop3/camel-pop3-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:157
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:158
 msgid "STLS not supported by server"
 msgstr "Server ne podrÅava STLS"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:176
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:190
-msgid "TLS is not available in this build"
-msgstr "TLS nije dostupan u ovom izdanju"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:414
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Ne mogu da se poveÅem na POP server â%sâ: traÅeni naÄin potvrÄivanja "
-"identiteta nije podrÅan."
-
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:269
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "Nije uspela SASL prijava â%sâ na POP server %s%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:286
+#: ../camel/providers/pop3/camel-pop3-store.c:291
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu da se prijavim na POP server â%sâ: greÅka SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:313
 #, c-format
 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:380
+#: ../camel/providers/pop3/camel-pop3-store.c:362
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:365
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server za â%sâ na â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:528
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4244,7 +4448,7 @@ msgstr ""
 "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:427
+#: ../camel/providers/pop3/camel-pop3-store.c:580
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4253,8 +4457,9 @@ msgstr ""
 "Ne mogu da se poveÅem na POP server â%sâ.\n"
 "GreÅka pri slanju lozinke: "
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:437
+#. Translators: Last %s is an optional explanation
+#. * beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:595
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4263,37 +4468,17 @@ msgstr ""
 "Ne mogu da se poveÅem na POP server â%sâ.\n"
 "GreÅka pri slanju korisniÄkog imena%s"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password%s"
-msgstr ""
-"Ne mogu da se poveÅem na POP server â%sâ.\n"
-"GreÅka pri slanju lozinke%s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
-msgid "POP3 server %s"
-msgstr "POP3 server â%sâ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#, c-format
-msgid "POP3 server for %s on %s"
-msgstr "POP3 server za â%sâ na â%sâ"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, 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:653
+#: ../camel/providers/pop3/camel-pop3-store.c:681
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle â%sâ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:698
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ostava nema hijerarhiju fascikli"
@@ -4372,229 +4557,223 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Za dostavu poÅte povezivanjem na prosleÄivaÄ poÅte u mreÅi koriÅÄenjem SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:149
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Welcome response error: "
 msgstr "GreÅka odgovora dobrodoÅlice: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
-#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ne mogu da se poveÅem na SMTP server â%sâ u sigurnosnom reÅimu: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
 msgid "STARTTLS command failed: "
 msgstr "Neuspela STARTTLS naredba: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:235
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Ne mogu da se poveÅem na SMTP server â%sâ u sigurnosnom reÅimu: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#: ../camel/providers/smtp/camel-smtp-transport.c:292
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava poÅte preko â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:367
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP server â%sâ ne podrÅava traÅeni tip potvrÄivanja identiteta â%sâ."
+#| msgid "SMTP server %s does not support requested authentication type %s."
+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:440
+#: ../camel/providers/smtp/camel-smtp-transport.c:446
 #, c-format
-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 "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:557
+#: ../camel/providers/smtp/camel-smtp-transport.c:478
+#: ../camel/providers/smtp/camel-smtp-transport.c:489
+#: ../camel/providers/smtp/camel-smtp-transport.c:502
+msgid "AUTH command failed: "
+msgstr "Neuspela naredba âAUTHâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:643
 #, 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:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:650
 #, 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:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#: ../camel/providers/smtp/camel-smtp-transport.c:679
 #, 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:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 #, 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:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:796
 msgid "Syntax error, command unrecognized"
 msgstr "GreÅka u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 msgid "Syntax error in parameters or arguments"
 msgstr "GreÅka u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:800
 msgid "Command not implemented"
 msgstr "Naredba nije podrÅana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:715
+#: ../camel/providers/smtp/camel-smtp-transport.c:802
 msgid "Command parameter not implemented"
 msgstr "Parametar naredbe nije podrÅan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:804
 msgid "System status, or system help reply"
 msgstr "Status sistema, ili odgovor na pomoÄ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:719
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Help message"
 msgstr "Poruka o pomoÄi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 msgid "Service ready"
 msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Service not available, closing transmission channel"
 msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 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:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 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:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 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:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 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:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 msgid "Requested action aborted: error in processing"
 msgstr "TraÅena radnja nije preduzeta: greÅka pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokuÅajte <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 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:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 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:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 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:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 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:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizam potvrÄivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 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:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Temporary authentication failure"
 msgstr "Nije uspelo privremeno potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1035
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1139
+#: ../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "HELO command failed: "
 msgstr "Neuspela naredba âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1129
-msgid "SMTP Authentication"
-msgstr "SMTP potvrÄivanje identiteta"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1148
-#: ../camel/providers/smtp/camel-smtp-transport.c:1159
-#: ../camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "AUTH command failed: "
-msgstr "Neuspela naredba âAUTHâ: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1280
-#: ../camel/providers/smtp/camel-smtp-transport.c:1294
-#: ../camel/providers/smtp/camel-smtp-transport.c:1303
+#: ../camel/providers/smtp/camel-smtp-transport.c:1222
+#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
 msgid "MAIL FROM command failed: "
 msgstr "Neuspela naredba âMAIL FROMâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 msgid "RCPT TO command failed: "
 msgstr "Neuspela naredba âRCPT TOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1346
-#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> nije uspelo"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#: ../camel/providers/smtp/camel-smtp-transport.c:1495
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1516
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1349
+#: ../camel/providers/smtp/camel-smtp-transport.c:1359
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 msgid "DATA command failed: "
 msgstr "Neuspela naredba âDATAâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1541
-#: ../camel/providers/smtp/camel-smtp-transport.c:1555
-#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
 msgid "RSET command failed: "
 msgstr "Neuspela naredba âRSETâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1588
-#: ../camel/providers/smtp/camel-smtp-transport.c:1602
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1530
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
 msgid "QUIT command failed: "
 msgstr "Neuspela naredba âQUITâ: "
 
@@ -4710,19 +4889,19 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Äekanje"
 
-#: ../libedataserver/e-client.c:120
+#: ../libedataserver/e-client.c:122
 msgid "Source not loaded"
 msgstr "Izvor nije uÄitan"
 
-#: ../libedataserver/e-client.c:122
+#: ../libedataserver/e-client.c:124
 msgid "Source already loaded"
 msgstr "Izvor je veÄ uÄitan"
 
-#: ../libedataserver/e-client.c:130
+#: ../libedataserver/e-client.c:132
 msgid "Offline unavailable"
 msgstr "Rad van mreÅe nije dostupan"
 
-#: ../libedataserver/e-client.c:152
+#: ../libedataserver/e-client.c:154
 msgid "D-Bus error"
 msgstr "GreÅka u D-magistrali"
 
@@ -4855,7 +5034,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:662
+#: ../libedataserverui/e-book-auth-util.c:656
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupa LDAP serveru"
 
@@ -4864,11 +5043,11 @@ msgstr "Anonimno pristupa LDAP serveru"
 msgid "Failed to authenticate.\n"
 msgstr "Nisam uspeo da potvrdim identitet.\n"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:224
 msgid "Currently _used categories:"
 msgstr "Trenutno _koriÅÄene kategorije:"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:233
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
@@ -4954,20 +5133,6 @@ msgstr ""
 msgid "Enter password for memo list %s (user %s)"
 msgstr "Unesite lozinku za spisak beleÅki %s (korisnik %s)"
 
-#: ../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"
-
-#: ../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)"
-
 #: ../libedataserverui/e-client-utils.c:981
 msgid "Enter Passphrase"
 msgstr "Unesi propusnu reÄ"
@@ -5031,25 +5196,25 @@ 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:2816
+#: ../libedataserverui/e-name-selector-entry.c:2819
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Prostri %s unutar"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2831
+#: ../libedataserverui/e-name-selector-entry.c:2834
 #, c-format
 msgid "Cop_y %s"
 msgstr "U_mnoÅi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2841
+#: ../libedataserverui/e-name-selector-entry.c:2844
 #, c-format
 msgid "C_ut %s"
 msgstr "I_seci %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2858
+#: ../libedataserverui/e-name-selector-entry.c:2861
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -5097,6 +5262,106 @@ msgstr "Izaberite odrediÅte"
 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 "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"
@@ -5304,9 +5569,6 @@ msgstr "_OdrediÅte"
 #~ msgid "Calendar"
 #~ msgstr "Kalendar"
 
-#~ msgid "Verifying message"
-#~ msgstr "Proveravanje poruke"
-
 #~ msgid "Cannot open message"
 #~ msgstr "Nije moguÄe otvoriti poruku"
 
@@ -5465,9 +5727,6 @@ msgstr "_OdrediÅte"
 #~ msgid "AKID/Issuer serial mismatch"
 #~ msgstr "AKID/izdavaÄ serijsko neslaganje"
 
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "Upotreba kljuÄa ne podrÅava potpis sertifikatom"
-
 #~ msgid "Error in application verification"
 #~ msgstr "GreÅka pri proveri programa"
 
@@ -6198,9 +6457,6 @@ msgstr "_OdrediÅte"
 #~ msgid "\t\t\t\t\t\t"
 #~ msgstr "\t\t\t\t\t\t"
 
-#~ msgid "Failed to create pipe to '%s': %s"
-#~ msgstr "Neuspelo pravljenje veze ka â%sâ: %s"
-
 #~ msgid "Cannot get folder info in offline mode."
 #~ msgstr "Nije moguÄe dobiti podatke za fasciklu u reÅimu van mreÅe."
 



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