[evolution-data-server/gnome-3-0] Updated Serbian translation



commit e5a8bfb519888fe9b27c95ad67d223362a27d296
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Fri Jun 24 20:41:21 2011 +0200

    Updated Serbian translation

 po/sr.po       | 6865 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po | 6797 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 7454 insertions(+), 6208 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 88d2359..b034908 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,225 +1,188 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: ÐÐÑÐÐ ÐÐÐÐÑ <grakic devbase net>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\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-06-21 10:31+0000\n"
+"PO-Revision-Date: 2011-06-17 22:35+0200\n"
+"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(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.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2326
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ..."
+msgstr "ÐÑÐÑÐÐÐÐ..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2257
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2279
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2324
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "ÐÑÐÑÑÐÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ..."
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/libebook/e-book.c:3476 ../calendar/libecal/e-cal.c:1069
+msgid "Personal"
+msgstr "ÐÐÑÐÐ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "ÐÑÐÑÐÑÐÑÐ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "ÐÐÑÐÐÐÑÐ"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "ÐÐÑÐÐÐÐÑÐ"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐÐÐÐ ÐÑÑÐÐÐÐ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÑÐÐÑ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ"
+msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ"
+msgstr "ÐÑÐÑÐÐÐÐ..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ"
+msgstr "ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÑÐÑÐÐÑÐÐ..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ (%d)... "
+msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2853
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3034
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3081
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÑÐÑ ÐÐÐÑÐÐÐÑÐ (%d)... "
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐÑÐ (%d)... "
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "ÐÐÑÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
-msgstr "ÐÐÑÐÑÑÐÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÐÐ (DN)"
+msgstr "ÐÐÑÐÑÑÐÐ ÐÑÑÐÐÐÑÑÐ ÐÐÐ (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ LDAP ÑÐÑÐÐÑ..."
+msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+msgid "Invalid DN syntax"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐ"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ LDAP ÑÐÑÐÐÑ..."
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÑÐ LDAP ÑÐÑÐÐÑÐ..."
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÑÐ LDAP ÑÐÑÐÐÑÐ..."
+msgstr "ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
-msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ ÑÐ LDAP ÑÐÑÐÐÑÐ..."
+msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288
-#: ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496
-#: ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639
-#: ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730
-#: ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028
-#: ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211
-#: ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370
-#: ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575
-#: ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818
-#: ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055
-#: ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263
-#: ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "â%sâ Ñ ÐÑÐÐÐ ÐÑÐ â%sâ"
-
-#: ../addressbook/libebook/e-book.c:301
-#: ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652
-#: ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043
-#: ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384
-#: ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831
-#: ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276
-#: ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "ÐÑÐÐÐ ÐÐÑÐÐÑÐ"
-
-#: ../addressbook/libebook/e-book.c:332
-#: ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540
-#: ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679
-#: ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770
-#: ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070
-#: ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255
-#: ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411
-#: ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624
-#: ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878
-#: ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099
-#: ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302
-#: ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537
-#: ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715
-#: ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913
-#: ../addressbook/libebook/e-book.c:3463
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA ÐÐÑÐÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑ â%sâ"
-
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: ÐÐÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#: ../addressbook/libebook/e-book.c:2555
-#: ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: ÐÐÑÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐ"
-
-#: ../addressbook/libebook/e-book.c:2671
-#: ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "â%sâ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐ â%sâ"
-
-# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: ÐÑÐÐÐÐÐÐ"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑ."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4286
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: ÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑ â%s'"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐ â%sâ ÑÐ ÐÐÐÐ ÑÑÐÑÐÐ: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book.c:3159
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ EBookListener"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ â%sâ ÑÐÐÑÑÐÐÐÐ Ñ ÐÐÐÐÑÑ."
 
-#: ../addressbook/libebook/e-book.c:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: ÐÐÐÐ ÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÑÐÐÑÑÐÐ Ñ gconf"
+#: ../addressbook/libebook/e-book.c:3459 ../calendar/libecal/e-cal.c:1049
+msgid "On This Computer"
+msgstr "ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÑÑ"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ â%sâ ÑÐÐÑÑÐÐÐÐ Ñ gconf."
+#: ../addressbook/libebook/e-book.c:3583
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "ÐÐÐÑÑÐ ÐÐÐ"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐ"
 
@@ -227,810 +190,1034 @@ 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:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "ÐÑÐÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "ÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "1Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "2Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "3Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "4Â ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "ÐÐÑÐÑÐÐÐÑ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
+msgstr "2Â ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
-msgstr "TÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
+msgstr "2Â ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
-msgstr "ISDN"
+msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "ÐÑÑÐÐ ÑÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "ÐÐÑÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "ÐÐÐÐÐÑ"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "ÐÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "ÐÐÑÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "ÐÐÑÐÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
-msgstr "ICS ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐÑÐ"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "ÐÐÐ ÑÑÐÑÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3Â ÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. ÐÑÑÐÐ Jabber ÐÐÐÐÐ"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. ÐÑÑÐÐ Jabber ÐÐÐÐÐ"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. ÐÑÑÐÐ Jabber ÐÐÐÐÐ"
+msgid "Jabber Home ID 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ Jabber ÐÐÐÐÐ"
+msgid "Jabber Home ID 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ Jabber ÐÐÐÐÐ"
+msgid "Jabber Home ID 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ Jabber ÐÐÐÐÐ"
+msgid "Jabber Work ID 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. ÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐ MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. ÐÑÑÐÐ ICQ ÐÐÐÐÐ"
+msgid "MSN Work Screen Name 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. ÐÑÑÐÐ ICQ ÐÐÐÐÐ"
+msgid "MSN Work Screen Name 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. ÐÑÑÐÐ ICQ ÐÐÐÐÐ"
+msgid "ICQ Home ID 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. ÐÐÑÐÐÐÐÐ ICQ ÐÐÐÐÐ"
+msgid "ICQ Home ID 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. ÐÐÑÐÐÐÐÐ ICQ ÐÐÐÐÐ"
+msgid "ICQ Home ID 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. ÐÐÑÐÐÐÐÐ ICQ ÐÐÐÐÐ"
+msgid "ICQ Work ID 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ ÐÐ"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐ."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "ÐÑÑÐÐ ÐÐÑÐÑÐ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "ÐÐÑÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÑÑÐÐÑÐÐÑ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐ Ð-ÐÐÑÐÑÐ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑ ÐÐÐÐÐ ÐÐ AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "ÐÐÑÑÐ GroupWise ÐÐ-Ð"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "ÐÐÑÑÐ Jabber ÐÐÐÐÐÐ"
+msgid "AIM Screen Name List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑ ÐÐÐÐÐ ÐÐ Yahoo!"
+msgid "GroupWise ID List"
+msgstr "ÐÐÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑ ÐÐÐÐÐ ÐÐ MSN"
+msgid "Jabber ID List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "ÐÐÑÑÐ ICQ ÐÐÐÐÐÐ"
+msgid "Yahoo! Screen Name List"
+msgstr "ÐÐÐÑÐÐ ÐÐÑÑ! ÐÐÐÐÐÐÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "Wants HTML Mail"
-msgstr "ÐÐÐÐ HTML ÐÐÑÑÑ"
+msgid "ICQ ID List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:256
+msgid "Wants HTML Mail"
+msgstr "ÐÐÐÐ ÐÐÐÐ ÐÐÑÑÑ"
+
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "ÐÐÐÐÑÑÐÑÐ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 ÑÐÑÑÐÑÐÐÐÑ"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu ÐÑÑÐÐ ÐÐ 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu ÐÑÑÐÐ ÐÐ 2"
+msgid "X.509 Certificate"
+msgstr "X.509 ÑÐÐÑÐÑÐ"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu ÐÑÑÐÐ ÐÐ 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu ÐÐÑÐÐÐÐÐ ÐÐ 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu ÐÐÑÐÐÐÐÐ ÐÐ 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu ÐÐÑÐÐÐÐÐ ÐÐ 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu ÐÐ ÐÐÑÑÐ"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐ"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÑ-ÐÐÐÑ ÐÐÐÐÐÐ"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. ÐÐÐ ÐÐ Skype ÐÐÐ ÐÑÑÐ"
+msgstr "1Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. ÐÐÐ ÐÐ Skype ÐÐÐ ÐÑÑÐ"
+msgstr "2Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. ÐÐÐ ÐÐ Skype ÐÐÐ ÐÑÑÐ"
+msgstr "3Â ÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. ÐÐÐ ÐÐ Skype ÐÐ ÐÐÑÐÑ"
+msgstr "1Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. ÐÐÐ ÐÐ Skype ÐÐ ÐÐÑÐÑ"
+msgstr "2Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. ÐÐÐ ÐÐ Skype ÐÐ ÐÐÑÐÑ"
+msgstr "3Â ÐÐÑÐÐÐÐÐ ÐÐÐÑÐ ÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑ ÐÐÐÐÐ ÐÐ Skype"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
-msgstr "SIP ÐÐÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "ÐÐÑÑÐ ÐÐÐ ÐÐÐÐÐ"
-
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "ÐÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
-msgid "Birthday: %s"
-msgstr "ÐÐÑÐÐÐÐÐ: %s"
+msgid "Empty URI"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
-msgid "Anniversary: %s"
-msgstr "ÐÐÐÐÑÑÐÑÐ: %s"
+msgid "Invalid source"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ: ÐÐÑÐ ÐÐÑÐÑÐ."
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "ÐÑÐÐÑÐÐ"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÑÐÐÑ"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÑÑÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4268 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
-msgid "Reply Requested: by "
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑ: ÐÐ "
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
-msgid "Reply Requested: When convenient"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑ: ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "ÐÑÐÑÐÐÐÑÐ %s ÐÑÐÐÐÐÑÐ"
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "ÐÐÐÐÐÐÐÑ"
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÐ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
-msgid "Redirected to Invalid URI"
-msgstr "ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑ"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
-msgid "Bad file format."
-msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "ÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
-msgid "Not a calendar."
-msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑ."
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
-msgid "Could not retrieve weather data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÐÑÐÐÐÐÑ"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
-msgid "Weather: Fog"
-msgstr "ÐÑÐÐÐ: ÐÐÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy Night"
-msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑ"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Overcast"
-msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Showers"
-msgstr "ÐÑÐÐÐ: ÐÑÑÑÐÐ"
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Snow"
-msgstr "ÐÑÐÐÐ: ÑÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "ÐÐÐÐ ÐÑÐÑÑÐÑÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "ÐÑÐÐÐ: ÑÑÐÑÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4252 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Clear Night"
-msgstr "ÐÑÐÐÐ: ÐÐÐÑÐ ÐÐÑ"
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4291 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Thunderstorms"
-msgstr "ÐÑÐÐÐ: ÐÑÐÑÐÐÐÐÐ"
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "ÐÑÑÐÐ ÐÑÐÑÐÐ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
-msgid "Forecast"
-msgstr "ÐÑÐÐÐÐÐÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑ: %s"
 
-#: ../calendar/libecal/e-cal-component.c:1322
-msgid "Untitled appointment"
-msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÑ: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
-msgid "1st"
-msgstr "1."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
-msgid "2nd"
-msgstr "2."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "ÐÑÐÐÐÐ ÑÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐÑÐÑÐÐÐÐ: %s "
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐÑÐ: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "ÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐ â%dâ ÐÐÐÐ ÑÑÐÑÐ (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÑÑÐÐÐ, ÐÐÐÐÐÐÐÑ ÑÐ ÐÑÐÐÑÐÐ Ñ ÑÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ.\n"
+"ÐÐÑÑÐÐ ÐÑÐÑÐÐ: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ / ÐÐÑÐÐÑÐ"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+msgid "Birthday"
+msgstr "ÐÐÑÐÐÐÐÐ"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#, c-format
+msgid "Birthday: %s"
+msgstr "ÐÐÑÐÐÐÐÐ: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#, c-format
+msgid "Anniversary: %s"
+msgstr "ÐÐÐÐÑÑÐÑÐ: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ: ÐÐÑÐ ÐÐÑÐÑÐ."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
+msgid "Reply Requested: by "
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÑ: ÐÐ "
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
+msgid "Reply Requested: When convenient"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐÑ: ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
+msgid "Calendar"
+msgstr "ÐÐÐÐÐÐÐÑ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
+msgid "Invalid server URI"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÑÐÐÑ"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÑÑÐÐÐ"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
+msgid "Redirected to Invalid URI"
+msgstr "ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑ"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:456
+msgid "Bad file format."
+msgstr "ÐÐÑ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:463
+msgid "Not a calendar."
+msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑ."
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Fog"
+msgstr "ÐÑÐÐÐ: ÐÐÐÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy Night"
+msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ ÐÐÑ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "ÐÑÐÐÐ: ÐÐÐÐÑÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Overcast"
+msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Showers"
+msgstr "ÐÑÐÐÐ: ÐÑÑÑÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+msgid "Weather: Snow"
+msgstr "ÐÑÐÐÐ: ÑÐÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Clear Night"
+msgstr "ÐÑÐÐÐ: ÐÐÐÑÐ ÐÐÑ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "ÐÑÐÐÐ: ÑÑÐÑÐÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+msgid "Weather: Thunderstorms"
+msgstr "ÐÑÐÐÐ: ÐÑÐÑÐÐÐÐÐ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+msgid "Forecast"
+msgstr "ÐÑÐÐÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-component.c:1299
+msgid "Untitled appointment"
+msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../calendar/libecal/e-cal-recur.c:3986
+msgid "1st"
+msgstr "1Â"
+
+#: ../calendar/libecal/e-cal-recur.c:3987
+msgid "2nd"
+msgstr "2Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
-msgstr "3."
+msgstr "3Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
-msgstr "4."
+msgstr "4Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
-msgstr "5."
+msgstr "5Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
-msgstr "6."
+msgstr "6Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
-msgstr "7."
+msgstr "7Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
-msgstr "8."
+msgstr "8Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
-msgstr "9."
+msgstr "9Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
-msgstr "10."
+msgstr "10Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
-msgstr "11."
+msgstr "11Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
-msgstr "12."
+msgstr "12Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
-msgstr "13."
+msgstr "13Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
-msgstr "14."
+msgstr "14Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
-msgstr "15."
+msgstr "15Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
-msgstr "16."
+msgstr "16Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
-msgstr "17."
+msgstr "17Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
-msgstr "18."
+msgstr "18Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
-msgstr "19."
+msgstr "19Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
-msgstr "20."
+msgstr "20Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
-msgstr "21."
+msgstr "21Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
-msgstr "22."
+msgstr "22Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
-msgstr "23."
+msgstr "23Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
-msgstr "24."
+msgstr "24Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
-msgstr "25."
+msgstr "25Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
-msgstr "26."
+msgstr "26Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
-msgstr "27."
+msgstr "27Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
-msgstr "28."
+msgstr "28Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
-msgstr "29."
+msgstr "29Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
-msgstr "30."
+msgstr "30Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
-msgstr "31."
+msgstr "31Â"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "ÐÐÑÐÐ"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "ÐÐÐÐÑÐÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1294 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
@@ -1039,427 +1226,542 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s (ÐÐÑÐÑÐÐÐ %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1308
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s ÐÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐ ÐÐ %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4254
 msgid "Backend is busy"
 msgstr "ÐÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4256
 msgid "Repository is offline"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4258
 msgid "No such calendar"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4260 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4262 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4264
 msgid "URI not loaded"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4266
 msgid "URI already loaded"
 msgstr "ÐÐÑÐÑÐ ÑÐ ÐÐÑ ÑÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4270 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4272 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "ÐÐ ÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4274
 msgid "Protocol not supported"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4276
 msgid "Operation has been canceled"
 msgstr "ÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4278
 msgid "Could not cancel operation"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ"
+
+#: ../calendar/libecal/e-cal.c:4280
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4282
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ CORBA ÐÐÑÐÐÑÐÐ"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4284
+msgid "A D-Bus exception has occurred"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ Ð-ÐÐÑ ÐÐÑÐÐÑÐÐ"
+
+#: ../calendar/libecal/e-cal.c:4288
 msgid "No error"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, 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:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, 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:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ ÑÐÐ ÐÑÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, 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:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ âanyâ, âsummaryâ, âdescriptionâ, âlocationâ, âattendeeâ, âorganizerâ, ÐÐÐ âclassificationâ"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"â%sâ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÐ âanyâ, âsummaryâ, âdescriptionâ, "
+"âlocationâ, âattendeeâ, âorganizerâ, ÐÐÐ âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐ Ð ÑÐÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐ (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"â%sâ ÐÑÐÐÑÑÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÑÐÐ ÐÐÐ ÑÐÐÐÐ Ð ÑÐÐÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÑ ÐÐ "
+"ÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐ (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÑÐ"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÑ ÐÐÐÐÐÐÐÑÐ: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ ÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÑÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
+msgid "Invalid URI"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ ÐÐ â%sâ"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
+
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ÐÐÐÑÑÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÑÐÑÑ ÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÑÑÐÑÑ ÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÑÐÐÑÐ"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐ ÐÑÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÐ"
+
+#: ../camel/camel-db.c:471
+#, c-format
 msgid "Insufficient memory"
 msgstr "ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐÑÐ ÑÐÐÑ Ñ ÐÐÐ: %s\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑ ÐÐÐÐÐÐÐÐ: %s\n"
 "ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐ\n"
 "ÑÐ ÐÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑ."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ â%sâ:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ â%sâ:\n"
 "%s\n"
 "ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÑÐÐÐ."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
-msgstr "ÐÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "ÐÑÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÐ"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ â%sâ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÑÐÑ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐ ÐÐ %s: %s"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÑÐÐÑÐÑÐ: %s: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÑÐÑÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ %d (%d%%)"
-
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1283
-#: ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ %d ÐÐ %d"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ %d ÐÐ %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1769,426 @@ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÑÐÑÑÐÐÑÐÐ-ÐÐÐ
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÐÐÑÐÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐ (ÐÐÑÐÑÐÐÑÐÐ-ÐÐÐÐÐÐ)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÑÑ ÐÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ: %s:\n"
+"ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÐÐÐ: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÑÑÐÑ %s"
 
-#: ../camel/camel-folder-search.c:912
-#: ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ÐÑÐÐÑÑÐ ÐÐÐ ÐÐÐ ÑÐÐÑÐÑÐÑ"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ÐÐÑÑÐÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÑÑÐÑÐ ÐÐÑÑÐÐ: ÐÐ %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "ÐÑÐÐ ÐÐÐÑ ÑÐÐÐ ÐÐÑÑÐÑ Ñ â%sâ"
+msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "ÐÑÐÐ ÐÐÐÑ ÑÐÐ ÐÐÑÑÐÑ Ñ %s"
+msgstr[1] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ %s"
+msgstr[2] "ÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ: ÐÐ %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÑ ÐÐÑÑÐÑ Ñ â%sâ"
+msgstr[1] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr[2] "ÐÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:318
 msgid "Moving messages"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "ÐÑÐÑÐ ÑÑÐ ÑÐ ÑÑÐÑÐ"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÑÐÑ â%sâ"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "ÐÑÐÑÐ ÑÑÐ ÐÐÑÐ ÑÑÐÑÐ"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÐ: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "ÐÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ(Ð)"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"ÐÐÐÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐ ÑÑÐÑÑÑ GnuPG ÐÐÑÑÐÐ:\n"
+"ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÑÐÑÐ:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ gpg userid ÐÐÐÑÐÑÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐ gpg ÐÐÐÐÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÐÑÑÑÐ ÐÐ\n"
-"SmartCard: â%sâ"
+"ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
+"ÐÐÐÐÑÐÐ ÐÐÑÑÐÑÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÐÑÑÑÐ\n"
+"ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÐÑÑÑ\n"
 "ÐÐÑÐÑÐÐÐÐ: â%sâ"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐ GnuPG-Ð ÐÐ â%sâ"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ-Ð ÐÐ â%sâ"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "ÐÐÑÑÑÐÑÐ."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÑÐÐÐÑÐ ÑÐÑÐÐÐ ÐÑÑÑÐ: ÑÐÐÑÐ ÑÑ 3 ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐ ÑÐÑÐÐ ÐÑÑÑ: ÑÐÐÑÐ ÑÑ 3 ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ GnuPG-Ð: %s"
-
-#: ../camel/camel-gpg-context.c:947
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐ."
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐ-Ð: %s"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209
-#: ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850
-#: ../camel/camel-gpg-context.c:1895
+#: ../camel/camel-gpg-context.c:989
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ: ÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÑÐ."
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+msgid "Could not generate signing data: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ:"
 
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "ÐÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÐ"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÐ."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ: %s"
+#: ../camel/camel-gpg-context.c:1737
+msgid "Cannot verify message signature: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÑÑÐÐ:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1858
+msgid "Could not generate encrypting data: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ:"
+
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1726
-#: ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÑÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÑÑÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ MIME ÐÐÐ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÐ ÐÐÐ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÑ"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÑÑÐÑÐ â%sâ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ: ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÑÑÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÑÐÐ â%sâ"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "ÐÑÑÐÐÐÐ ÐÑÐÐÐ ÐÑÐ ÐÐÐÑÑÐÑÑ ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÑÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ %s. ÐÐÐÑÑÐÑÑÐ ÐÐÑÐÐÑÐ."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"ÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ â%sâ. "
+"ÐÐÐÑÑÐÑÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ fcntl(2): %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âfcntl(2)â: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ flock(2): %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÑÐÐ ÐÐÑÐÑÑÐÑÐ âflock(2)â: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÑÑÐ â%sâ: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ Ñ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ %s: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÑÑÑ Ñ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ â%sâ: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐ: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "ÐÑÐÑÐÐ ÑÐÑÐÑÐ"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+msgid "No content available"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "ÐÐÑÑÑÐÑÐ"
+#: ../camel/camel-multipart-signed.c:335
+#, c-format
+msgid "No signature available"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "ÐÑÐÑÐÐ ÑÐÑÐÑÐ"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
-msgstr "ÐÐÐÐÐÐÑÐ: %s"
+msgstr "ÐÐÐÐÐÐÐ: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ: %s: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑ"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÐÐÐ: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ â%sâ ÑÐ ÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐ ÐÐÑÐ"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑ ÑÐÐÑ Ñ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐ ÑÐÐÑ Ñ ÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "ÐÐÐÑÑÐÑ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐ ÑÐ ÐÐÑÑÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÐÑ ÐÐÑÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ Ð-ÐÐÑÑÐ"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÑÐÐÐ ÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ %s: ÐÐÐÑ ÑÐÑÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÑ ÑÐÑÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐ."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ %s: ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ: ÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÑ."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐ â%sâ"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ."
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ:\n"
+"ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2197,7 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2206,533 @@ msgstr ""
 "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+msgstr "ÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ CRAM-MD5 ÐÐÐÐÐÐÐ, ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, ÐÐÐ "
+"ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
+msgstr "ÐÐÐÐÐÐ-ÐÐ5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ DIGEST-MD5 ÐÐÐÐÐÐÐ, ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÑÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ-ÐÐ5 ÐÐÐÐÐÐÐ, "
+"ÐÐÐ ÑÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "ÐÐÐÑ ÐÐ ÑÐÑÐÐÑ ÑÑÐÐÑÐ ÐÑÐ (>2048 ÐÐÑÐÑÐ)"
+msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÑÐÐÑÐ ÐÑÐ (>2048 ÐÐÑÐÑÐ)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "ÐÐÐÑ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÑÐÐÐÐ\n"
+msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "ÐÐÐÑ ÐÐ ÑÐÑÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ âÐÐÐÐÐÑÐÑ ÐÐÑÑÐÑÐâ ÑÐÐÑ"
+msgstr "ÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑ âÐÐÐÐÐÑÐÑ ÐÐÑÑÐÑÐâ"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÑÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÑ"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
-msgstr "GSSAPI"
+msgstr "ÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ Kerberos 5 ÐÑÐÑÐÐÐ."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÐÐÑÐÑ 5 ÐÐÑÐÑÑÐÐÐÑÐ "
+"ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ, ÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐ."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐ, ÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐ "
+"ÐÑÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ target_name ÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ."
+msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ target_name ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐ."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑ ÑÐÑÐÐÐ ÐÐÐÐÐ (target_name) ÑÐ ÑÐÐÑÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ "
+"ÐÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token ÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÐÑ ÐÑÐÐÐ ÐÐÑÐÐÐÑÑÐ input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÐÐÑ "
+"ÐÑÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÑÐÐÑÐ (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token ÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐÑ ÑÑÑÑÐÑÑÑÑ, ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"ÐÐÐÑ ÑÐÐÑÐ (input_token) ÑÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐÑ ÑÑÑÑÐÑÑÑÑ, ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐ "
+"ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "ÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐÑÐ ÐÑÐÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑ ÑÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐÑ."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"ÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐÑÐ ÐÑÐÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑ "
+"ÑÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐ ÑÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "ÐÑÑÐÐÐ ÐÐÑÐÑ ÑÐÐÑÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ input_token."
+msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÑ ÑÐÐÑÐ (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐÑÑ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÐÐ ÑÐÐÑÐÑÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ÐÐÐÐÑÐ ÑÑÐÐÐÐÐÑ ÑÐÐÑÐÑÐ ÑÐ ÐÑÑÐÐÐÐ."
 
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÐ ÑÐÑÐÐÑÐ."
+msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "ÐÐÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐÑÐÐ ÑÐÐÑ."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ Kerberos 4 ÐÑÐÑÐÐÐ."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ Kerberos ÐÐÑÑÑ:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ÐÑÐÑÐÐÐ"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
-msgstr "ÐÐÐÐÐÐÐÑÐ ÑÑÐÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÑÑÐÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
+msgstr "ÐÐÐÐ / ÐÐÐ"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ Windows ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ NTLM / ÐÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ."
+#: ../camel/camel-sasl-ntlm.c:39
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐ / ÐÐÐÑÑÐÐÑÐÐ "
+"ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
-msgstr "POP ÐÑÐ SMTP"
+msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ POP ÐÐÐÑ Ð ÐÐÑÐÐ ÐÐÐÑÑÐÑÐ SMTP"
+msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÑ ÐÑÐ ÐÐÐÑÑÐÑÐ ÐÐÐÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
-msgstr "POP ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP ÐÑÐ SMTP auth ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÑÑÐ"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐÐ ÑÑÐÐÑÐÐÑÑÐ"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP ÐÑÐ SMTP auth ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ pop"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "ÐÐÐ ÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐ-ÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ: %s: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:87
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:91
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:95
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÑÑÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐ â%sâ ÑÑÐÐÐ ÐÐÐ ÑÐ ÐÑÑÐÑÐÐ"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ %s:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "ÐÐÐÑÐÑÐ %s ÐÐÐÐÐÐÑ ÐÐ %s ÐÐ ÐÐÐÐÑÐÐÑ %s."
+msgstr "ÐÐÐÑÐÑÐ â%sâ ÐÐÐÐÐÐÑ ÐÐ â%sâ ÐÐ ÐÐÐÐÑÐÐÑ â%sâ."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ÑÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ."
-
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ CMS ÐÐÑÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ CMS ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐ CMS ÐÐÐÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ CMS ÐÐÐÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ð CMS ÐÐÑÐÐÑÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÐ"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ CMS ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÑÐ â%sâ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑÐ â%sâ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÑÑÐÐÑÑÐ SMIMEEncKeyPrefs"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÑÑÐÐÑÑÐ MS SMIMEEncKeyPrefs"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð CMS ÐÐÑÐÐÑÐÐÐÑ"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÑ ÐÐ ÑÐÑÑÐÐÐÑÐ."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ Ñ CMS ÐÐÐÐÐÐÑ"
-
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÐÑÐÐÐÐ"
 
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
-msgstr "ÐÐÐÑÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "ÐÐÑ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "ÐÐÐÑÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑ"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
-msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
 # ÑÐ, ÑÐ...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "ÐÐÐÐ ÐÐÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑÑ"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑÑ"
 
 # ÑÐ, ÐÐÐÐ ÑÐ Ð ÐÐÑÐ ÐÐ âÐÐÑÑÐÐÐÐÑâ...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "ÐÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÑÐ ÐÐÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÐÐ ÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐ ÑÑÐÐÐ ÑÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "ÐÐÑÑÐÐ ÐÐÐ ÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ, ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ, ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "ÐÐÑÑÐÐ ÐÐÐ ÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ, ÑÐÑÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐ Ð ÐÑÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÑÐÑÐ ÑÑ ÑÐÐÐÐÐÐ Ð ÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÑÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ÐÐÑÐÐÑÐÐÐ: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÑ ÑÐÑÑÐÐÐÑÐ."
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÐÐÐ ÑÐÑÑÐÑ"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÑÐÐ"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐ ÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÑÑÑÑ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÑÑÑ ÐÐ ÑÐÑÑÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ CMS ÐÐÑÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ CMS Enveloped data"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ CMS Enveloped data"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÑÐ CMS ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ CMS ÐÐÐÐÑÐÐ Ð ÐÑÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð CMS ÐÑÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÑÑÐÑ"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME ÐÐÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ"
-
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "ÑÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
+msgstr "Ð/ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ: ÐÐÑÑ ÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../camel/camel-smime-context.c:1207
-msgid "export keys: unimplemented"
-msgstr "ÐÐÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2177
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
-
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
-
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2368 ../camel/camel-store.c:2378
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ÐÐÐÑÐ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÑÐÐÐÐ ÐÑÑÑ ÐÐÐÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÑÐÐÐÐ"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
+#: ../camel/camel-store.c:2825
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL ÑÐ ÐÑÑÐÐÐÐ"
+#: ../camel/camel-store.c:2952 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "ÐÑÐÑÐÐ Ñ CRL"
+#: ../camel/camel-store.c:3093 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:700
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ4"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÐ: ÐÃÐ â%dâ"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ Ñ ÐÐÐÑÑ"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ: ÐÐÐ 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "ÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "ÐÑÐÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "ÐÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:895
+msgid "Connection refused"
+msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
+msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
+msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÑÑ ÐÐÑÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "Unknown error from SOCKS server"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ÐÐÑÐÐÐÐÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "ÐÐÐÐÑ ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ÐÐÐÐÐÐÑ ÑÐÑÐÑÑÐÐ ÐÐÑÐÐÐÐÑÐ"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐÐ"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÑÐÐ (ÐÐÑÐÐÑÐ 255 ÐÐÐÐÐÐÐ)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2745,16 @@ msgstr ""
 "ÐÑÐÑÐÐ:       %s\n"
 "ÐÐÑÐÐÑ:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "ÐÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "ÐÐÐÐ"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"ÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÐÐ %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,1609 +2763,1374 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"ÐÑÐÐÐÑÐ SSL ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ %s:\n"
+"ÐÑÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ ÐÐ â%sâ:\n"
 "\n"
 "%s\n"
 "\n"
 "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"ÐÑÐÐÐÐÐ ÑÐ ÑÐÑÑÐÑÐÐÐÑÐÐ: %s\n"
+"ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÑÐÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"ÐÐÑ ÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
+"ÐÐÑ ÐÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"ÐÑÑÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑ: %s\n"
+"ÐÑÑÐÐÐÐ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"ÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ: %s\n"
+"ÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐÑ ÑÐÐÑÐÑÐ: %s\n"
 "ÐÐÐÐÐÐÑ: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÑÑ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÑÐÑÑ â%sâ"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1263 ../camel/camel-vee-folder.c:1426
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÑÑ â%sâ: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÑÐÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1299
 #, c-format
 msgid "No such message %s in %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ %s Ñ %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ â%sâ Ñ â%sâ"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÑÐÐÐÑ ÑÐÑÑÐÐÐÑ"
+#: ../camel/camel-vee-folder.c:1367
+#, c-format
+msgid "Error storing '%s': "
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÑÑ â%sâ:"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "ÐÐÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ: %s: ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÐ"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ ÐÐ ÑÑÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
+msgid "Could not load summary for %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ â%sâ"
 
-# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÑÐÐ"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s: %s"
+msgid "Checking for deleted messages %s"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "ÐÑÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
 msgid "Could not get message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐ %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÑÐ ÐÑÐÐ. ÐÑÐÑÐÐÐÐÑÐ ÑÐ."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ÐÑÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ %s"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ: %s\n"
+"  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:462
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgid "Cannot get message %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐ: %s"
+msgid "This message is not available in offline mode."
+msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÑÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÑÑÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+msgid "Cannot append message in offline mode: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "ÐÑÐ_ÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
+msgstr "Ð_ÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../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/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ Ñ_ÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../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 "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ_ÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ Ñ_ÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
-msgstr "SOAP ÐÐÐÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_ÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÑÑ:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "ÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "ÐÐ ÐÑÐÑÑÑÐÐÑÐ Novell Groupwise ÑÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÑÐÑÑÑÐ ÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ GroupWise ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ "
+"ÑÐÐÑÑÑ."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÑÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÑÑÑÐÐÐ Ñ ÐÐÑÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÑ."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ GroupWise ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise ÑÐÑÐÐÑ %s"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise ÑÐÑÐÐÑ ÐÐ %s ÐÐ %s"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ %s"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
-msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÐÐÑÑÐÑ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÑÐ ÑÐÐÑÑÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑ ÐÐÑÑÐ. ÐÐÑÐÑÐÑÐ ÐÑ ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ/ÐÑÐÐÐ ÐÑÐÐÐ ÐÐÐÐÐ ÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÐ ÐÑÑÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÑÑ.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
 #, c-format
-msgid "Could not send message: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐ: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "ÐÐÐÐÐÐÐ:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ÐÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "ÐÑÐÐ_ÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ð_ÑÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐÑ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐ"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "ÐÑÐÐ"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÑÐÐ ÑÐÑÐÐÑÐÐÐ"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"ÐÑÐÐÐÑÐÐÐ ÑÑÐ ÑÐÐÑÑÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ "
+"Ñ ÐÐÐÐÐÐÐÑ ÐÐÑÑÐ. ÐÐÑÐÑÐÑÐ ÐÑ ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ âÐÐÑÐÑÐ/ÐÑÐÐÐâ ÐÐÐÐÐ "
+"ÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÐ ÐÑÑÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÑÑÑ.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
+#, c-format
+msgid "Could not send message: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑÐ %s %s:\n"
+"ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ IMAP ÑÐÑÐÐÑÐ: %s"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ IMAP ÐÐÐÐÐÐÐ: %s"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ ÑÐ ÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "ÐÐÐÐÐÐÑ IMAP ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ %s ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐÐ â%sâ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ Ð ÑÐÐÑ ÐÐÐÐÐÐÑ ÐÐ IMAP ÑÐÑÐÐÑÐ: %s"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÑÐÑÐÐÑÐ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
-msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ Ñ %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÑÑÐÑÑÑ ÐÐÐÐÐÐÑÐ â%sââ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÐ APPEND!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3369
+msgid "Unable to retrieve message: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5211
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ ÑÐ ÐÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÐÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5212
 msgid "No such message available."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐÐÑÐ ÐÐÑÑ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑ %d"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÑÑ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÐ ÐÐÑ ÐÐ ÐÐÑÑÐÑ %d"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÐ ÐÐÑ ÐÐ ÐÐÑÑÐÑ â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ FETCH ÐÐÐÐÐÐÑÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÐÐÑÑ."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÑÐÐÐ: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÑÐÐÐ: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÑÐÐÑÐ ÐÐÑÑÐÐ %s: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÑÑÐÐÑÐ %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÑ â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐ â%sâ: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "ÐÑÐ_ÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÐÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ÐÑÐ_ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-msgid "Check new messages for Jun_k contents"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑ_ÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_ÐÐÑÐÐÐÐ:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "ÐÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "ÐÑÐÐ_ÐÐÐ ÑÐÐÐ ÐÑÐÑÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "Ð_ÑÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐÑ"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+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 "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÐÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÑÑÐÐÐÐÐ ÑÐ_ÐÑÐÐÑ ÐÐÑÑÑ ÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
-msgstr "IMAP"
+msgstr "ÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
-msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ IMAP ÑÐÑÐÐÑÐ."
+msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ÑÐÑÐÐÑ %s"
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP ÑÐÑÐÐÑ ÐÐ %s ÐÐ %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
-msgstr "SSL ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ %s Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÐÐÐÑ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
-msgstr "STARTTLS ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
-msgstr "SSL ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
+msgstr "ÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
-msgstr "SSL ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÑ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÑ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ â%sâ: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "ÐÐÐÐÑÑÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "ÐÑÐÐÑÐÐÐ"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "ÐÐÑÐÐÑÐ"
+msgid "Connection cancelled"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "ÐÐÐÐÐÐÐ"
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP ÑÐÑÐÐÑ %s ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÑÐÑÐÐÐ %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐ %s"
+msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ.\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, 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:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ IMAP4 ÑÐÑÐÐÑÐ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ IMAP ÑÐÑÐÐÑÐ: %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "ÐÐÐÐ ÑÐ IMAP4 ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "ÐÐÐÐÑÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐ Ð ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÑ ÐÑÐÑÐÑÐÐÐ ÐÐ X ÑÐÐÑÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐÑÑÐÑÐÑÐÑ ÐÐ X ÑÐÐÑÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÑÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑÐ."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ %s Ñ ÐÐÐÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ: ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐ %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgid "IMAP server %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ LIST ÐÐÑÐÑÐÐÑÐÑÑ ÐÐ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
+msgid "IMAP service for %s on %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:434
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:701
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "ÐÐÐÐÑÑÐ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÑ ÑÐÐÑÐÐ ÐÐÐÐ â%câ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+msgid "Unknown parent folder: %s"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+msgid "Server unexpectedly disconnected"
+msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+msgid "Server unexpectedly disconnected: "
+msgstr "ÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÐ: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÑÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+msgid "Could not create folder summary for %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ â%sâ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+msgid "Could not create cache for %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑ ÐÐ â%sâ: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ÐÐÑÐÑÑÐ _ÐÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ %s ÐÐ ÐÐÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "ÐÐÑÐÑÑÐ _ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÑÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "ÐÐÑÐÐÐÐ:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "ÐÑÐÑ ÐÐÐÐ ÐÐ _ÐÑÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐ:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "ÐÐÐÐ+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+msgid "Error writing to cache stream: "
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐ Ñ ÑÐÐ ÐÑÑÐÐÐ:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+msgid "Not authenticated"
+msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÑÐÐ."
+msgid "Could not connect to %s (port %s): "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ â%sâ (ÐÐÑÑ %s): "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÑÑ IMAP ÑÐÑÐÐÑÐ %s: "
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+msgid "Closing tmp stream failed: "
+msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ:"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+#: ../camel/providers/imapx/camel-imapx-server.c:5357
+#: ../camel/providers/imapx/camel-imapx-server.c:5372
+msgid "Cannot create spool file: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÑÐÐÐ: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "ÐÐÐÐ ÑÐ IMAP ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "ÐÑÑÐÐÐ ÐÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ÐÐÑÐÐÑÐÐÐÐÑÐÐÐÐ IMAP 4(.1) ÐÐÐÑÐÐÑ\n"
-"ÐÐÐ ÑÐ ÐÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐ ÐÐÐ, ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐ imap.\n"
-"\n"
-" !!! ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ  !!!\n"
+msgid "No such folder: %s"
+msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ %s (ÐÐÑÑ %s): %s"
+msgid "Source stream returned no data"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "ÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
+msgid "Source stream unavailable"
+msgstr "ÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "ÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_ÐÐÑÐÑÑÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â.foldersâ (exmh)"
+msgstr "_ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â.foldersâ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
-msgstr "MH-ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐ-ÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ ÐÐÐÐÐ MH."
+msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "ÐÐ ÐÐÐÐÐÑÐÑÐ (ÐÑÐÐÐÑÑÐÑÐ) ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐ mbox ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐ ÑÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐ."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"ÐÐ ÐÐÐÐÐÑÐÑÐ (ÐÑÐÐÐÑÑÐÑÐ) ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐÑÐÐÑÐÑÐÐÐ "
+"ÐÑÐÐÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ Ñ Maildir ÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑ ÐÐÐÐÐÑ"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ maildir ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
+msgstr "ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÐÐÑÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ Ð ÑÑÐÑÑÑÑ Ñ ÑÐÑÐÐÑÑ Elm/Pine/Mutt"
+msgstr "_ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÑÐÑÐ Ñ ÐÐÐ/ÐÐÐÐ/ÐÑÑ ÑÐÑÐÐÑÑ"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "ÐÑÐÐÐÐÑÐÐÐ Unix mbox spool ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÑÐÐÑÐÐ ÑÑÐÐÐÐÑÐÐÐ mbox spool ÐÐÑÐÑÐÐÐ.\n"
-"ÐÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÐÑÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ Elm, Pine, ÐÐÐ Mutt ÑÑÐÐÑ."
+"ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐ Ñ ÑÐÐÑÐÐ ÑÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÑÐÑÐÐÐ "
+"ÐÑÐÐÑÐÐÐ.\n"
+"ÐÐÐÐÑÐ ÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÐÑÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐ, ÐÐÐÐ ÐÐÐ ÐÑÑ ÑÑÐÐÑ."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "ÐÑÐÐÐÐÑÐÐÐ Unix mbox spool ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "ÐÑÑÐÐÐ root %s ÐÐÑÐ ÐÐÑÐÐÑÑÐÐ ÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑÑÑÐÑÐÑÑÐÐ ÐÑÑÐÐÐ â%sâ ÐÐÑÐ ÐÐÑÐÐÑÑÐÐ ÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "ÐÑÑÐÐÐ root %s ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐÑÑÑÐÑÐÑÑÐÐ ÐÑÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ÐÐÐÐÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÑÑ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ %s"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ â%sâ"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ %s Ñ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐÑ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÑÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "ÐÑÐÐÐÐÐÑÐ maildir ÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐ"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ maildir ÑÐÑÑÐÐÐÑ: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+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
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÐÑ Ñ ÐÐÑÐÐÐÑÐÑ ÑÐÑÑÐÐÐÑ: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ: %s ÐÐ ÑÐÑÑÐÐÐÐ %s\n"
-"  %s"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:718
+#, c-format
+msgid "Folder %s already exists"
+msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ maildir ÐÐÑÐÐÑÐÑÐÑÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
-msgstr "ÐÐÑÐ maildir ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:866
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:709
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÑÐÑ."
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÑÐ maildir ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐÑÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐÑÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
-msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÑÐÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
-msgstr "ÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÑÑÐÑÐ ÑÐÑÑÐÐÐÑ %s: %s"
+msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ mbox ÐÐÑÐÑÐÐÑ: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÐÐÐÐÑ ÐÐÑÐÑÐÐÑ: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÑÐÑÐÐÐ."
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÑÐÐÑÐÐÐ ÐÑÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "ÐÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÑÐÐÐÐ."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../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:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐÑÐ ÐÑÐÐÐÐ. ÐÐÑÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ â%sâ: %s."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "ÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ â%sâ: â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ: â%sâ: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ â%sâ Ñ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â%sâ Ñ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "ÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÑÐ ÐÐ ÐÐÑÑÑ %ld Ñ ÑÐÑÑÐÐÐÐ %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "ÐÐÐÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÑÑ ÐÐÑÑÐ ÐÐ ÐÐÑÑÑ %s Ñ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÑÐÑÑÐÐÐÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÑ: %s"
+
+#: ../camel/providers/local/camel-mbox-summary.c:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÑÐÑÐÐÐ, ÐÐÐÑÐÐÐÑÐ ÑÐ. (ÐÑÐÐÐÐÐÐÐ ÑÐ âÐÐ ÑÐÐÐâ, ÐÐÐ ÐÐÑÐÐ "
+"ÐÐÐÐÐ.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ, ÑÐÐ Ð ÐÐÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐ"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ mh ÑÐÑÑÐÐÐÑ: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÑ Ñ ÐÑ ÑÐÑÑÐÐÐÑ: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÑÐÑÑ MH ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÑÐÑÑ ÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "ÐÑÐÐÑÐÐÐ â%sâ ÐÐ ÐÐÐÐ ÑÐ ÐÑÐÐÑÐÑÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "ÐÑÐÐÑÐÐÐ â%sâ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ â%sâ"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ÐÐÑÑÐÐÐÐ â%s/%sâ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ÐÐÑÑÐÐÐÐ â%sâ ÐÐ ÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "ÐÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÑÐÑÐÐÐ"
-
+#: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ %s: %s\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s\n"
 "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÑÐÐÐ, ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
 #: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ: ÐÐÐ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:376
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÐÑ â%sâ: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐ: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑÐ NNTP ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐ!"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ NNTP ÑÐÑÑÐÐÐÐ!"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-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:44
+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:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Ð Ð_ÑÐÐÐÑÑÐÑÑ ÐÐ ÐÑÐÑÐÐÑ, ÐÑÐÐÐÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "ÐÐÐ ÑÐ ÐÐÐÑÑÐÑ ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÐ ÐÐ USENET ÐÑÑÐÐ ÐÐÑÑÐ."
+msgstr "ÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÑ ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÑÑÐ."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐ"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ NNTP ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÑÐÑÐÐÑÑ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP ÑÐÑÐÐÑ %s ÑÐ ÑÐÐÑÐÑÐÐ ÐÐÐÐÐ Ð ÐÑÐÑÑÐ %d: %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÑÐ ÐÑÐÑÐÐ ÐÐÐ ÐÑÐÑÐÐ â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET ÐÐÑÑÐ ÐÑÐÐÐ %s"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4141,677 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"ÐÐ ÐÐÐÐÑÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑ ÐÑÑÐÑ ÐÐÑÑÐ:\n"
+"ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑ ÐÑÑÐÑ ÐÐÑÑÐ:\n"
 "\n"
 "ÐÐÐÐ ÑÐÐÐÐ ÐÑÑÐÐ. ÐÐÐÐÑÐÐÐ ÑÑÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"ÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÑÐÐÐÑÐ ÑÐ ÐÐÐ ÐÑÑÐÐ ÐÐÑÑÐ:\n"
+"ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÑÐ ÐÐÐ ÐÑÑÐÐ ÐÐÑÑÐ:\n"
 "\n"
 "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐÑÐ!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÑÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
+msgstr ""
+"ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÑÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ."
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
+msgstr ""
+"ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÐÐ ÐÐÑÑÐ: ÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÑÑÐ ÑÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐ"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑ: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "ÐÐÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "ÐÐÐÐÐÐÐÐÐÐ."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "%s: ÐÑÐÑÑÐÐÑÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ xover-Ð: %s"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÑÐ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ head-Ð: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÑÑÑÐÐÐ"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:282
+#: ../camel/providers/pop3/camel-pop3-folder.c:341
+#, c-format
+msgid "No message with UID %s"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:454
+msgid "Unknown reason"
+msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Retrieving POP summary"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ POP ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:518
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ POP ÐÑÐÐÐÐÐ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Expunging old messages"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÑÐÑÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÑÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:590
 msgid "Expunging deleted messages"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐ %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "ÐÐÐÐÐÑÐÑÐ POP ÐÐÑÑÐÐ %d"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "ÐÑÑÐÐÐ ÐÐ ÐÐÑÑÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_ÐÑÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "Ð_ÐÑÐÑÐ ÐÐÐÐÐ %s ÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ÐÐÑÐÑÐ _ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ âÐÐÐÐÐÐÐâ"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
-msgstr "ÐÑÐÑÑÑÐ _ÐÐÐÑÑÐÑ ÐÐ ÑÐÐ POP3 ÐÑÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÑÑÑÐ _ÐÐÐÑÑÐÑ ÐÐ ÑÐÐ ÐÐÐ3 ÐÑÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
-msgstr "POP"
+msgstr "ÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "ÐÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐ ÑÐ POP ÑÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ. ÐÐÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐ POP ÑÐÑÐÐÑÐ."
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ. "
+"ÐÐÐ ÑÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ."
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐ "
+"ÐÑÐÑÐÐÐÐÐ. ÐÐÐ ÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐ ÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÑÐÐ Ð ÐÐ ÑÐÑÐÐÑÐÐÐ ÐÐÑÐ "
+"ÑÐÑÐÐ ÐÐ ÑÐ ÐÐÐÑÐÐÐÐÑÑ."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐ APOP ÐÑÐÑÐÐÐÐÐ. ÐÐÐ ÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐ ÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÑÐÐ Ð ÐÐ ÑÐÑÐÐÑÐÐÐ ÐÐÑÐ ÑÐÑÐÐ ÐÐ ÑÐ ÐÐÐÑÐÐÐÐÑÑ."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ POP ÑÐÑÐÐÑÐ %s"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
-msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ STLS"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:257
-msgid "TLS is not available in this build"
-msgstr "TLS ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ"
+msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐÑ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "ÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÑ ÑÑÐÐÐÐ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+msgid "TLS is not available in this build"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s: ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÑÑÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ "
+"ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "ÐÐÑÑÐÐÐÐ SASL ÐÑÐÑÐÐÐ â%sâ ÐÐ POP ÑÐÑÐÐÑ %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐ â%sâ ÐÐ ÐÐÐ ÑÐÑÐÐÑ %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ POP ÑÐÑÐÐÑ %s: ÐÑÐÑÐÐ SASL ÐÑÐÑÐÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐ ÑÐÑÐÐÑÑ â%sâ: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s: ÐÑÐÐÑÐÐ \tInvalid APOP ÐÐ. ÐÐÐÑÑ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑ."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ: ÐÑÐÐÐÑ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐ. ÐÐÐÑÑ "
+"ÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s.\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐÐÐÐ: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
+"ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s.\n"
-"ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ: %s"
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ.\n"
+"ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐÐÐÐ%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "ÐÐÐ3 ÑÐÑÐÐÑ â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "ÐÐÐ3 ÑÐÑÐÐÑ ÐÐ â%sâ ÐÐ â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:721
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:738
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "ÐÐÐ3 ÐÑÑÐÐÐ ÐÐÐÐ ÑÐÑÐÑÐÑÑÐÑÑ ÑÐÑÑÐÐÐÐ"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑÐÐ âsendmailâ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑÐÐ âsendmailâ ÐÑÐÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐ sendmail-Ñ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÑÐÑ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ sendmail: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail ÑÐ ÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
+msgstr "ÑÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐ ââ%s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÑÐÑÐ %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ â%sâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail ÑÐ ÐÐÐÑÑÐÐ ÑÐ ÑÑÐÑÑÑÐÐ %d: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÐÐ sendmail"
+msgstr "ÑÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐ ÑÐ ÑÑÐÑÑÑÐÐ â%dâ: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
-msgstr "SMTP"
+msgstr "ÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÑÑÐ Ñ ÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐÐ SMTP."
+msgstr ""
+"ÐÐ ÐÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÑÑÐ Ñ ÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑÐ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑ â%sâ Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ â%sâ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ â%sâ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ â%sâ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÑÐÑ: ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÑÐÐÐÐÐÑÐ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
-msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ, ÐÐÐÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ, ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
-msgstr "ÐÐÑÐÐÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "ÐÑÐÑÑÑ ÑÐÑÑÐÐÐ, ÐÐÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "ÐÐÑÑÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
-msgstr "ÐÐÑÐÐÑ ÑÐÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑ ÑÐ ÑÐÑÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
-msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ, ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ, ÐÐÑÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ Ñ ÑÐÐÑ, ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÑÐ Ñ ÑÐÐÑ, ÐÐÐÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÑÐ ÐÑÐÑÐÐÑÐÐÐ ÐÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐ; ÐÐÐÑÑÐÑÑÐ <ÐÑÑÐÑÐ-ÐÑÐÑÐÐÑÐÐÐÑÐ>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "ÐÐÑÑÑÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ: ÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐ ÑÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐ ÐÐÑÑÑ: ÐÑÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐ ÐÑÐÐÑÐÐÑÐ: ÐÐÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ÐÐÑÐÑÐ ÑÐÐÑ ÐÐÑÑÐ; ÐÐÐÑÑÐÐÐ ÑÐ <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "ÐÐÑÑÐÐÐ ÐÑÐÐÐÑ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
-msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐÐ ÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "ÐÑÐÑÐÐ ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ SMTP ÑÐÑÐÐÑ %s Ñ ÑÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÐÑ: %s"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ STARTTLS ÐÐÐÐÐÐÐ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "ÐÐÑÑÐÐÐÐ STARTTLS ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP ÑÐÑÐÐÑ %s ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ %s."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ SMTP ÑÐÑÐÐÑ.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ÑÐÑÐÐÑ %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP ÐÐÑÑÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐ %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐ: ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÐ."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐ: ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐÑ ÐÑÐÐÐÐÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
-msgstr "SMTP ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ HELO ÐÐÐÐÐÐÐ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "ÐÐÑÑÐÐÐÐ HELO ÐÐÐÐÐÐÐ"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
-msgstr "SMTP ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐ SASL ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ AUTH ÐÐÐÐÐÐÐ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "ÐÐÑÑÐÐÐÐ AUTH ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÐ ÑÐÑÐÐÑÐ.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "ÐÐÑÑÐÐÐÐ MAIL FROM ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "ÐÐÑÑÐÐÐÐ MAIL FROM ÐÐÐÐÐÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "ÐÐÑÑÐÐÐÐ RCPT TO ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> ÐÐÑÑÐÐÐÐ"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "ÐÐÑÑÐÐÐÐ DATA ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "ÐÐÑÑÐÐÐÐ DATA ÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ RSET ÐÐÐÐÐÐÐ: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "ÐÐÑÑÐÐÐÐ RSET ÐÐÐÐÐÐÐ"
+msgid "Error creating SASL authentication object."
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÑÑ ÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âAUTHâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âMAIL FROMâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRCPT TOâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> ÐÐÑÐ ÑÑÐÐÐÐ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âDATAâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âRSETâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÐÐ âQUITâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "ÐÐÑÑÐÐÐÐ QUIT ÐÐÐÐÐÐÐ: %s"
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "ÐÐÐÐÑÑÐÑÐ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "ÐÐÑÑÐÐÐÐ QUIT ÐÐÐÐÐÐÐ"
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ÐÐÐÑÐÐÐ"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ÐÐÑÑÐÑÐÐ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "ÐÐÑÑÐÐÑÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "ÐÐÐÐÐ ÐÑÑÑÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ÐÐÐÐÐ"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "ÐÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "ÐÑÐÑÑÑ"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "ÐÑÑÐÑÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "ÐÑÐÐÐ Ð ÐÐÐÐÑÐ"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
-msgstr "VIP"
+msgstr "ÐÐÐ"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÐÐÐÐÑÐ"
 
@@ -4772,8 +4819,7 @@ msgstr "ÐÐÐÐÑÐ"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4827,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4835,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,615 +4843,1135 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659
-#: ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707
-#: ../libedataserver/e-time-utils.c:1776
-msgid "%m/%d/%Y"
-msgstr "%d. %m. %Y."
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
+msgid "%m/%d/%Y"
+msgstr "%d. %m. %Y."
+
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strptime format for time of day, without seconds 24-hour format, and no colon.
+#: ../libedataserver/e-time-utils.c:1871
+msgid "%H%M"
+msgstr "%H:%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:1875
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
+msgid "Accessing LDAP Server anonymously"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ"
+
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
+msgid "Failed to authenticate.\n"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ.\n"
+
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "Ð_ÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:185
+msgid "Category Icon"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:191
+msgid "_No Image"
+msgstr "_ÐÐÐ ÑÐÐÐÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "Ð ÐÐÐÐÑÐÐÐÑÑ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "ÐÑÐÐÑÑÐÐ _ÐÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
+
+#: ../libedataserverui/e-categories-dialog.c:668
+msgid "_Available Categories:"
+msgstr "_ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
+
+#: ../libedataserverui/e-categories-dialog.c:711
+msgid "_Edit"
+msgstr "_ÐÑÐÑÐÐÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "ÐÐÐÐÐÑÐ"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "Ð_ÐÑÐÑÐÑ:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "ÐÐÑÐÐÐ_ÑÐÑÐ:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_ÐÑÐÑÑÐÐÐ:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
+msgid "Any Category"
+msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "ÐÐ_ÐÑÐÐÑÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "ÐÑÐÑÑÐÐÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:292
+msgid "Address Book"
+msgstr "_ÐÐÑÐÑÐÑ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:295
+msgid "Contacts"
+msgstr "ÐÐÐÑÐÐÑÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_ÐÐÐÐÑ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_ÐÐÐÐÐÐ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ: %s"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../libedataserverui/e-name-selector-entry.c:2661
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "ÐÑÐÑÑÑÐ %s ÑÐÑÑÐÑ"
+
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2676
+#, c-format
+msgid "Cop_y %s"
+msgstr "Ð_ÐÐÐÐÐ %s"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2686
+#, c-format
+msgid "C_ut %s"
+msgstr "Ð_ÑÐÑÐ %s"
+
+#. Edit Contact item
+#: ../libedataserverui/e-name-selector-entry.c:2703
+#, c-format
+msgid "_Edit %s"
+msgstr "_ÐÑÐÐÐ %s"
+
+#: ../libedataserverui/e-name-selector-list.c:509
+#, c-format
+msgid "_Delete %s"
+msgstr "_ÐÐÐÐÐÐ â%sâ"
+
+#: ../libedataserverui/e-passwords.c:127
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr "ÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÑÐ ÑÐÐÑÑÐÐÑÐÐ: ÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
+msgid "You have the Caps Lock key on."
+msgstr "ÐÐÑÑÑÐÐÐ ÑÑÐ ÐÐÐÐÐÐ ÑÐÐÐÐ."
+
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
+msgid "_Remember this passphrase"
+msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
+msgid "_Remember this password"
+msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
+msgid "_Remember this password for the remainder of this session"
+msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+
+#. prepare the dialog
+#: ../libedataserverui/e-source-selector-dialog.c:100
+msgid "Select destination"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
+
+#: ../libedataserverui/e-source-selector-dialog.c:170
+msgid "_Destination"
+msgstr "_ÐÐÑÐÐÐÑÑÐ"
+
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ"
+
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑÐ"
+
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "ÐÐÑ ÐÐÑÐÐÐÑÐÑ"
+
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "â%sâ Ñ ÐÑÐÐÐ ÐÑÐ â%sâ"
+
+#~ msgid "book busy"
+#~ msgstr "ÐÑÐÐÐ ÐÐÑÐÐÑÐ"
+
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA ÐÐÑÐÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑ â%sâ"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: ÐÐÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÑÐÑÐÑÐ"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â%sâ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐ â%sâ"
+
+# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
+#~ msgid "%s: canceled"
+#~ msgstr "%s: ÐÑÐÐÐÐÐÐ"
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: ÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑ â%s'"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ EBookListener"
+
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: ÐÐÐÐ ÑÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÑÐÐÑÑÐÐ Ñ gconf"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+
+#~ msgid "Verifying message"
+#~ msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#~ msgid "Cannot open message"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÑ"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÑÑÐÑÐ ÐÐÑÑÐÐ: ÐÐ %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑ: ÐÐ %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ: ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ: ÐÐ %s"
+
+#~ msgid "Learning junk"
+#~ msgstr "ÐÑÐÑÐ ÑÑÐ ÑÐ ÑÑÐÑÐ"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "ÐÑÐÑÐ ÑÑÐ ÐÐÑÐ ÑÑÐÑÐ"
+
+#~ msgid "Canceled."
+#~ msgstr "ÐÐÑÑÑÐÑÐ."
+
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "ÐÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÐ"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÑ "
+#~ "ÐÐÑÐÑÐÐÑ: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
+
+#~ msgid "cannot create thread"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ Kerberos 4 ÐÑÐÑÐÐÐ."
+
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ Kerberos ÐÐÑÑÑ:\n"
+#~ "%s"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel ÑÐÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "ÑÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "ÐÐÐÐÐ ÐÑÑÑÐÐÐ: ÐÐÐÐÐÐÐÐÐÐ"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ"
+
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÐÐÑÐ ÑÐÐÐÐ ÐÑÑÑ ÐÐÐÐÐÐÑÐ"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "ÐÐÑÑÐÐÐ ÐÐÑÐÐÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÑÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÑÐÐÐÐ"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL ÑÐÑ ÐÐÑÐ ÐÐÐÐÑÐ"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL ÑÐ ÐÑÑÐÐÐÐ"
+
+#~ msgid "Error in CRL"
+#~ msgstr "ÐÑÐÑÐÐ Ñ CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÑÐ"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "ÐÐÐÐÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑ Ñ ÐÐÐÑÑ"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÑÑÐ"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "ÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "ÐÑÐÐÐÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÑÐ"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐ"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "ÐÐÐÐÐÐÑÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÑÐ"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ÐÐÑÐÐÐÐÑÐ"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/ÐÐÐÐÐÐÑ ÑÐÑÐÑÑÐÐ ÐÐÑÐÐÐÐÑÐ"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐÐ"
+
+#~ msgid "Error in application verification"
+#~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "ÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÐÐ %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ?"
+
+# ÐÐÐ ÑÐ ÐÐÐÐ "ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÐ", ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐÐÐÑÐ
+#~ msgid "User canceled"
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÑÐÐ"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÑÐ ÐÑÐÐ. ÐÑÐÑÐÐÐÐÑÐ ÑÐ."
+
+#~ msgid "Hula"
+#~ msgstr "ÐÑÐÐ"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÑÐÐ ÑÐÑÐÐÑÐÐÐ"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "ÐÐÐ ÐÐÐÑÑÐÐÑÑ ÐÐÐÐÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐ ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ "
+#~ "ÐÐÐÑÐÐÐ ÑÐÐÑÑÑ."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÑÑÐÑÑÑ ÐÐÐÐÐÐÑÐ â%sââ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÐÐ APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÐ ÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÐ APPEND!"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "ÐÑÐ_ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ"
+
+#~ msgid "Drafts"
+#~ msgstr "ÐÑÐÐÑÐÐÐ"
+
+#~ msgid "Sent"
+#~ msgstr "ÐÐÑÐÐÑÐ"
+
+#~ msgid "Templates"
+#~ msgstr "ÐÐÐÐÐÐÐ"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐ IMAP4 ÑÐÑÐÐÑÐ %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ IMAP ÑÐÑÐÐÑÐ: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐÑÐÐÐÐ IMAP ÑÐÑÐÐÑÑ %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "ÐÐÐÐ ÑÐ IMAP4 ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "ÐÐÐÐÑÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÑÐÐÐ Ð "
+#~ "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÐ"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÑ ÐÑÐÑÐÑÐÐÐ ÐÐ X ÑÐÐÑÐÐÐ"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "ÐÑÑÐÑÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐÑÑÐÑÐÑÐÑ ÐÐ X ÑÐÐÑÐÐÐ"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÐ"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ %s ÐÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÑÐÑÑÐÐÐÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ "
+#~ "ÐÑÐÑÐÐ"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÐÐÐÐÑÐ "
+#~ "ÐÑÐÑÐÐ"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ "
+#~ "ÐÐÑÐÐÐÐ"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ Ñ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ _ÑÑÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑÐ ÑÐÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "ÐÐ ÑÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑÐ."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ IMAPv4rev1 ÑÐÑÐÐÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐ "
+#~ "ÑÐÐÑÑÑ."
 
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834
-#: ../libedataserver/e-time-utils.c:1956
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ IMAP ÑÐÑÐÐÑ %s Ñ ÐÐÐÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ: ÑÐÑÐÐÑ ÐÐ "
+#~ "ÐÐÐÑÐÐÐÐ STARTTLS"
 
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838
-#: ../libedataserver/e-time-utils.c:1948
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÐ %s"
 
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843
-#: ../libedataserver/e-time-utils.c:1953
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÐÐÑ %s ÐÐÐÐÑÑ %s"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
-msgid "%H%M"
-msgstr "%H:%M"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ LIST ÐÐÑÐÑÐÐÑÐÑÑ ÐÐ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐ LDAP ÑÐÑÐÐÑÑ"
+#~ msgid "Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ.\n"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "Ð ÐÐÐÐÑÐÐÐÑÑ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐ"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "ÐÐÐÐÐ"
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÑÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_ÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "Ð_ÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "ÐÑÐÐÐÐÑ(Ð) ÐÑÐÐÐÐÐ(ÑÑ) ÐÐÐÐ _ÐÐÑÐÐÐÑÐÑÐÐÐ:"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â%sâ Ñ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "_ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ:"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ %s ÐÐ ÐÐÑÐÐÐÑ â%sâ ÑÐ IMAP ÑÐÑÐÐÑÐ %s: %s"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "_ÐÑÐÑÐÐÐÑÐ"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-msgid "Create category \"%s\""
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ â%sâ"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ÐÐÐÐÑÐ Ð ÐÐÑÐÐÐ"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÐ IMAP ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ÐÐÑÐ ÐÐ ÐÐÑÐÐÑ"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ: ÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "_ÐÐÐÐÑ"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "_ÐÐÐÐÐÐ"
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP ÑÐÑÐÐÑ %s ÐÐÑÐ ÑÑÐÐÐÑÐÐ."
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "ÐÑÐÐÐÐÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÑÑ IMAP ÑÐÑÐÐÑÐ %s: "
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>ÐÐ_ÐÑÐÐÑÐ</b>"
+#~ msgid "No data"
+#~ msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ</b>"
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "ÐÐÐÐ ÑÐ IMAP ÑÐÑÐÐÑÐÐ %s ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "Ð_ÐÑÐÑÐÑ:"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "ÐÐÑÐÐÑÐÐÐÐÑÐÐÐÐ IMAP 4(.1) ÐÐÐÑÐÐÑ\n"
+#~ "ÐÐÐ ÑÐ ÐÐÐÑÐÐÐÑÐÐ Ð ÐÐÐÐÐÑÐÐÐ ÐÐÐ, ÐÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐ imap.\n"
+#~ "\n"
+#~ " !!! ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÐ  !!!\n"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "_ÐÐÑÐÑÐÑ"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ POP ÑÐÑÐÐÑ %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "ÐÐÑÐÐÐ_ÑÐÑÐ:"
+#~ msgid "Maildir append message canceled"
+#~ msgstr "ÐÑÐÐÐÐÐÑÐ maildir ÐÐÑÑÐÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "ÐÐÐÑÐÐÑÐ"
+#~ msgid "Invalid message contents"
+#~ msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "ÐÑÐÑÑÐÐÐ"
+#~ msgid "Mail append canceled"
+#~ msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_ÐÑÐÑÑÐÐÐ:"
+#~ msgid "Message construction failed."
+#~ msgstr "ÐÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÑÐÐÐÐ."
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "ÐÑÐÑÑÑÐ %s ÑÐÑÑÐÑ"
+#~ msgid "MH append message canceled"
+#~ msgstr "MH ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐ"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
-#, c-format
-msgid "Cop_y %s"
-msgstr "Ð_ÐÐÐÐÐ %s"
+#~ msgid "Use cancel"
+#~ msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
-#, c-format
-msgid "C_ut %s"
-msgstr "Ð_ÑÐÑÐ %s"
+#~ msgid "STARTTLS command failed"
+#~ msgstr "ÐÐÑÑÐÐÐÐ STARTTLS ÐÐÐÐÐÐÐ"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
-#, c-format
-msgid "_Edit %s"
-msgstr "_ÐÑÐÐÐ %s"
+#~ msgid "HELO command failed"
+#~ msgstr "ÐÐÑÑÐÐÐÐ HELO ÐÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-name-selector-list.c:472
-#, c-format
-msgid "_Delete %s"
-msgstr "_ÐÐÐÐÐÐ %s"
+#~ msgid "AUTH command failed"
+#~ msgstr "ÐÐÑÑÐÐÐÐ AUTH ÐÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "ÐÑÑÑ ÐÑÐÐÐÑÐÐ ÐÐÑÐ ÑÐÐÑÑÐÐÑÐÐ: ÐÐÐÐ ÐÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÐ ÑÐÑÐÐÑÐ.\n"
 
-#: ../libedataserverui/e-passwords.c:1094
-msgid "You have the Caps Lock key on."
-msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÑÑÑÐÑÐ ÐÐÐÐÐÐ ÑÐÐÐÐ."
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "ÐÐÑÑÐÐÐÐ MAIL FROM ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:1216
-msgid "_Remember this passphrase"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "ÐÐÑÑÐÐÐÐ RCPT TO ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:1217
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "ÐÐÑÑÐÐÐÐ DATA ÐÐÐÐÐÐÐ: %s: ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../libedataserverui/e-passwords.c:1222
-msgid "_Remember this password"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ"
+#~ msgid "RSET command failed"
+#~ msgstr "ÐÐÑÑÐÐÐÐ RSET ÐÐÐÐÐÐÐ"
 
-#: ../libedataserverui/e-passwords.c:1223
-msgid "_Remember this password for the remainder of this session"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐ ÐÐÐ ÑÐÑÐÑÐ"
+#~ msgid "QUIT command failed"
+#~ msgstr "ÐÐÑÑÐÐÐÐ QUIT ÐÐÐÐÐÐÐ"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
-msgid "Select destination"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "ÐÑÐÐÐÐÑ(Ð) ÐÑÐÐÐÐÐ(ÑÑ) ÐÐÐÐ _ÐÐÑÐÐÐÑÐÑÐÐÐ:"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
-msgid "_Destination"
-msgstr "_ÐÐÑÐÐÐÑÑÐ"
+#~ msgid "categories"
+#~ msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
+#~ msgid "Color Info"
+#~ msgstr "ÐÐÐÐÑÐ Ð ÐÐÑÐÐÐ"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
+#~ msgid "The color to render"
+#~ msgstr "ÐÐÑÐ ÐÐ ÐÐÑÐÐÑ"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "ÐÐÐÑÐÐÐ"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>ÐÐ_ÐÑÐÐÑÐ</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "ÐÑÐÑÐÐÐÑ"
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "ÐÑÑÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
+#~ msgid "Enter password for %s"
+#~ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "ÐÑÑÐÑ"
+#~ msgid "Enter password"
+#~ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "ÐÑÑÐÑ ÐÐÑÐ ÐÐ ÑÑÐÑÑÑÐ"
+#~ msgid "Owner"
+#~ msgstr "ÐÐÐÑÐÐÐ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "ÐÐÑÐÐÐÐÐÑ"
+#~ msgid "Publishing Editor"
+#~ msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "ÐÐÑÐÐÐÐÐ"
+#~ msgid "Editor"
+#~ msgstr "ÐÑÐÑÐÐÐÑ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "ÐÐÑÑÐ"
+#~ msgid "Publishing Author"
+#~ msgstr "ÐÑÑÐÑ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "ÐÑÐÐÐÐÐÑÐÐÐ"
+#~ msgid "Author"
+#~ msgstr "ÐÑÑÐÑ"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "ÐÐÑÑÐ ÐÑÐÑÐÐ"
+#~ msgid "Non-editing Author"
+#~ msgstr "ÐÑÑÐÑ ÐÐÑÐ ÐÐ ÑÑÐÑÑÑÐ"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
+#~ msgid "Reviewer"
+#~ msgstr "ÐÐÑÐÐÐÐÐÑ"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "ÐÐÐÐÐÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
+#~ msgid "Contributor"
+#~ msgstr "ÐÐÑÐÐÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O ÐÑÐÑÐÐ"
+#~ msgid "None"
+#~ msgstr "ÐÐÑÑÐ"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
+#~ msgid "Custom"
+#~ msgstr "ÐÑÐÐÐÐÐÑÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐ"
+#~ msgid "Generic error"
+#~ msgstr "ÐÐÑÑÐ ÐÑÐÑÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "ÐÐÐÐÐÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
+#~ msgid "The folder is not empty"
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ"
+#~ msgid "The specified folder was not found"
+#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ Ñ ÑÐÑ ÑÐÐÐÑ"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐÐÐÐ"
+#~ msgid "Operation not supported"
+#~ msgstr "ÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "ÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÐ Ñ ÐÐÐÑ ÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐ %s"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "ÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ Ñ ÑÐÑ ÑÐÐÐÑ"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÑÐÐÐ ÐÐÐÐÐ"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "ÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "ÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÐÑÐ"
+#~ msgid "%s's Folders"
+#~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐ %s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ"
+#~ msgid "Personal Folders"
+#~ msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ÐÐÐÐÐÐÐ"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "ÐÐÐÐÑÐÐ"
+#~ msgid "All Public Folders"
+#~ msgstr "ÐÐÐ ÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "ÐÐÐÐÐÐÐ"
+#~ msgid "Global Address List"
+#~ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÐÑÐ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐÐÑÐ"
+#~ msgid "Deleted Items"
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ÐÐÐÑÐÐÑÐ"
+#~ msgid "Journal"
+#~ msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+#~ msgid "Notes"
+#~ msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ"
+#~ msgid "Outbox"
+#~ msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑÐ"
+#~ msgid "Sent Items"
+#~ msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "ÐÐÑ ÐÐÑÐÐÐÑÐÑ"
+#~ msgid "Tasks"
+#~ msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ Ð webcal ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ Ð webcal ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÐÐÑÑ ÑÑÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÐÐÑÑ ÑÑÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "ÐÐÑÐÐÑ ÐÐ ÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÑÐ; ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐ\n"
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÑÐ; ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ "
+#~ "ÐÑÐÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐ\n"
 
 #~ msgid "Fair"
 #~ msgstr "ÐÐÑÑÐ"
+
 #~ msgid "Snow showers"
 #~ msgstr "ÐÐÑÐÐÐ"
+
 #~ msgid "Snow"
 #~ msgstr "ÐÐÐÐ"
+
 #~ msgid "Partly cloudy"
 #~ msgstr "ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+
 #~ msgid "Smoke"
 #~ msgstr "ÐÐÐ"
+
 #~ msgid "Thunderstorms"
 #~ msgstr "ÐÑÐÑÐÐÐÐÐ"
+
 #~ msgid "Cloudy"
 #~ msgstr "ÐÐÐÐÑÐÐ"
+
 #~ msgid "Drizzle"
 #~ msgstr "ÐÐÐÐÐ ÐÐÑÐ"
+
 #~ msgid "Sunny"
 #~ msgstr "ÐÑÐÑÐÐÐ"
+
 #~ msgid "Dust"
 #~ msgstr "ÐÑÐÑÐÐÐ"
+
 #~ msgid "Clear"
 #~ msgstr "ÐÐÐÑÐ"
+
 #~ msgid "Mostly cloudy"
 #~ msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
+
 #~ msgid "Windy"
 #~ msgstr "ÐÐÑÑÐÐÐÑÐ"
+
 #~ msgid "Rain showers"
 #~ msgstr "ÐÐÐÐ ÐÐÑÐ"
+
 #~ msgid "Foggy"
 #~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
 #~ msgid "Rain/snow mixed"
 #~ msgstr "ÐÐÑÐ Ð ÑÐÐÐ"
+
 #~ msgid "Sleet"
 #~ msgstr "ÐÐÑÐ ÐÑÐÑÐÐÐ ÑÐÐÐÐÐ"
+
 #~ msgid "Very hot/humid"
 #~ msgstr "ÐÐÐÐÐ ÑÐÐÐÐ/ÐÐÐÐÐÐ"
+
 #~ msgid "Blizzard"
 #~ msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐ"
+
 #~ msgid "Freezing rain"
 #~ msgstr "ÐÐÐÐÐÐ ÐÐÑÐ"
+
 #~ msgid "Haze"
 #~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
 #~ msgid "Blowing snow"
 #~ msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐ"
+
 #~ msgid "Freezing drizzle"
 #~ msgstr "ÐÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐ"
+
 #~ msgid "Very cold/wind chill"
 #~ msgstr "ÐÐÐÐÐ ÑÐÐÐÐÐ/ÐÐÑÑÐÐÐÑÐ"
+
 #~ msgid "Rain"
 #~ msgstr "ÐÐÑÐ"
+
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "ÐÑÐÐÐ: ÐÐÑÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+
 #~ msgid "%.1fÂC - %s"
 #~ msgstr "%.1fÂC - %s"
+
 #~ msgid "%.1fÂF - %s"
 #~ msgstr "%.1fÂF - %s"
+
 #~ msgid "%.1f/%.1fÂC - %s"
 #~ msgstr "%.1f/%.1fÂC - %s"
+
 #~ msgid "%.1f/%.1fÂF - %s"
 #~ msgstr "%.1f/%.1fÂF - %s"
+
 #~ msgid "%d%% chance of precipitation\n"
 #~ msgstr "ÑÐÐÑÐ ÐÐ %d%% ÐÐ ÐÐÐÐÐÐÐÐ\n"
+
 #~ msgid "%.1fcm snow\n"
 #~ msgstr "%.1fcm ÑÐÐÐ\n"
+
 #~ msgid "%.1fin snow\n"
 #~ msgstr "%.1fin ÑÐÐÐ\n"
+
 #~ msgid "%.1f-%.1fcm snow\n"
 #~ msgstr "%.1f-%.1fcm ÑÐÐÐ\n"
+
 #~ msgid "%.1f-%.1fin snow\n"
 #~ msgstr "%.1f-%.1fin ÑÐÐÐ\n"
+
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ â%sâ: %s"
+
 #~ msgid "Performing query on unknown header: %s"
 #~ msgstr "ÐÐÐÑÑÐÐÐÑÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÑÑ: %s"
+
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "ÐÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐ, ÐÑÐÑÐÐ %d"
+
 #~ msgid "Cannot find certificate for `%s'"
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ â%sâ"
+
 #~ msgid "%sPlease enter the GroupWise password for %s %s"
 #~ msgstr "%sÐÐÐÑÐÑÐ Groupwise ÐÐÐÐÐÐÑ ÐÐ %s %s"
+
 #~ msgid "Unable to authenticate to GroupWise server. "
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ GroupWise ÑÐÑÐÐÑ."
+
 #~ msgid "Folder was destroyed and recreated on server."
 #~ msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÑÐÐÐ Ð ÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÑ ÐÐÐÑÐÐÑÐÐÐ."
+
 #~ msgid ""
 #~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
 #~ msgstr "ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ: ÐÑÑÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÑÐÐ %d Ð %d"
+
 #~ msgid "%sPlease enter the IMAP password for %s %s"
 #~ msgstr "%sÐÐÐÑÐÑÐ IMAP ÐÐÐÐÐÐÑ ÐÐ %s %s"
+
 #~ msgid "%sPlease enter the IMAP password for %s on host %s"
 #~ msgstr "%sÐÐÐÑÐÑÐ IMAP ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐÐ %s ÐÐ ÐÐÐÐÑÐÐÑ %s"
+
 #~ msgid "Could not save summary: %s: %s"
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÑÐÐÐÐÐÐ: %s: %s"
+
 #~ msgid "Please enter the NNTP password for %s %s"
 #~ msgstr "ÐÐÐÑÐÑÐ NNTP ÐÐÐÐÐÐÑ ÐÐ %s %s"
+
 #~ msgid "%sPlease enter the SMTP password for %s on host %s"
 #~ msgstr "%sÐÐÐÑÐÑÐ SMTP ÐÐÐÐÐÐÑ ÐÐ %s ÐÐ ÐÐÐÐÑÐÐÑ %s"
+
 #~ msgid "Category _Color"
 #~ msgstr "_ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
+
 #~ msgid "Select User"
 #~ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐ"
+
 #~ msgid "Addressbook..."
 #~ msgstr "ÐÐÑÐÑÐÑ..."
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÑ Ñ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ ÑÐÐÐÑÑÐ: %s"
+
 #~ 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 "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÑ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+
 #~ msgid "Cannot delete GroupWise folders in offline mode."
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+
 #~ msgid "Cannot rename GroupWise folders in offline mode."
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ GroupWise ÑÐÑÑÐÐÐÐ Ñ ÑÐÐÐÐÑ ÐÐÐ ÐÑÐÐÐ."
+
 #~ msgid "%sEnter password for %s"
 #~ msgstr "%sÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
+
 #~ msgid ""
 #~ "Could not authenticate to server. (Password incorrect?)\n"
 #~ "\n"
 #~ msgstr ""
 #~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑ. (ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ?)\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Could not authenticate to server.\n"
 #~ "\n"
@@ -5425,14 +5989,17 @@ msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐ
 #~ "ÐÐÐÐÐ (ÐÐÑ. âÐÐÐÐÐ\\ÐÐÑÐÑÐÐÐ\").\n"
 #~ "ÐÐÐ ÑÑÐ ÐÐÐÐÐ ÑÐÐÐ ÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÑ.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox ÐÐ %s ÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "ÐÐÑÐÐÑ '%s' ÐÐÑÐÑÑÐ Exchange 5.5 Ð ÑÑÐÐÐ\n"
 #~ "ÐÐÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐ ÑÐ Ximian Connector-ÐÐ"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +6008,37 @@ msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐ
 #~ "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ Exchange Web Storage System ÐÐ %s.\n"
 #~ "ÐÐÐÐÐÐÐ OWA ÑÐÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÑÐÑÐ, ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÑÑÐ Ñ\n"
 #~ "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐ."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "ÐÐÐÐ mailbox-Ð ÐÐ ÐÐÑÐÑÐÐÐÐ %s ÐÐ %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ"
+
 #~ msgid "Network error"
 #~ msgstr "ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ"
+
 #~ msgid "Folder Name"
 #~ msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ"
+
 #~ msgid "Folder Size"
 #~ msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise ÑÐÑÐÐÑ %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: ÐÑÐÐÐÐÐ"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: ÐÐÐÐ ÐÐÑÑÑÐÐÐÑ ÑÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
+
 #~ msgid "File As"
 #~ msgstr "ÐÐÐÐÐÐ ÐÐÐ"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +6047,153 @@ msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÑÐ
 #~ "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "ÐÐÑÐÑÐÑ Ð ÐÐÐÐÐÐÐÑ"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "ÐÐÐÐÑ ÐÐ ÐÐÑÑÑ:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÑ ÐÐÐÑ (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "ÐÐÐÑÐÐ ÐÐ ÐÐÐÑÑ"
+
 #~ msgid "Server rejected username"
 #~ msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "ÐÐÑÑÐÐÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÑ"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ/ÐÐÐÐÐÐÑ"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "ÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐ ÑÐ ÑÐÑÐÐÑÐ."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÑÑÐÐ ÐÐ %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ ÑÐ ÑÐÐÑÐÐÐ ÐÑÑÐÐ ÐÐ %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÐÑÐ Ð LDAP ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÑÐÐ"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "ÐÐÐÐÐÐ ÑÐ e_book_add_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "ÐÐÐÐÐÐ ÑÐ e_book_commit_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove ÐÐ ÐÐÐÐÐÐÑ ÐÑÐ e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "ÐÑÐÐÐ-ÑÐÐÐ ÐÑÐÐÑÑÐ 0 ÐÑÐÑÐÐÐÐÑÐ"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "ÑÐÐÑÐ-ÐÑÐÐÐ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ ÐÐÐ"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "ÐÐÐÐÑ-ÐÑÐÐÐ ÐÑÐÐÑÑÐ 2 ÐÑÐÑÐÐÐÑÐ"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "ÐÑÐÐÐ-ÐÐÑÐÑÐÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "ÐÑÐÐÐ-ÐÐÑÐÑÐÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "ÐÑÐÐÐ-ÐÑÐÑÐ-ÐÐÐÐ ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ 2 ÐÑÐÑÐÐÐÑÐ"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "ÐÐÑÐ-ÑÐ-Ñ-ÐÐÑÐÐÐÑ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 2 ÐÑÐÐ time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "ÐÐÐÐÐÑÐ-ÑÐ? ÐÐ ÐÑÐÐÑÑÐ ÐÑÐÑÐÐÐÑÐ"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "ÑÐ-ÐÐÑÐÐ? ÐÑÐÐÑÑÐ 0 ÐÑÐÑÐÐÐÐÑÐ"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "ÐÐÑÐÐ-ÐÑÐ? ÐÑÐÐÑÑÐ 1 ÐÑÐÑÐÐÐÑ"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "ÐÐÑÐÐ-ÐÑÐ? ÐÑÐÐÑÑÐ ÐÐ ÐÑÐÑÐÐÐÑ 1 ÐÑÐÐ time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÑÑ"
diff --git a/po/sr latin po b/po/sr latin po
index 7c5dbdc..dc1bc53 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,225 +1,188 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: Goran RakiÄ <grakic devbase net>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\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-06-21 10:31+0000\n"
+"PO-Revision-Date: 2011-06-17 22:35+0200\n"
+"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(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.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2326
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "UÄitavanje je u toku..."
+msgstr "UÄitavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2257
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2279
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2324
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "PretraÅivanje je u toku..."
+msgstr "PretraÅujem..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ"
+msgstr "Propitujem za aÅuriranim kontaktima..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/libebook/e-book.c:3476 ../calendar/libecal/e-cal.c:1069
+msgid "Personal"
+msgstr "LiÄno"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Prijatelji"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Porodica"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Saradnici"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ"
+msgstr "Propitujem za aÅuriranim grupama..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ"
+msgstr "Stvaram novi kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ"
+msgstr "BriÅem kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ"
+msgstr "Menjam kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ"
+msgstr "UÄitavam..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ"
+msgstr "PotvrÄujem identitet sa serverom..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Preuzimanje kontakata (%d)... "
+msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2853
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3034
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3081
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "OsveÅavanje preuzetih kontakata (%d)... "
+msgstr "OsveÅavam preuzete kontakte (%d)... "
+
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "Nisam povezan"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
-msgstr "KoriÅÄenje istaknutog imena (DN)"
+msgstr "Koristim istaknuto ime (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "KoriÅÄenje elektronske adrese"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
-msgstr "Ponovno povezivanje na LDAP server..."
+msgstr "Ponovo se povezujem na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+msgid "Invalid DN syntax"
+msgstr "Neispravna DN sintaksa"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
-msgstr "Dodavanje kontakta na LDAP server..."
+msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
-msgstr "Uklanjanje kontakta sa LDAP servera..."
+msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
-msgstr "Menjanje kontakta sa LDAP servera..."
+msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
-msgstr "Primanje rezultata pretrage sa LDAP servera..."
+msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "GreÅka tokom pretrage"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288
-#: ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496
-#: ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639
-#: ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730
-#: ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028
-#: ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211
-#: ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370
-#: ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575
-#: ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818
-#: ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055
-#: ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263
-#: ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "â%sâ u knjizi pre â%sâ"
-
-#: ../addressbook/libebook/e-book.c:301
-#: ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652
-#: ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043
-#: ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384
-#: ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831
-#: ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276
-#: ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "knjiga zauzeta"
-
-#: ../addressbook/libebook/e-book.c:332
-#: ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540
-#: ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679
-#: ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770
-#: ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070
-#: ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255
-#: ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411
-#: ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624
-#: ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878
-#: ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099
-#: ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302
-#: ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537
-#: ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715
-#: ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913
-#: ../addressbook/libebook/e-book.c:3463
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA izuzetak pri pozivu â%sâ"
-
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: nema trenutne operacije"
-
-#: ../addressbook/libebook/e-book.c:2555
-#: ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: nije bilo moguÄe otkazati"
-
-#: ../addressbook/libebook/e-book.c:2671
-#: ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "â%sâ na knjizi posle â%sâ"
-
-# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: otkazano"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: neispravan izvor."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4286
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Nepoznata greÅka"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: nema dostupne proizvodnje za adresu â%s'"
+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:3338
+#: ../addressbook/libebook/e-book.c:3159
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: nije moguÄe pravljenje EBookListener"
+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:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: nema sopstveni JIB kontakta smeÅten u gconf"
+#: ../addressbook/libebook/e-book.c:3459 ../calendar/libecal/e-cal.c:1049
+msgid "On This Computer"
+msgstr "Na ovom raÄunaru"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: nema izvora za jib â%sâ smeÅtenog u gconf."
+#: ../addressbook/libebook/e-book.c:3583
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Adresar ne postoji"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Jedinstveni IB"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Smesti pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Adresa knjige"
 
@@ -227,810 +190,1034 @@ msgstr "Adresa knjige"
 #. 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:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. elektronska adresa"
+msgstr "1Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. elektronska adresa"
+msgstr "2Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. elektronska adresa"
+msgstr "3Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. elektronska adresa"
+msgstr "4Â elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "PoÅiljalac"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Oznaka kuÄne adrese"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Oznaka adrese na poslu"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Oznaka druge adrese"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Telefon pomoÄnika"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. telefon na poslu"
+msgstr "2Â telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Telefon za pozivanje"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Telefon preduzeÄa"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "KuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. kuÄni telefon"
+msgstr "2Â kuÄni telefon"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "KuÄni faks"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "PejdÅer"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Organizaciona jedinica"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "PomoÄnik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "LiÄna stranica"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Adresa veb dnevnika"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Adresa za slobodno/zauzeto"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Adresa video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ime supruÅnika"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Napomena"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. kuÄno nadenuto ime za AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. nadenuto ime za AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. nadenuto ime za AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1Â kuÄni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2Â kuÄni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3Â kuÄni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1Â poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. kuÄno nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2Â poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. kuÄno nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3Â poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. kuÄno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1Â kuÄni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2Â kuÄni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3Â kuÄni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1Â poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. kuÄni Jabber nalog"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2Â poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. kuÄni Jabber nalog"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3Â poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. kuÄni Jabber nalog"
+msgid "Jabber Home ID 1"
+msgstr "1Â kuÄni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. poslovni Jabber nalog"
+msgid "Jabber Home ID 2"
+msgstr "2Â kuÄni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. poslovni Jabber nalog"
+msgid "Jabber Home ID 3"
+msgstr "3Â kuÄni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. poslovni Jabber nalog"
+msgid "Jabber Work ID 1"
+msgstr "1Â poslovni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. kuÄno nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2Â poslovni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. kuÄno nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3Â poslovni DÅaber IB"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. kuÄno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1Â kuÄni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2Â kuÄni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3Â kuÄni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1Â poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. kuÄno nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2Â poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. kuÄno nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3Â poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. kuÄno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1Â kuÄni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2Â kuÄni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3Â kuÄni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1Â poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. kuÄni ICQ nalog"
+msgid "MSN Work Screen Name 2"
+msgstr "2Â poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. kuÄni ICQ nalog"
+msgid "MSN Work Screen Name 3"
+msgstr "3Â poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. kuÄni ICQ nalog"
+msgid "ICQ Home ID 1"
+msgstr "1Â kuÄni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. poslovni ICQ nalog"
+msgid "ICQ Home ID 2"
+msgstr "2Â kuÄni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. poslovni ICQ nalog"
+msgid "ICQ Home ID 3"
+msgstr "3Â kuÄni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. poslovni ICQ nalog"
+msgid "ICQ Work ID 1"
+msgstr "1Â poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2Â poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3Â poslovni ICKu IB"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Poslednja revizija"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ime ili org."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Razne adrese"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "KuÄna adresa"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "Lista kategorija"
+msgstr "Spisak kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Slika"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "Lista elektronskih adresa"
+msgstr "Spisak e-adresa"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "Lista nadenutih imena za AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "Lista GroupWise ib-a"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Lista Jabber naloga"
+msgid "AIM Screen Name List"
+msgstr "Spisak AIM nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Lista nadenutih imena za Yahoo!"
+msgid "GroupWise ID List"
+msgstr "Spisak GroupVajz naloga"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "Lista nadenutih imena za MSN"
+msgid "Jabber ID List"
+msgstr "Spisak DÅaber naloga"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "Lista ICQ naloga"
+msgid "Yahoo! Screen Name List"
+msgstr "Spisak Jahu! nadimaka"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "Spisak MSN nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "Spisak ICKu naloga"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Åeli HTML poÅtu"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "Lista"
+msgstr "Spisak"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "Lista prikazanih adresa"
+msgstr "Spisak prikazanih adresa"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "RoÄendan"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "GodiÅnjica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 sertifikat"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu kuÄni Ib 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu kuÄni Ib 2"
+msgid "X.509 Certificate"
+msgstr "X.509 uverenje"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu kuÄni Ib 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1Â kuÄni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu poslovni Ib 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2Â kuÄni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu poslovni Ib 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3Â kuÄni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu poslovni Ib 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1Â poslovni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Ib lista"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2Â poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3Â poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. ime za Skype kod kuÄe"
+msgstr "1Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. ime za Skype kod kuÄe"
+msgstr "2Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. ime za Skype kod kuÄe"
+msgstr "3Â kuÄno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. ime za Skype na poslu"
+msgstr "1Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. ime za Skype na poslu"
+msgstr "2Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. ime za Skype na poslu"
+msgstr "3Â poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Lista nadenutih imena za Skype"
+msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "Lista bez imena"
-
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "RoÄendan"
+msgstr "Neimenovani spisak"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
-msgid "Birthday: %s"
-msgstr "RoÄendan: %s"
+msgid "Empty URI"
+msgstr "Prazna adresa"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
-msgid "Anniversary: %s"
-msgstr "GodiÅnjica: %s"
+msgid "Invalid source"
+msgstr "Neispravan izvor"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "Nije moguÄe Äuvanje podataka iz kalendara: loÅa adresa."
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "UspeÅno"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "Nije moguÄe saÄuvati podatke kalendara"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "Nije moguÄe da napraviti niz za pribavljanje delti"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "Nije moguÄe napraviti datoteku za ostavu"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "SkladiÅte nije na mreÅi"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "Nije moguÄe napraviti niz za popunjavanje ostave"
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4268 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
-msgid "Reply Requested: by "
-msgstr "Potreban odgovor: za "
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "Kontakt nije pronaÄen"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
-msgid "Reply Requested: When convenient"
-msgstr "Potreban odgovor: kada je zgodno"
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "IB kontakta veÄ postoji"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "UÄitavanje %s predmeta"
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "Neuspela autentifikacija"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "Potrebna je autentifikacija"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "Neispravna adresa servera"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "NepodrÅano polje"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "Neuspela autentifikacija"
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "NepodrÅan naÄin autentifikacije"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
-msgid "Redirected to Invalid URI"
-msgstr "Preusmereno na neispravnu adresu"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "TLS nije dostupan"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
-msgid "Bad file format."
-msgstr "LoÅ oblik datoteke."
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Knjiga je uklonjena"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
-msgid "Not a calendar."
-msgstr "Nije kalendar."
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "Nije dostupno u reÅimu van mreÅe"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
-msgid "Could not retrieve weather data"
-msgstr "Nije moguÄe dobijanje podataka o vremenu"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "PremaÅena veliÄina pretrage"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
-msgid "Weather: Fog"
-msgstr "Vreme: magla"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "Isteklo vreme za pretragu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblaÄno"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "Neispravan upit"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy Night"
-msgstr "Vreme: oblaÄna noÄ"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "Upit je odbijen"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Overcast"
-msgstr "Vreme: mestimiÄno oblaÄno"
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "Ne mogu da otkaÅem"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Showers"
-msgstr "Vreme: pljusak"
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "Neispravna verzija servera"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Snow"
-msgstr "Vreme: sneg"
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "Nema prostora"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Vreme: sunÄano"
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4252 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "Neispravan argument"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Clear Night"
-msgstr "Vreme: vedra noÄ"
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4291 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Nije podrÅan"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Thunderstorms"
-msgstr "Vreme: grmljavine"
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Druga greÅka"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
-msgid "Forecast"
-msgstr "Prognoza"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ne mogu da otvorim knjigu: %s"
 
-#: ../calendar/libecal/e-cal-component.c:1322
-msgid "Untitled appointment"
-msgstr "Neimenovani zakazani sastanak"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ne mogu da uklonim knjigu: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
-msgid "1st"
-msgstr "1."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ne mogu da dobijem kontakt: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "Prazan upit: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ne mogu da dobijem spisak kontakta: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ne mogu da potvrdim identitet korisnika: %s "
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ne mogu da dodam kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ne mogu da izmenim kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ne mogu da uklonim kontakte: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ne mogu da dobijem podrÅana polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ne mogu da dobijem obavezna polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ne mogu da dobijem podrÅane naÄine potvrÄivanja identiteta: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Neispravan upit: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ne mogu da dobijem izmene: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Nije uspela operacija otkazivanja: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "Server je nedostupan (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, 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:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+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:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendar ne podrÅava Slobodno / Zauzeto"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+msgid "Birthday"
+msgstr "RoÄendan"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#, c-format
+msgid "Birthday: %s"
+msgstr "RoÄendan: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#, c-format
+msgid "Anniversary: %s"
+msgstr "GodiÅnjica: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+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:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "Ne mogu da saÄuvam podatke kalendara"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
+msgid "Reply Requested: by "
+msgstr "Potreban je odgovor: za "
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
+msgid "Reply Requested: When convenient"
+msgstr "Potreban je odgovor: kada je zgodno"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "UÄitavam stavke zakazivanja"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "UÄitavam stavke zadatka"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "UÄitavam stavke beleÅke"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "UÄitavam stavke"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
+msgid "Invalid server URI"
+msgstr "Neispravna adresa servera"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ne mogu da napravim datoteku za ostavu"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Ne mogu da napravim niz za popunjavanje ostave"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
+msgid "Redirected to Invalid URI"
+msgstr "Preusmereno na neispravnu adresu"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:456
+msgid "Bad file format."
+msgstr "LoÅ oblik datoteke."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:463
+msgid "Not a calendar."
+msgstr "Nije kalendar."
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "Ne mogu da dobijem podatke o vremenu"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Fog"
+msgstr "Vreme: magla"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy Night"
+msgstr "Vreme: oblaÄna noÄ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "Vreme: oblaÄno"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Overcast"
+msgstr "Vreme: mestimiÄno oblaÄno"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Showers"
+msgstr "Vreme: pljusak"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+msgid "Weather: Snow"
+msgstr "Vreme: sneg"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Clear Night"
+msgstr "Vreme: vedra noÄ"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "Vreme: sunÄano"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+msgid "Weather: Thunderstorms"
+msgstr "Vreme: grmljavine"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+msgid "Forecast"
+msgstr "Prognoza"
+
+#: ../calendar/libecal/e-cal-component.c:1299
+msgid "Untitled appointment"
+msgstr "Neimenovani zakazani sastanak"
+
+#: ../calendar/libecal/e-cal-recur.c:3986
+msgid "1st"
+msgstr "1Â"
+
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
-msgstr "2."
+msgstr "2Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
-msgstr "3."
+msgstr "3Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
-msgstr "4."
+msgstr "4Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
-msgstr "5."
+msgstr "5Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
-msgstr "6."
+msgstr "6Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
-msgstr "7."
+msgstr "7Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
-msgstr "8."
+msgstr "8Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
-msgstr "9."
+msgstr "9Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
-msgstr "10."
+msgstr "10Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
-msgstr "11."
+msgstr "11Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
-msgstr "12."
+msgstr "12Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
-msgstr "13."
+msgstr "13Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
-msgstr "14."
+msgstr "14Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
-msgstr "15."
+msgstr "15Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
-msgstr "16."
+msgstr "16Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
-msgstr "17."
+msgstr "17Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
-msgstr "18."
+msgstr "18Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
-msgstr "19."
+msgstr "19Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
-msgstr "20."
+msgstr "20Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
-msgstr "21."
+msgstr "21Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
-msgstr "22."
+msgstr "22Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
-msgstr "23."
+msgstr "23Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
-msgstr "24."
+msgstr "24Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
-msgstr "25."
+msgstr "25Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
-msgstr "26."
+msgstr "26Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
-msgstr "27."
+msgstr "27Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
-msgstr "28."
+msgstr "28Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
-msgstr "29."
+msgstr "29Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
-msgstr "30."
+msgstr "30Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
-msgstr "31."
+msgstr "31Â"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Nisko"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Nedefinisano"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1294 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
@@ -1039,427 +1226,542 @@ msgstr "Unesite lozinku za %s (korisnik %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1308
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Unesite lozinku za %s kako bi mreÅni posrednik bio omoguÄen za %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Neispravan argument"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4254
 msgid "Backend is busy"
 msgstr "PodrÅka je zauzeta"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4256
 msgid "Repository is offline"
 msgstr "SkladiÅte nije na mreÅi"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4258
 msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4260 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objekat nije naÄen"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4262 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4264
 msgid "URI not loaded"
 msgstr "Adresa nije uÄitana"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4266
 msgid "URI already loaded"
 msgstr "Adresa je veÄ uÄitana"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4270 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4272 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ postoji"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4274
 msgid "Protocol not supported"
 msgstr "Protokol nije podrÅan"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4276
 msgid "Operation has been canceled"
 msgstr "Operacija je otkazana"
 
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4278
 msgid "Could not cancel operation"
-msgstr "Nije moguÄe otkazati operaciju"
+msgstr "Ne mogu da otkaÅem operaciju"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4280
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "PotvrÄivanje identiteta nije uspelo"
+
+#: ../calendar/libecal/e-cal.c:4282
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
-msgstr "Obavezna autentifikacija"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "DoÅlo je do CORBA izuzetka"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "Nepoznata greÅka"
+msgstr "Potrebno je potvrÄivanje identiteta"
+
+#: ../calendar/libecal/e-cal.c:4284
+msgid "A D-Bus exception has occurred"
+msgstr "DoÅlo je do D-bas izuzetka"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4288
 msgid "No error"
 msgstr "Nema greÅke"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â%sâ ne oÄekuje argumente"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â%sâ oÄekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, 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:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, 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:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â%sâ oÄekuje dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, 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:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, 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:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, 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:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, 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:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "â%sâ oÄekuje da prvi argument bude âanyâ, âsummaryâ, âdescriptionâ, âlocationâ, âattendeeâ, âorganizerâ, ili âclassificationâ"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"â%sâ oÄekuje da prvi argument bude âanyâ, âsummaryâ, âdescriptionâ, "
+"âlocationâ, âattendeeâ, âorganizerâ, ili âclassificationâ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â%sâ oÄekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "â%sâ oÄekuje da svi argumenti budu niske ili jedan i samo jedan argument da bude logiÄki netaÄan (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+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-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "NepodrÅano polje"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "NepodrÅan metod"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "NempodrÅan metod autentifikacije"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "Kalendar ne postoji"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS nije dostupan"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "Nepoznat korisnik"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Rad van mreÅe nije dostupan"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ne mogu da preuzmem adresu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "PremaÅena veliÄina pretrage"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ne mogu da preuzmem adresu e-poÅte alarma kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Isteklo vreme za pretragu"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ne mogu da preuzmem LDAP osobinu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Neispravan upit"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ne mogu da preuzmem informacije zakazivanja kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Upit odbijen"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "Ne mogu da otvorim kalendar: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Neispravna verzija servera"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "Ne mogu da osveÅim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "Ne mogu da uklonim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "Ne mogu da napravim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "Ne mogu da izmenim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "Ne mogu da uklonim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ne mogu da primim objekte kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ne mogu da odbacim alarm kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "Ne mogu da poÅaljem objekte kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ne mogu da preuzmem osnovnu putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ne mogu da preuzmem putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ne mogu da preuzmem spisak objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ne mogu da preuzmem spisak priloga: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "Ne mogu da dovrÅim upit kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ne mogu da preuzmem vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "Ne mogu da dodam vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ne mogu da podesim osnovnu vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ne mogu da preuzmem izmene kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
+msgid "Invalid URI"
+msgstr "Neispravna adresa"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, 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:443
+#, 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"
 msgstr "Upotrebljeni algoritam ne podrÅava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Potpisivanje poruke"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava proveru"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Proveravanje poruke"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava Åifrovanje"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Åifrovanje poruke"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅava deÅifrovanje"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "DeÅifrovanje poruke"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "MoÅda neÄete moÄi da uvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "MoÅda neÄete moÄi da izvezete kljuÄeve sa ovim algoritmom"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Potpisivanje poruke"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Åifrovanje poruke"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "DeÅifrovanje poruke"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
-msgstr "Nije moguÄe napraviti putanju za privremeno Äuvanje"
+msgstr "Ne mogu da napraviti putanju za privremeno Äuvanje"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nije moguÄe ukloniti unos iz ostave: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "Nema dostupnog toka"
+
+#: ../camel/camel-db.c:471
+#, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Nije moguÄe upisati unos u log: %s\n"
+"Ne mogu da zapiÅem unos dnevnika: %s\n"
 "Dalje operacije na ovom serveru neÄe biti izvrÅene kada\n"
 "se budete ponovo povezali na mreÅu."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Nije moguÄe otvoriti â%sâ:\n"
+"Ne mogu da otvorim â%sâ:\n"
 "%s\n"
 "Promene na ovoj fascikli neÄe biti usklaÄene."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
-msgstr "Ponovno usklaÄivanje sa serverom"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "UmnoÅi sadrÅaj fascikle lokalno za rad van mreÅe"
+msgstr "VrÅim ponovno usklaÄivanje sa serverom"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
-msgstr "Preuzimanje novih poruka u za rad van mreÅe"
+msgstr "Preuzimam nove poruke za rad van mreÅe"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Pripremanje fascikle â%sâ za rad van mreÅe"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "Pripremam fasciklu â%sâ za rad van mreÅe"
+
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+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:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, 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"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Nema dostupnog opisa"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Neuspelo pravljenje sadrÅanog procesa â%sâ: %s"
+msgstr "Nisam uspeo da napravim sadrÅani proces â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Neispravan niz poruka primljen od %s: %s"
+msgstr "Neispravan niz poruka primljen od â%sâ: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
-msgstr "UsklaÄivanje fascikli"
+msgstr "UsklaÄujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "GreÅka pri Äitanju filtera: %s: %s"
+msgstr "GreÅka prilikom Äitanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "GreÅka u primeni filtera: %s: %s"
+msgstr "GreÅka prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Nije moguÄe otvaranje fascikle pripreme"
+msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Nije moguÄa obrada fascikle pripreme"
+msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Primanje poruke %d (%d%%)"
-
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "Nije moguÄe otvoriti poruku"
+msgstr "Primam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "GreÅka kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1283
-#: ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
-msgstr "UsklaÄivanje fascikle"
+msgstr "UsklaÄujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "ZavrÅeno"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Primanje poruke %d od %d"
+msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1416
 #, 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:135
 msgid "Failed to retrieve message"
-msgstr "Neuspelo dovlaÄenje poruke"
+msgstr "Nisam uspeo da dovuÄem poruku"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1769,426 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "Neipsravni argumenti za (korisniÄka-oznaka)"
+msgstr "Neispravni argumenti za (korisniÄka-oznaka)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "GreÅka u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Nije moguÄe Äitanje izraza za pretragu: %s:\n"
+"Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"GreÅka pri izvrÅavanju izraza za pretragu: %s:\n"
+"GreÅka prilikom izvrÅavanja izraza pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) zahteva samo jedan logiÄki rezultat"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nije dozvoljeno unutar %s"
 
-#: ../camel/camel-folder-search.c:912
-#: ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) zahteva nisku sa tipom poklapanja"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) oÄekuje niz kao rezultat"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "NepodrÅana operacija: prikljuÄenje poruke: za %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "NepodrÅana operacija: pretraga po izrazu: za %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "UÄim novu spam poruku u â%sâ"
+msgstr[1] "UÄim nove spam poruke u â%sâ"
+msgstr[2] "UÄim nove spam poruke u â%sâ"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "NepodrÅana operacija: prebrojavanje po izrazu: za %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "UÄim novu ham poruku u %s"
+msgstr[1] "UÄim nove ham poruke u %s"
+msgstr[2] "UÄim nove ham poruke u %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "NepodrÅana operacija: pretraga po JIB: za %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtriram novu poruku u â%sâ"
+msgstr[1] "Filtriram nove poruke u â%sâ"
+msgstr[2] "Filtriram nove poruke u â%sâ"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:318
 msgid "Moving messages"
-msgstr "PremeÅtanje poruka"
+msgstr "PremeÅtam poruke"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
-msgstr "UmnoÅavanje poruka"
+msgstr "UmnoÅavam poruke"
 
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "UÄenje Åta je Äubre"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "DovlaÄim poruku â%sâ"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "UÄenje Åta nije Äubre"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Nisam uspeo da izvrÅim gpg: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "Filtriranje poruke(a)"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Javio se neoÄekivan status GnuPG poruke:\n"
+"DoÅlo je do neoÄekivane poruke GnuPG stanja:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Neuspelo Äitanje gpg userid podsetnika."
+msgstr "Nisam uspeo da analiziram podsetnik gpg ib korisnika."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Neuspelo Äitanje zahteva za gpg lozinkom."
+msgstr "Nisam uspeo da analiziram zahtev za gpg lozinkom."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"Potreban Vam je PIN za otkljuÄavanje kljuÄa za\n"
-"SmartCard: â%sâ"
+"Potreban vam je PIN da otkljuÄate kljuÄ\n"
+"Pametne kartice: â%sâ"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Potrebna Vam je lozinka za otkljuÄavanje kljuÄa\n"
+"Potrebna vam je lozinka da otkljuÄate kljuÄ\n"
 "korisnika: â%sâ"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "NeoÄekivan zahtev od GnuPG-a za â%sâ"
+msgstr "NeoÄekivan zahtev GnuPG-a za â%sâ"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "Odustato."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Neuspelo otkljuÄavanje tajnog kljuÄa: unete su 3 pogreÅne lozinke."
+msgstr "Nisam uspeo da otkljuÄam tajni kljuÄ: unete su 3 pogreÅne lozinke."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "NeoÄekivan odgovor od GnuPG-a: %s"
-
-#: ../camel/camel-gpg-context.c:947
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Neuspelo Åifrovanje: nisu oznaÄeni ispravni primaoci."
+msgstr "NeoÄekivan odgovor GnuPG-a: %s"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209
-#: ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1850
-#: ../camel/camel-gpg-context.c:1895
+#: ../camel/camel-gpg-context.c:989
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Neuspelo izvrÅavanje gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nisam uspeo da Åifrujem: nisu oznaÄeni ispravni primaoci."
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Nije moguÄe napraviti podatke za potpisivanje: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+msgid "Could not generate signing data: "
+msgstr "Ne mogu da napravim podatke za potpisivanje:"
 
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
-msgstr "Neuspelo izvrÅavanje gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "Ovo je deo poruke sa digitalnim potpisom"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Nije moguÄa provera potpisa poruke: neispravan oblik poruke"
+msgstr "Nisam uspeo da izvrÅim gpg."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Nije moguÄa provera potpisa poruke: nije moguÄe napraviti privremenu datoteku: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Nije moguÄe napraviti podatke za Åifrovanje: %s"
+#: ../camel/camel-gpg-context.c:1737
+msgid "Cannot verify message signature: "
+msgstr "Ne mogu da proverim potpis poruke:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1858
+msgid "Could not generate encrypting data: "
+msgstr "Ne mogu da napravim podatke za Åifrovanje:"
+
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno Åifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:1726
-#: ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Nije moguÄe deÅifrovati poruku: neispravan oblik poruke"
+msgstr "Ne mogu da deÅifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Nije moguÄe deÅifrovati MIME deo: greÅka u protokolu"
+msgstr "Nisam uspeo da deÅifrujem MIME deo: greÅka u protokolu"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "Åifrovan sadrÅaj"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "Nije moguÄe proÄitati sadrÅaj poruke"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Nije moguÄe napraviti vezu ka pomoÄniku zakljuÄavanja: %s"
+msgstr "Ne mogu da napravim vezu ka pomoÄniku zakljuÄavanja: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Nije moguÄe podeliti pomoÄnika zakljuÄavanja: %s"
+msgstr "Ne mogu da podelim pomoÄnika zakljuÄavanja: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nije moguÄe zakljuÄati â%sâ: greÅka u protokolu sa pomoÄnikom zakljuÄavanja"
+msgstr "Ne mogu da zakljuÄam â%sâ: greÅka u protokolu sa pomoÄnikom zakljuÄavanja"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Nije moguÄe zakljuÄati â%sâ"
+msgstr "Ne mogu da zakljuÄam â%sâ"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Nije moguÄe napraviti zakljuÄanu datoteku za %s: %s"
+msgstr "Ne mogu da napravim zakljuÄanu datoteku za â%sâ: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Isteklo vreme pri pokuÅaju pribavljanja zakljuÄane datoteke na %s. PokuÅajte kasnije."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Isteklo je vreme prilikom pokuÅaja da pribavim zakljuÄanu datoteku na â%sâ. "
+"PokuÅajte kasnije."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Neuspelo zakljuÄavanje koriÅÄenjem fcntl(2): %s"
+msgstr "Nisam uspeo da zakljuÄam koristeÄi âfcntl(2)â: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Neuspelo zakljuÄavanje koriÅÄenjem flock(2): %s"
+msgstr "Nisam uspeo da zakljuÄam koristeÄi âflock(2)â: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Nije moguÄa provera datoteke poÅte %s: %s"
+msgstr "Ne mogu da proverim datoteku poÅte â%sâ: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nije moguÄe otvoriti datoteku poÅte %s: %s"
+msgstr "Ne mogu da otvorim datoteku poÅte â%sâ: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Nije moguÄe otvoriti privremenu datoteku poÅte %s: %s"
+msgstr "Ne mogu da otvorim privremenu datoteku poÅte â%sâ: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Neuspelo smeÅtanje poÅte u privremenu datoteku %s: %s"
+msgstr "Nisam uspeo da smestim poÅtu u privremenu datoteku â%sâ: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Nije moguÄe napraviti vezu: %s"
+msgstr "Ne mogu da napravim vezu: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Nije moguÄe podeliti: %s"
+msgstr "Ne mogu da podelim: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeÅtanje poÅte je otkazao: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Nepoznata greÅka)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "GreÅka pri Äitanju datoteke poÅte: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "GreÅka pri pisanju privremene datoteke poÅte: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "GreÅka pri umnoÅavanju privremene datoteke: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "greÅka Äitanja"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+msgid "No content available"
+msgstr "Nema dostupnog sadrÅaja"
 
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Odustato"
+#: ../camel/camel-multipart-signed.c:335
+#, c-format
+msgid "No signature available"
+msgstr "Nema dostupnog potpisa"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "nije moguÄe pravljenje niza"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "greÅka Äitanja"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
-msgstr "NalaÅenje: %s"
+msgstr "Nalazim: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
-msgstr "Neuspelo traÅenje domaÄina"
+msgstr "Nije uspelo traÅenje domaÄina"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Neuspelo traÅenje domaÄina: %s: %s"
+msgstr "Nije uspelo traÅenje domaÄina: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
-msgstr "NalaÅenje adrese"
+msgstr "Nalazim adresu"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
-msgstr "TraÅenje imena neuspelo"
+msgstr "Nije uspelo traÅenje imena"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "TraÅenje imena neuspelo: %s"
+msgstr "Nije uspelo traÅenje imena: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "UsklaÄivanje poruka u fascikli â%sâ sa diskom"
+msgstr "UsklaÄujem poruke iz fascikle â%sâ na disk"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Nije moguÄ unos u dnevnik za fasciklu â%sâ: %s"
+msgstr "Ne mogu da zapiÅem van mreÅni unos u dnevnik za fasciklu â%sâ: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "PonuÄaÄ elektronske poÅte sa virtuelnom fasciklom"
+msgstr "DostavljaÄ virtuelne fascikle e-poÅte"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za Äitanje poÅte kao upita drugog skupa fascikli"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Nije moguÄe uÄitati %s: ovaj sistem ne podrÅava uÄitavanje modula."
+msgstr "Ne mogu da uÄitam â%sâ: ovaj sistem ne podrÅava uÄitavanje modula."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Nije moguÄe uÄitati %s: %s"
+msgstr "Ne mogu da uÄitam â%sâ: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Nije moguÄe uÄitati %s: nema koda za pokretanje u modulu."
+msgstr "Ne mogu da uÄitam â%sâ: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Nema dostupnog ponuÄaÄa za protokol â%sâ"
+msgstr "Nema dostupnog dostavljaÄa za protokol â%sâ"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ova opcija Äe povezati na server koriÅÄenjem anonimne prijave."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
-msgstr "Neuspela autentifikacija."
+msgstr "PotvrÄivanje identiteta nije uspelo."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neispravan podatak o poreklu elektronske adrese:\n"
+"Neispravan podatak o poreklu adrese e-poÅte:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2197,7 @@ msgstr ""
 "Neispravan podatak o sloÅenom poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2206,533 @@ msgstr ""
 "Neispravan podatak o poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Ova opcija Äe povezati na server koriÅÄenjem sigurnosne CRAM-MD5 lozinke, ako je server podrÅava."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Ova opcija Äe povezati na server koriÅÄenjem sigurnosne CRAM-MD5 lozinke, ako "
+"je server podrÅava."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Ova opcija Äe povezati na server koriÅÄenjem sigurnosne DIGEST-MD5 lozinke, ako je server podrÅava."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Ova opcija Äe povezati na server koriÅÄenjem sigurnosne DIGEST-MD5 lozinke, "
+"ako je server podrÅava."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "Upit na server suviÅe dug (>2048 okteta)"
+msgstr "Upit servera je suviÅe dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "Upit na server neispravan\n"
+msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Upit na server je sadrÅao neispravan âKvalitet zaÅtiteâ unos"
+msgstr "Upit servera je sadrÅao neispravan unos âKvalitet zaÅtiteâ"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Odgovor servera nije sadrÅao podatke o autorizaciji"
+msgstr "Odgovor servera nije sadrÅao podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Odgovor servera je sadrÅao nekompletne podatke o autorizaciji"
+msgstr "Odgovor servera je sadrÅao nekompletne podatke o ovlaÅÄenju"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaÅe"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 5 prijave."
+msgstr ""
+"Ova opcija Äe povezati na server koriÅÄenjem Kerberos 5 potvrÄivanja "
+"identiteta."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Izabrani mehanizam ponuÄeni metod ne podrÅava, ili ga primenjen metod nije prepoznao."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Izabrani mehanizam ponuÄeni metod ne podrÅava, ili ga primenjen metod nije "
+"prepoznao."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
-msgstr "PonuÄeni parametar target_name nije pravilno oblikovan."
+msgstr "PonuÄeni parametar ciljnog imena (target_name) nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "PonuÄeni parametar target_name je sadrÅao neispravan ili nepodrÅan tip imena."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"PonuÄeni parametar ciljnog imena (target_name) je sadrÅao neispravan ili "
+"nepodrÅan tip imena."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token sadrÅi razliÄita vezivanja za kanale od onih odreÄenih preko parametra input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+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:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token sadrÅi neispravnu strukturu, ili potpis nije mogao biti proveren."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Upit unosa (input_token) sadrÅi neispravnu strukturu, ili potpis nije mogao "
+"biti proveren."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "PruÅena uveravanja nisu bila ispravna za otpoÄinjanje procesa, ili je nosaÄ uverenja doÅao bez njih."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"PruÅena uveravanja nisu bila ispravna za otpoÄinjanje procesa, ili je nosaÄ "
+"uverenja doÅao bez njih."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 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:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Neuspele provere celovitosti na input_token."
+msgstr "Nisu uspele provere celovitosti na upitu unosa (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "Neuspele provere celovitosti na uverenjima."
+msgstr "Nisu uspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "VaÅenje traÅenih uverenja je isteklo."
 
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "LoÅ odgovor na autentifikaciju od servera."
+msgstr "LoÅ odgovor potvrÄivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "NepodrÅan sigurnosni sloj."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 4 prijave."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Nije moguÄe dobiti Kerberos kartu:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 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:135
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Nepoznato stanje autentifikacije."
+msgstr "Nepoznato stanje potvrÄivanja identiteta."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Ova opcija Äe povezati na Windows server koriÅÄenjem NTLM / Sigurnosne provere lozinke."
+#: ../camel/camel-sasl-ntlm.c:39
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ova opcija Äe povezati na Vindouz server koriÅÄenjem NTML / Sigurnosne "
+"provere lozinke."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "OBIÄNO"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP pre SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ova opcija Äe odobriti POP vezu a zatim pokuÅati SMTP"
+msgstr "Ova opcija Äe odobriti POP vezu pre pokuÅaja SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP izvorna adresa"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP pre SMTP auth koriÅÄenjem nepoznatog transporta"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "POP pre SMTP provere koriÅÄenjem nepoznatog transporta"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP pre SMTP auth koriÅÄenjem izvora koji nije pop"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "POP pre SMTP provere koriÅÄenjem ne-POP izvora"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Neuspelo prevoÄenje regularnog izraza: %s: %s"
+msgstr "Nije uspelo prevoÄenje regularnog izraza: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:87
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "Adresa â%sâ traÅi deo sa korisniÄkim imenom"
+msgstr "Adresa â%sâ traÅi deo sa korisniÄkim imenom"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:91
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "Adresa â%sâ traÅi deo sa imenom domaÄina"
+msgstr "Adresa â%sâ traÅi deo sa imenom domaÄina"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:95
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "Adresa â%sâ traÅi deo sa putanjom"
+msgstr "Adresa â%sâ traÅi deo sa putanjom"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Nije moguÄe napraviti direktorijum %s:\n"
+"Ne mogu da napravim direktorijum â%sâ:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Unesite %s lozinku za %s na domaÄinu %s."
+msgstr "Unesite â%sâ lozinku za â%sâ na domaÄinu â%sâ."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel sesija ne podrÅava prosleÄivanje poruke."
-
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Nije moguÄe nalaÅenje sertifikata za â%sâ"
+msgstr "Ne mogu da naÄem uverenje za â%sâ"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
-msgstr "Nije moguÄe napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
-msgstr "Nije moguÄe potpisivanje CMS podataka"
+msgstr "Ne mogu da napravim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
-msgstr "Nije moguÄe priloÅiti potpisane CMS podatke"
+msgstr "Ne mogu da priloÅim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
-msgstr "Nije moguÄe priloÅiti CMS podatke"
+msgstr "Ne mogu da priloÅim CMS podatke"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
-msgstr "Nije moguÄe pravljenje podataka o CMS potpisniku"
+msgstr "Ne mogu da napravim podatak CMS potpisnika"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
-msgstr "Nije moguÄe nalaÅenje lanca sertifikata"
+msgstr "Ne mogu da naÄem lanac uverenja"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
-msgstr "Nije moguÄe dodavanje vremena CMS potpisa"
+msgstr "Ne mogu da dodam vreme CMS potpisa"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "Sertifikat za Åifrovanje â%sâ ne postoji"
+msgstr "Uverenje Åifrovanja â%sâ ne postoji"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguÄe dodavanje atributa SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut SMIME postavki kljuÄa Åifrovanja"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguÄe dodavanje atributa MS SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut MS SMIME postavki kljuÄa Åifrovanja"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
-msgstr "Nije moguÄe dodavanje sertifikata za Åifrovanje"
+msgstr "Ne mogu da dodam uverenje Åifrovanja"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
-msgstr "Nije moguÄe dodavanje podatka o CMS potpisniku"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Nije moguÄe napraviti kontekst za Åifrovanje."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "Neuspelo dodavanje podataka u CMS enkoder"
-
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Neuspelo kodiranje podataka"
+msgstr "Ne mogu da dodam podatak CMS potpisnika"
 
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
-msgstr "Neprovereno"
+msgstr "Neproveren"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "LoÅ potpis"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "SadrÅaj je izmenjen ili oÅteÄen pri prenosu"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
-msgstr "Sertifikat potpisa nije naÄen"
+msgstr "Uverenje potpisa nije naÄeno"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
-msgstr "Sertifikat potpisa nije poverljiv"
+msgstr "Uverenje potpisa nije poverljivo"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Algoritam potpisa je nepoznat"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
-msgstr "Algoritam potpisa je nepodrÅan"
+msgstr "Algoritam potpisa nije podrÅan"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Neispravan potpis"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "GreÅka pri obradi"
 
 # hm, hm...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "Nema potpisanog podatka u potpisu"
+msgstr "Nema naznaÄenog podatka u potpisu"
 
 # hm, moÅe to i bolje od âokruÅenihâ...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Nedostaju zbirke iz okruÅenih podataka"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "Nije moguÄe izraÄunati zbirke"
+msgstr "Ne mogu da izraÄunam zbirke"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "Nije moguÄe postaviti zbirke poruka"
+msgstr "Ne mogu da postavim zbirke poruka"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "Neuspeo uvoz sertifikata"
+msgstr "Nije uspeo uvoz uverenja"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Poruka ima samo sertifikat, nije moguÄa provera sertifikata"
+msgstr "Uverenje je jedina poruka, ne mogu da proverim uverenje"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Poruka ima samo sertifikat, sertifikati uvezeni i provereni"
+msgstr "Uverenje je jedina poruka, uverenja su uveÅena i proverena"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "Nije moguÄe naÄi zbirke potpisa"
+msgstr "Ne mogu da naÄem zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "Ne mogu da napravim kontekst Åifrovanja."
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "Nisam uspeo da dodam podatak u CMS Åifrer"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "Nisam uspeo da Åifrujem podatke"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
-msgstr "Neuspelo dekodiranje"
+msgstr "Nisam uspeo da deÅifrujem"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Nije moguÄe naÄi opÅti algoritam za Åifrovanje gomile"
+msgstr "Ne mogu da naÄem opÅti algoritam za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Nije moguÄe dodeliti mesto kljuÄu za Åifrovanje gomile"
+msgstr "Ne mogu da dodelim mesto kljuÄu za Åifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
-msgstr "Nije moguÄe napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
-msgstr "Nije moguÄe pravljenje CMS Enveloped data"
+msgstr "Ne mogu da napravim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Nije moguÄe prilaganje CMS Enveloped data"
+msgstr "Ne mogu da priloÅim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
-msgstr "Nije moguÄe prilaganje objekta sa CMS podacima"
+msgstr "Ne mogu da priloÅim objekat CMS podataka"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
-msgstr "Nije moguÄe pravljenje CMS podatka o primaocu"
+msgstr "Ne mogu da napravim podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
-msgstr "Nije moguÄe dodati podatak o CMS primaocu"
+msgstr "Ne mogu da dodam podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
-msgstr "Neuspelo dodavanje podataka u enkoder"
+msgstr "Nisam uspeo da dodam podatke u Åifrer"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅifrovanje: nisu naÄeni Åifrovani podaci"
 
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "uvoz kljuÄeva: neizvedeno"
-
-#: ../camel/camel-smime-context.c:1207
-msgid "export keys: unimplemented"
-msgstr "izvoz kljuÄeva: neizvedeno"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Nije moguÄe dobiti fasciklu: neispravna operacija"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2177
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: fascikla postoji"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Nije moguÄe napraviti fasciklu: neispravna operacija"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Nije moguÄe napraviti fasciklu: %s: fascikla postoji"
-
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Nije moguÄe obrisati fasciklu: %s: neispravna operacija"
-
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nije moguÄe preimenovati fasciklu: %s: neispravna operacija"
+msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2368 ../camel/camel-store.c:2378
+#: ../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:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Äubre"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Nije moguÄe dobijanje sertifikata izdavaÄa"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Nije moguÄe dobiti listu povuÄenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Nije moguÄe deÅifrovanje potpisa sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Nije moguÄe deÅifrovanje potpisa za listu povuÄenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Nije moguÄe deÅifrovati javni kljuÄ izdavaÄa"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Neuspeo potpis sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Neuspeo potpis za listu povuÄenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Sertifikat joÅ nije vaÅeÄi"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Sertifikat je istekao"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL joÅ nije vaÅeÄi"
+#: ../camel/camel-store.c:2825
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Ne mogu da da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL je istekao"
+#: ../camel/camel-store.c:2952 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Ne mogu da obriÅem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "GreÅka u CRL"
+#: ../camel/camel-store.c:3093 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:700
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Nema viÅe memorije"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "DomaÄin posrednik ne podrÅava SOCKS4"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Samopotpisani sertifikat je nulte veliÄine"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, 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-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Samopotpisani sertifikat u lancu"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "DomaÄin posrednik ne podrÅava SOCKS5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Nije moguÄe lokalno dobiti izdavaÄev sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, 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-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Nije moguÄe dobiti potpis lista"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Neuspeh opÅteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Lanac sertifikata je predugaÄak"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "PovuÄen sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "MreÅa je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neispravan izdavaÄ sertifikata (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "DomaÄin je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "PremaÅena duÅina putanje"
+#: ../camel/camel-tcp-stream-raw.c:895
+msgid "Connection refused"
+msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Neispravna svrha"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "Vreme Åivota je isteklo"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Nepoverljiv sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS server ne podrÅava naredbu"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Odbijen sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS server ne podrÅava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Naslov/izdavaÄ neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "Unknown error from SOCKS server"
+msgstr "Nepoznata greÅka sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/izdavaÄ serijsko neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Upotreba kljuÄa ne podrÅava potpis sertifikatom"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ime domaÄina je predugo (najviÅe 255 znakova)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "GreÅka pri proveri programa"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2745,16 @@ msgstr ""
 "Otisak:       %s\n"
 "Potpis:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "LOÅE"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"LoÅ sertifikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Åelite li ipak da prihvatite?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,413 +2763,363 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Provera SSL sertifikata za %s:\n"
+"Provera SSL uverenja za â%sâ:\n"
 "\n"
 "%s\n"
 "\n"
 "Åelite li da prihvatite?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"Problem sa sertifikatom: %s\n"
+"Problem sa uverenjem: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"LoÅ domen sertifikata: %s\n"
+"LoÅ domen uverenja: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekao sertifikat: %s\n"
+"Isteklo uverenje: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekla lista povuÄenih sertifikata: %s\n"
+"Istekao je spisak povuÄenih uverenja: %s\n"
 "IzdavaÄ: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "Nije moguÄe proÄitati adresu â%sâ"
+msgstr "Ne mogu da analiziram adresu â%sâ"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1263 ../camel/camel-vee-folder.c:1426
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "GreÅka pri smeÅtanju â%sâ: %s"
+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:660
+#: ../camel/camel-vee-folder.c:1299
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Nema takve poruke %s u %s"
+msgstr "Nema takve poruke â%sâ u â%sâ"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Nije moguÄe umnoÅiti ili premestiti poruke u virtuelnu fasciklu"
+#: ../camel/camel-vee-folder.c:1367
+#, c-format
+msgid "Error storing '%s': "
+msgstr "GreÅka pri smeÅtanju â%sâ:"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "Nepoklopljeno"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "Nije moguÄe obrisati fasciklu: %s: nema takve fascikle"
+msgstr "Ne mogu da obriÅem fasciklu: %s: nema takve fascikle"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Nije moguÄe promeniti ime fascikli: %s: nema takve fascikle"
+msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Nije moguÄe umnoÅiti poruke u fasciklu za smeÄe"
+msgstr "Ne mogu da umnoÅim poruke u fasciklu za smeÄe"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Nije moguÄe umnoÅiti poruke u fasciklu za Äubre"
+msgstr "Ne mogu da umnoÅim poruke u fasciklu za Äubre"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nije moguÄe dobiti poruku: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "Nema takve poruke"
+msgid "Could not load summary for %s"
+msgstr "Ne mogu da uÄitam pregled za â%sâ"
 
-# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Korisnik odustao"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nije moguÄe dobiti poruku %s: %s"
+msgid "Checking for deleted messages %s"
+msgstr "VrÅim proveru za izbrisanim porukama â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "Ova poruka nije dostupna u reÅimu van mreÅe."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "Prikupljam pregled podataka novih poruka u â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
 msgid "Could not get message"
-msgstr "Nije moguÄe dobijanje poruke"
+msgstr "Ne mogu da dobavim poruku"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "Nije moguÄe uÄitavanje pregleda za %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "Ne mogu da dodam poruku u fasciklu â%sâ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "Fascikla za smeÄe je puna. Ispraznite je."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "Ne mogu da napravim poruku: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Prikupljanje pregleda podataka za nove poruke u %s"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ne mogu da dobavim poruku: %s\n"
+"  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Nema takve poruke"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:462
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: %s"
+msgid "Cannot get message %s: "
+msgstr "Ne mogu da nabavim poruku â%sâ: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "Nije moguÄe pravljenje poruke: %s"
+msgid "This message is not available in offline mode."
+msgstr "Ova poruka nije dostupna u reÅimu van mreÅe."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "Nije moguÄe dobiti sadrÅaj fascikle %s"
+msgstr "Ne mogu da nabavim sadrÅaj fascikle â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Nije moguÄe dodati poruku u reÅimu van mreÅe: nedostupna ostava"
+msgstr "Ne mogu da priloÅim poruku u reÅimu van mreÅe: nedostupna ostava"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Nije moguÄe dodavati poruku u reÅimu van mreÅe: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+msgid "Cannot append message in offline mode: "
+msgstr "Ne mogu da priloÅim poruku u reÅimu van mreÅe: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "Proveravanje za novom poÅtom"
+msgstr "VrÅim proveru za novom poÅtom"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "Pro_veri za nove poruke u svim fasciklama"
+msgstr "P_otraÅi nove poruke u svim fasciklama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../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/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Proveri da nema Ä_ubreta meÄu novim porukama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../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"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Automatski u_skladi nalog lokalno"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP podeÅavanja"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Port SOAP posrednika za poÅtu:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Novel GroupVajz"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "Za pristupanje Novell Groupwise serverima"
+msgstr "Za pristup Novel GroupVajz serverima"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ova opcija Äe povezati na GroupWise server koriÅÄenjem lozinke u obiÄnom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"Ova opcija Äe povezati na GroupVajz server koriÅÄenjem lozinke u obiÄnom "
+"tekstu."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
-msgstr "DomaÄin ili korisnik u adresi nisu dostupni"
+msgstr "DomaÄin ili korisnik nisu dostupni u adresi"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "Niste uneli lozinku."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Neke opcije moÅda neÄe ispravno raditi na trenutnoj verziji servera"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
-msgstr "Nema takve fascikle %s"
+msgstr "Nema takve fascikle â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Nije moguÄe pravljenje GroupWise fascikli u reÅimu van mreÅe."
+msgstr "Ne mogu da napravim GroupVajz fascikle u reÅimu van mreÅe."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ne mogu da napravim posebnu fasciklu sistema"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Glavna fascikla ne moÅe sadrÅati fascikle u sebi"
+msgstr "Glavna fascikla ne moÅe da sadrÅi druge fascikle"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Nije moguÄe preimenovati GroupWise fasciklu â%sâ u â%sâ"
+msgstr "Ne mogu da preimenujem GroupVajz fasciklu â%sâ u â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise server %s"
+msgstr "GroupVajz server â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise servis za %s na %s"
+msgstr "GroupVajz servis za â%sâ na â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise dostava poÅte preko %s"
+msgstr "GroupVajz dostava poÅte preko â%sâ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
-msgstr "Slanje poruke"
+msgstr "Åaljem poruku"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Dostigli ste smeÅtajno ograniÄenje za ovaj nalog. VaÅe poruke biÄe odlagane u odlaznoj poÅti. PoÅaljite ih ponovo pritiskom na PoÅalji/Primi dugme nakon Åto uklonite ili arhivirate vaÅu poÅtu.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Nije moguÄe slanje poruke: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Proveravanje za novom poÅtom"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Koristi prilagoÄenu komandu za povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Komanda:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "Prik_aÅi samo prijavljene fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "P_remosti oblik imena fascikle koje daje server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Oblik imena"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ne mogu da dobavim fasciklu: neispravna operacija"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Za pristupanje Hula serverima"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"PremaÅili ste smeÅtajno ograniÄenje za ovaj nalog. VaÅe poruke biÄe odlagane "
+"u odlaznoj poÅti. PoÅaljite ih ponovo pritiskom na dugme âPoÅalji/Primiâ nakon "
+"Åto uklonite ili arhivirate vaÅu poÅtu.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ova moguÄnost obezbeÄuje povezvanje na Hula server koriÅÄenjem lozinke u obiÄnom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Ne mogu da poÅaljem poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "Bez izlaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "Bez ulaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
-msgstr "Operacija otkazana"
+msgstr "Operacija je otkazana"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neoÄekivano iskljuÄena: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2967,1194 +3128,1009 @@ msgstr ""
 "Upozorenje od IMAP servera %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "NeoÄekivan odgovor od IMAP servera: %s"
+msgstr "NeoÄekivan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "Neuspela IMAP komanda: %s"
+msgstr "Neuspela IMAP naredba: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Odgovor servera je prerano zavrÅen."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Odgovor IMAP servera nije sadrÅao %s podatak"
+msgstr "Odgovor IMAP servera nije sadrÅao â%sâ podatak"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "NeoÄekivan U redu odgovor od IMAP servera: %s"
+msgstr "NeoÄekivan potvrdan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
-msgstr "Uvek proveri za nove poruke u ovoj fascikli"
+msgstr "Uvek proveri nove poruke u ovoj fascikli"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Nije moguÄe napraviti direktorijum %s: %s"
+msgstr "Ne mogu da napravim direktorijum â%sâ: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Pretraga za izmenjenim porukama u %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "NeoÄekivani status odgovora â%sââ nakon naredbe APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr "Nema odziva nakon naredbe APPEND"
+msgstr "Pregledam izmenjene poruke u â%sâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Nepoznata greÅka se javila tokom naredbe APPEND!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Nije moguÄe dovlaÄenje poruke: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3369
+msgid "Unable to retrieve message: "
+msgstr "Ne mogu da dovuÄem poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5211
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Nije moguÄe dobiti poruku sa IB %s: %s"
+msgstr "Ne mogu da nabavim poruku sa IB â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5212
 msgid "No such message available."
 msgstr "Nema takve poruke."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Nepotpun odgovor servera: podaci nisu dati za poruku %d"
+msgstr "Nepotpun odgovor servera: nisu dati podaci za poruku â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Nepotpun odgovor servera: JIB nije dat za poruku %d"
+msgstr "Nepotpun odgovor servera: JIB nije dat za poruku â%dâ"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "Nije moguÄe pronaÄi telo poruke u FETCH odgovoru."
+msgstr "Ne mogu da pronaÄem telo poruke u DOVUCI odgovoru."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nije moguÄe otvoriti direktorijum ostave: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../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:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Neuspelo privremeno Äuvanje poruke %s: %s"
+msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Neuspelo privremeno Äuvanje %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Nisam uspeo privremeno da saÄuvam poruku â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Nisam uspeo privremeno da saÄuvam â%sâ: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "VrÅim proveru za novom poÅtom"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Oblik imena:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Povezivanje na server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Pri_meni filtere na nove poruke u SANDUÄETU ovog servera"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Koristi prilagoÄenu komandu za povezivanje na server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-msgid "Check new messages for Jun_k contents"
-msgstr "Proveri da nema Äu_breta meÄu novim porukama"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Naredba:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "Prik_aÅi samo prijavljene fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "P_remosti oblik imena fascikle koje daje server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Oblik _imena:"
+
+#: ../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"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatski uskladi ud_aljenu poÅtu sa lokalnom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 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:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ova opcija Äe povezati na IMAP server koriÅÄenjem lozinke u obiÄnom tekstu."
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
+msgstr ""
+"Ova opcija Äe povezati na IMAP server koriÅÄenjem lozinke u obiÄnom tekstu."
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Nije moguÄe povezivanje na %s: %s"
+msgstr "Ne mogu da se poveÅem na â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL nije dostupan"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Povezivanje otkazano"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ne mogu da se poveÅem na â%sâ: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Neuspelo povezivanje na IMAP server %s u sigurnosnom modu: %s"
+msgstr "Nisam uspeo da se poveÅem na IMAP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podrÅano"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "SSL nije dostupan u ovoj verziji"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Nije moguÄe povezivanje komandom â%sâ: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "SanduÄe"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Priprema"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Poslato"
+msgid "Connection cancelled"
+msgstr "Povezivanje je otkazano"
 
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Åabloni"
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Ne mogu da se poveÅem sa naredbom â%sâ: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP server %s ne podrÅava traÅeni tip prijave %s"
+msgstr "IMAP server â%sâ ne podrÅava traÅeni tip prijavljivanja identiteta â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Nema podrÅke za tip prijave %s"
+msgstr "Nema podrÅke za tip potvrÄivanja identiteta â%sâ"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nije moguÄa autentifikacija na IMAP server.\n"
+"Ne mogu da potvrdim identitet na IMAP server.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, 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:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: fascikla postoji."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Nepoznata glavna fascikla: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "NeoÄekivan odgovor od IMAP4 servera %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "NeoÄekivan pozdrav od IMAP servera: %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄe izabrati fasciklu â%sâ: neispravno ime sanduÄeta"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Nije moguÄe izabrati fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "servis nije dostupan"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP4 serverom %s je neoÄekivano prekinuta: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "OmoguÄavanje otkrivanja dopisne liste je potrebno nekim filterima i pravilima za vFascikle"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Isticanje zapamÄenih poruka koje nisu proÄitane za X sekundi"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "Isticanje zapamÄenih porukastarijih od X sekundi"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Nije moguÄe pristupiti fascikli â%sâ: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: nepoznata greÅka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Nije moguÄe isprazniti fasciklu â%sâ: nepoznata greÅka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Nije moguÄe isprazniti fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: nema takve poruke"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: fascikla je samo za Äitanje"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: nepoznata greÅka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguÄe premestiti poruku iz fascikle â%sâ u fasciklu â%sâ: nepoznata greÅka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguÄe umnoÅiti poruke iz fascikle â%sâ u fasciklu â%sâ: nepoznata greÅka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguÄe premestiti poruke iz fascikle â%sâ u fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguÄe umnoÅiti poruku iz fascikle â%sâ u fasciklu â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Proveri da nema _Äubreta meÄu novim porukama"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Proveri da nema Äubreta samo u fascikli SANDUÄE"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Za Äitanje i smeÅtanje poÅte na IMAPv4rev1 servere."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ova opcija Äe povezati na IMAPv4rev1 server koriÅÄenjem lozinke u obiÄnom tekstu."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Povezivanje otkazano"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Neuspelo povezivanje na IMAP server %s u bezbednosnom reÅimu: server ne podrÅava STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS pregovori nisu uspeli"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu mehanizma prijave %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Nije moguÄe pravljenje IMAP fascikli u reÅimu van mreÅe."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Nije moguÄe dobiti fasciklu â%sâ sa IMAP servera %s: nepoznata greÅka"
+msgid "IMAP server %s"
+msgstr "IMAP server â%sâ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Nije moguÄe dobiti LIST informaciju za â%sâ sa IMAP servera %s: %s"
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za â%sâ na â%s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "LoÅa komanda"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:434
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:701
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "SanduÄe"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: neispravno ime sanduÄeta"
+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/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: loÅa naredba"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Ne mogu da napravim fasciklu â%sâ: fascikla postoji."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Nije moguÄe obrisati fasciklu â%sâ: specijalna fascikla"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Nije moguÄe brisanje IMAP fascikli u reÅimu van mreÅe."
+msgid "Unknown parent folder: %s"
+msgstr "Nepoznata glavna fascikla: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄe obrisati fasciklu â%sâ: neispravno ime sanduÄeta"
+msgid "Server unexpectedly disconnected"
+msgstr "Veza sa serverom je neoÄekivano iskljuÄena"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Nije moguÄe obrisati fasciklu â%sâ: loÅa naredba"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+msgid "Server unexpectedly disconnected: "
+msgstr "Veza sa serverom je neoÄekivano iskljuÄena: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: specijalna fascikla"
+msgid "Could not create folder summary for %s"
+msgstr "Ne mogu da napravim saÅetak fascikle za â%sâ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Nije moguÄe preimenovanje IMAP fascikli u reÅimu van mreÅe."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: neispravno ime sanduÄeta"
+msgid "Could not create cache for %s: "
+msgstr "Ne mogu da napravim ostavu za â%sâ: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: loÅa naredba"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Koristi _Brzo ponovno usaglaÅavanje ako ga server podrÅava"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Nije moguÄe dobiti podatke %s za obrazac â%sâ sa IMAP servera %s: %s"
+#: ../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/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Nije moguÄa prijava na IMAP fascikle u reÅimu van mreÅe."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Naredba:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄa prijava na fasciklu â%sâ: neispravno ime sanduÄeta"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Broj veza iz _ostave za koriÅÄenje"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Nije moguÄa prijava na fasciklu â%sâ: loÅa naredba"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Oblik imena:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Nije moguÄe odjavljivanje sa IMAP fascikli u reÅimu van mreÅe."
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄa odjava sa fascikle â%sâ: neispravno ime sanduÄeta"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+msgid "Error writing to cache stream: "
+msgstr "GreÅka prilikom upisa u tok ostave:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Nije moguÄa odjava sa fascikle â%sâ: loÅa naredba"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Pretraga za izmenjenim porukama"
+msgid "Not authenticated"
+msgstr "NepotvrÄenog identiteta"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP server %s nije usklaÄen."
+msgid "Could not connect to %s (port %s): "
+msgstr "Ne mogu da se poveÅem na â%sâ (port %s): "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "Pribavljanje omota za nove poruke"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+msgid "Closing tmp stream failed: "
+msgstr "Zatvaranje privremenog toka nije uspelo:"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "NeoÄekivani element u odgovoru IMAP servera %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "Nema podataka"
+#: ../camel/providers/imapx/camel-imapx-server.c:5357
+#: ../camel/providers/imapx/camel-imapx-server.c:5372
+msgid "Cannot create spool file: "
+msgstr "Ne mogu da napravim datoteku pripreme: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neoÄekivano prekinuta: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Ostava za poruke"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Eksperimentalni IMAP 4(.1) klijent\n"
-"Ovo je neproveren i nepodrÅan kod, bolje koristite obiÄan imap.\n"
-"\n"
-" !!! NE KORISTITE OVO ZA VAÅNU POÅTU  !!!\n"
+msgid "No such folder: %s"
+msgstr "Nema takve fascikle: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Nije moguÄe povezivanje na %s (port %s): %s"
+msgid "Source stream returned no data"
+msgstr "Odgovor izvornog toka je bez podataka"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Nije moguÄe povezivanje na POP server %s"
+msgid "Source stream unavailable"
+msgstr "Tok izvora je nedostupan"
 
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "PopiÅi sadrÅaje poruka"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "poÅtansko sanduÄe:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "PopiÅi sadrÅaje poruka"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ne mogu da dobavim poruku â%sâ iz fascikle â%sâ\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Koristite pregled fascikle â.foldersâ (exmh)"
+msgstr "_Koristi pregled fascikle â.foldersâ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-oblikovani direktorijumi poÅte"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za smeÅtanje lokalne poÅte u direktorijume poÅte nalik MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Lokalna dostava"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Za dovlaÄenje (premeÅtanje) lokalne poÅte iz mbox oblika u fascikle kojim upravlja Evolucija."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Za dovlaÄenje (premeÅtanje) lokalne poÅte iz standardne mboks formatirane "
+"pripreme u fascikle kojima upravlja Evolucija."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Primeni filtere na nove poruke u SANDUÄETU"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Direktorijumi poÅte u Maildir obliku"
+msgstr "Direktorijumi poÅte u Mejldir obliku"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "Za smeÅtanje lokalne poÅte u maildir direktorijume."
+msgstr "Za smeÅtanje lokalne poÅte u mejldir direktorijume."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_Smesti zaglavlja o statusu u formatu Elm/Pine/Mutt"
+msgstr "_Smesti zaglavlja stanja u Elm/Pine/Mut formatu"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "Standardna Unix mbox spool datoteka"
+msgstr "Standardna Uniks mboks datoteka pripreme"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za Äitanje i smeÅtanje lokalne poÅte u spoljne standardne mbox spool datoteke.\n"
-"TakoÄe se moÅe koristiti za Äitanje stabla fascikli u Elm, Pine, ili Mutt stilu."
+"Za Äitanje i smeÅtanje lokalne poÅte u spoljne standardne mboks datoteke "
+"pripreme.\n"
+"TakoÄe se moÅe koristiti za Äitanje stabla fascikli u Elm, Pine ili Mut stilu."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "Standardni Unix mbox spool direktorijum"
+msgstr "Standardni Uniks mboks direktorijum pripreme"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Ostava root %s nije apsolutna putanja"
+msgstr "Administratorska ostava â%sâ nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Ostava root %s nije regularan direktorijum"
+msgstr "Administratorska ostava â%sâ nije regularan direktorijum"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Nije moguÄe dobiti fasciklu: %s: %s"
+msgstr "Ne mogu da dobavim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduÄe"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
-msgstr "Lokalna datoteka poÅte %s"
+msgstr "Lokalna datoteka poÅte â%sâ"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Nije moguÄe preimenovati fasciklu %s u %s: %s"
+msgstr "Ne mogu da preimenujem fasciklu â%sâ u â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Nije moguÄe preimenovati â%sâ: %s"
+msgstr "Ne mogu da preimenujem â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "Nije moguÄe obrisati indeks datoteku fascikle â%sâ: %s"
+msgstr "Ne mogu da obriÅem indeksnu datoteku fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "Nije moguÄe obrisati meta datoteku fascikle â%sâ: %s"
+msgstr "Ne mogu da obriÅem meta datoteku fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Nije moguÄe dodati poruku pregledu: nepoznat razlog"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Prododata maildir poruka poniÅtena"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nije moguÄe dodati poruku u maildir fasciklu: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "Ne mogu da dodam poruku pregledu: nepoznat razlog"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+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
+#, 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
+#, 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
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr ""
-"Nije moguÄe dobiti poruku: %s iz fascikle %s\n"
-"  %s"
+"Ne mogu da napravim fasciklu â%sâ: naziv fascikle ne moÅe da sadrÅi taÄku."
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Neispravan sadrÅaj poruke"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:718
+#, c-format
+msgid "Folder %s already exists"
+msgstr "Fascikla â%sâ veÄ postoji"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: %s"
+msgstr "Ne mogu da napravim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Nije moguÄe preuzeti fasciklu â%sâ: %s"
+msgstr "Ne mogu da preuzmem fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Nije moguÄe preuzeti fasciklu â%sâ: fascikla ne postoji."
+msgstr "Ne mogu da preuzmem fasciklu â%sâ: fascikla ne postoji."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Nije moguÄe dobiti fasciklu â%sâ: nije maildir direktorijum."
+msgstr "Ne mogu da preuzmem fasciklu â%sâ: nije direktorijum poÅte."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Nije moguÄe obrisati fasciklu â%sâ: %s"
+msgstr "Ne mogu da obriÅem fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
-msgstr "nije maildir direktorijum"
+msgstr "nije direktorijum poÅte"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:866
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Nije moguÄe pretraÅiti fasciklu â%sâ: %s"
+msgstr "Ne mogu da pretraÅim fasciklu â%sâ: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:709
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr ""
+"Ne mogu da preimenujem fasciklu â%sâ: naziv fascikle ne moÅe da sadrÅi taÄku."
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Nije moguÄe otvaranje putanje maildir direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju direktorijuma poÅte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
-msgstr "Proveravanje celovitosti fascikle"
+msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
-msgstr "Proveravanje za nove poruke"
+msgstr "VrÅim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
-msgstr "SmeÅtanje fascikle"
+msgstr "SmeÅtam fasciklu"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Nije moguÄe zakljuÄati fasciklu %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:220
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nije moguÄe otvoriti poÅtansko sanduÄe: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "Dodavanje poÅte otkazano"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ne mogu da otvorim poÅtansko sanduÄe: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nije moguÄe dodavanje poruke u mbox datoteku: %s: %s"
+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:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Fascikla izgleda nepopravljivo oÅteÄena."
+msgstr "Fascikla izgleda da je nepopravljivo oÅteÄena."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "Sastavljanje poruke neuspelo."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../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:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Nije moguÄe napraviti fasciklu ovog imena."
+msgstr "Ne mogu da napravim fasciklu ovog imena."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "Nije moguÄe dobiti fasciklu â%sâ: nije obiÄna datoteka."
+msgstr "Ne mogu da dobavim fasciklu â%sâ: nije obiÄna datoteka."
+
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Ne mogu da napravim direktorijum â%sâ: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ne mogu da napravim fasciklu: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Fascikla veÄ postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄe obrisati fasciklu â%sâ:\n"
+"Ne mogu da obriÅem fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "â%sâ nije obiÄna datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Fascikla â%sâ nije prazna. Nije obrisana."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Nije moguÄe obrisati pregled fascikle â%sâ: %s"
+msgstr "Ne mogu da obriÅem pregled fascikle â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Nije moguÄe napraviti direktorijum â%sâ: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Nije moguÄe napraviti fasciklu: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "Fascikla veÄ postoji"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "Novo ime fascikle je neispravno."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "Nije moguÄe preimenovati â%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:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Nije moguÄe preimenovati â%sâ u %s: %s"
+msgstr "Ne mogu da preimenujem â%sâ u â%sâ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Nije moguÄe otvoriti fasciklu: %s: %s"
+msgstr "Ne mogu da otvorim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Kobna greÅka pri Äitanju poÅte na mestu %ld u fascikli %s"
+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:648
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Nije moguÄe proveriti fasciklu: %s: %s"
+msgstr "Ne mogu da proverim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Nije moguÄe otvoriti datoteku: %s: %s"
+msgstr "Ne mogu da otvorim datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Nije moguÄe otvaranje privremenog poÅtanskog sanduÄeta: %s"
+msgstr "Ne mogu da otvorim privremeno poÅtansko sanduÄe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Nije moguÄe zatvaranje izvorne fascikle %s: %s"
+msgstr "Ne mogu da zatvorim izvornu fasciklu â%sâ: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "Nije moguÄe zatvaranje privremene fascikle: %s"
+msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Nije moguÄe preimenovati fasciklu: %s"
+msgstr "Ne mogu da preimenujem fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Nije moguÄe Äuvanje fascikle: %s"
+msgstr "Ne mogu da saÄuvam fasciklu: %s"
+
+#: ../camel/providers/local/camel-mbox-summary.c:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOKS datoteka je oÅteÄena, popravite je. (OÄekivano je âIz redaâ, ali nisam "
+"dobio.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
+#, 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:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greÅka: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "Neuspelo pisanje u privremeno poÅtansko sanduÄe: %s"
+msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "Neuspelo pisanje u privremeno poÅtansko sanduÄe: %s: %s"
-
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH dodavanje poruke otkazano"
+msgstr "Nisam uspeo da zapiÅem u privremeno poÅtansko sanduÄe: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nije moguÄe dodati poruku u mh fasciklu: %s: %s"
+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:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Nije moguÄe napraviti fasciklu â%sâ: %s"
+msgstr "Ne mogu da napravim fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Nije moguÄe dobiti fasciklu â%sâ: nije direktorijum."
+msgstr "Ne mogu da dobavim fasciklu â%sâ: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Nije moguÄe otvoriti putanju MH direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju MH direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Priprema â%sâ ne moÅe se otvoriti: %s"
+msgstr "Ne mogu da otvorim pripremu â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:341
 #, 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:166
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Pripremna datoteka poÅte â%sâ"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Stablo fascikle za pripremu â%sâ"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Fascikla â%s/%sâ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄe otvoriti fasciklu â%sâ:\n"
+"Ne mogu da otvorim fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Fascikla â%sâ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄe napraviti fasciklu â%sâ:\n"
+"Ne mogu da napravim fasciklu â%sâ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "â%sâ nije datoteka sanduÄeta."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ostava ne podrÅava SANDUÄE"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Pripremna datoteka poÅte %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Fascikle za pripremu ne mogu biti obrisane"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Stablo fascikli za pripremu %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "Fascikle za pripremu ne mogu biti preimenovane"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "Fascikle za pripremu ne mogu biti obrisane"
-
+#: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Nije moguÄe uskladiti privremenu fasciklu %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Ne mogu da uskladim privremenu fasciklu â%sâ: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Nije moguÄe uskladiti fasciklu za pripremu %s: %s"
+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:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Nije moguÄe uskladiti fasciklu za pripremu %s: %s\n"
+"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:137
 #: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, 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:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:376
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ne mogu da dobavim poruku â%sâ: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Neuspela poÅiljka: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "Neuspela poÅiljka: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Ne moÅete poslati NNTP poruke ako niste povezani!"
+msgstr "Ne moÅete da poÅaljete NNTP poruke ako niste povezani!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Ne moÅete umnoÅiti poruke iz NNTP fascikle!"
+msgstr "Ne moÅete da umnoÅite poruke iz NNTP fascikle!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-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:44
+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:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 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:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET vesti"
+msgstr "JUZNET vesti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Ovo je ponuÄaÄ za Äitanje i slanje na USENET grupe vesti."
+msgstr "Ovo je dostavljaÄ za Äitanje i slanje na JUZNET grupe vesti."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+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:73
+#, 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-provider.c:76
-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:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Ne mogu da potvrdim identitet na serveru: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Nije moguÄe Äitanje pozdrava od %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Ne mogu da proÄitam pozdrav sa â%sâ: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP server %s je uzvratio kodom o greÅci %d: %s"
+msgstr "NNTP server â%sâ je vratio kod greÅke â%dâ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET vesti preko %s"
+msgstr "JUZNET vesti preko â%sâ"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4141,677 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"Ne moÅete se prijaviti na ovu grupu vesti:\n"
+"Ne moÅete da se prijavite na ovu grupu vesti:\n"
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadreÄena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"Ne moÅete se odjaviti sa ove grupe vesti:\n"
+"Ne moÅete da se odjavite sa ove grupe vesti:\n"
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Ne moÅete napraviti fasciklu u ostavi vesti: prijavite se umesto toga."
+msgstr ""
+"Ne moÅete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
-msgid "You cannot rename a folder in a News store."
-msgstr "Ne moÅete preimenovati fasciklu u ostavi vesti."
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, 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:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Ne moÅete ukloniti fasciklu u ostavi vesti: odjavite se umesto toga."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "Potrebna autentifikacija ali korisniÄko ime nije uneto"
+msgstr ""
+"Ne moÅete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Nije moguÄa autentifikacija na server: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda neuspela: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "Nepovezano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve fascikle: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: pretraÅivanje novih poruka"
+msgstr "%s: pretraÅujem nove poruke"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "NeoÄekivan odgovor xover-a: %s"
+msgstr "NeoÄekivan odgovor ksovera: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "NeoÄekivan odgovor head-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "Koristite odustani"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:282
+#: ../camel/providers/pop3/camel-pop3-folder.c:341
+#, c-format
+msgid "No message with UID %s"
+msgstr "Nema poruke sa JIB %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "DovlaÄim POP poruku %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:454
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Retrieving POP summary"
-msgstr "Preuzimanje POP pregleda"
+msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:518
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Nije moguÄe dobiti POP pregled: %s"
+msgstr "Ne mogu da dobavim POP pregled: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Expunging old messages"
-msgstr "Izbacivanje starih poruka"
+msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:590
 msgid "Expunging deleted messages"
-msgstr "Izbacivanje obrisanih poruka"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Nema poruka sa JIB %s"
+msgstr "Izbacujem obrisane poruke"
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "DovlaÄenje POP poruke %d"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "Ostava za poruke"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Ostavi poruke na serveru"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "O_briÅi nakon %s dana"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ObriÅi _izbaÄeno iz lokalne âDolaznoâ"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "IskljuÄi _podrÅku za sva POP3 proÅirenja"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 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:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-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:75
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+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:85
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Ova opcija Äe povezati na POP server koriÅÄenjem lozinke preko APOP "
+"protokola. Ovo moÅda neÄe raditi svim korisnicima Äak i na serverima koji "
+"tvrde da to podrÅavaju."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Ova opcija Äe povezati na POP server koriÅÄenjem lozinke preko APOP protokola. Ovo moÅda neÄe raditi svim korisnicima Äak i na serverima koji tvrde da to podrÅavaju."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Neuspelo Äitanje ispravnog pozdrava POP servera %s"
+msgstr "Neuspelo Äitanje ispravnog pozdrava POP servera â%sâ"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nije moguÄe povezivanje na POP server %s u sigurnosnom reÅimu %s"
+msgstr "Nisam uspeo da se poveÅem na POP server â%sâ u bezbednom reÅimu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "Server ne podrÅava STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#, 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:231
+msgid "TLS negotiations failed"
+msgstr "TLS pregovori nisu uspeli"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "TLS nije dostupan u ovom izdanju"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Nije moguÄe povezivanje na POP server %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Nije moguÄe povezivanje na POP server %s: traÅeni mehanizam autentifikacije nije podrÅan."
+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."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Neuspela SASL prijava â%sâ na POP server %s: %s"
+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:432
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Nije moguÄa prijava na POP server %s: greÅka SASL protokola"
+msgstr "Ne mogu da se prijavim na POP server â%sâ: greÅka SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Nije moguÄa autentifikacija na POP server %s: %s"
+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:510
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Nije moguÄe povezivanje na POP server %s: primljen \tInvalid APOP IB. MoguÄ napad zamenom identiteta. Obratite se adminu."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Ne mogu da se poveÅem na POP server â%sâ: primih Neispravan APOP IB. MoguÄ "
+"je napad zamenom identiteta. Obratite se adminu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"Nije moguÄe povezivanje na POP server %s.\n"
+"Ne mogu da se poveÅem na POP server â%sâ.\n"
 "GreÅka pri slanju lozinke: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+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:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"Nije moguÄe povezivanje na POP server %s.\n"
-"GreÅka pri slanju korisniÄkog imena: %s"
+"Ne mogu da se poveÅem na POP server â%sâ.\n"
+"GreÅka pri slanju lozinke%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server za â%sâ na â%sâ"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, 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:671
+#: ../camel/providers/pop3/camel-pop3-store.c:721
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle â%sâ."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:738
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ostava nema hijerarhiju fascikli"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Za dostavu poÅte prosleÄivanjem âsendmailâ programu na lokalnom sistemu."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Za dostavu poÅte prosleÄivanjem âsendmailâ programu na lokalnom sistemu."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Dostava poÅte preko programa sendmejl"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "Nije moguÄe Äitanje liste primalaca"
+msgstr "Ne mogu da analiziram spisak primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nije moguÄe napraviti vezu ka sendmail-u: %s: poÅta nije poslata"
+msgstr "Ne mogu da napravim vezu ka sendmejlu: %s: poÅta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nije moguÄe podeliti sendmail: %s: poÅta nije poslata"
+msgstr "Ne mogu da podelim sendmejl: %s: poÅta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "Ne mogu da poÅaljem poruku: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail je zavrÅio signalom %s: poÅta nije poslata."
+msgstr "sendmejl je zavrÅio signalom ââ%s: poÅta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Nije moguÄe izvrÅiti %s: poÅta nije poslata."
+msgstr "Ne mogu da izvrÅim â%sâ: poÅta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail je zavrÅio sa statusom %d: poÅta nije poslata."
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
+msgstr "sendmejl je zavrÅio sa statusom â%dâ: poÅta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "Dostava poÅte preko programa sendmail"
-
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 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."
+msgstr ""
+"Za dostavu poÅte povezivanjem na prosleÄivaÄ poÅte u mreÅi koriÅÄenjem SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "GreÅka odgovora dobrodoÅlice: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, 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:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "Neuspela STARTTLS naredba: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP server â%sâ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP dostava poÅte preko â%sâ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, 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â."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, 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"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, 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:620
+#, 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:624
+msgid "Sending message"
+msgstr "Slanje poruke"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, 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:662
+#, 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:725
 msgid "Syntax error, command unrecognized"
-msgstr "GreÅka u sintaksi, komanda nije prepoznata"
+msgstr "GreÅka u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "GreÅka u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
-msgstr "Komanda nije podrÅana"
+msgstr "Naredba nije podrÅana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
-msgstr "Parametar komande nije podrÅan"
+msgstr "Parametar naredbe nije podrÅan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "Status sistema, ili odgovor na pomoÄ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "Poruka o pomoÄi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
-msgstr "Servis spreman"
+msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
-msgstr "Servis nije dostupan, zatvaranje kanala prenosa"
+msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
-msgstr "TraÅena radnja za poÅtu u redu, zavrÅeno"
+msgstr "TraÅena radnja za poÅtu je u redu, zavrÅeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 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:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 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:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "TraÅena radnja nije preduzeta: nedostupno poÅtansko sanduÄe"
+msgstr "TraÅena radnja nije preduzeta: poÅtansko sanduÄe je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "TraÅena radnja nije preduzeta: greÅka pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokuÅajte <putanja-prosleÄivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 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:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Odustato od traÅene radnje za poÅtu: premaÅen dodeljen prostor"
+msgstr "Prekinuta je traÅena radnja za poÅtu: premaÅen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 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:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 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:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
-msgstr "Mehanizam autentifikacije je preslab"
+msgstr "Mehanizam potvrÄivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Neophodno Åifrovanje za traÅeni mehanizam autentifikacije"
+msgstr "Neophodno je Åifrovanje za traÅeni mehanizam potvrÄivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
-msgstr "Neuspela privremena autentifikacija"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "GreÅka kod odgovora dobrodoÅlice"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Nije moguÄe povezivanje na SMTP server %s u sigurnosnom reÅimu: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Neuspela STARTTLS komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Neuspela STARTTLS komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP server %s ne podrÅava traÅeni tip autentifikacije %s."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nije moguÄa autentifikacija na SMTP server.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP dostava poÅte preko %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "Nije moguÄe slanje poruke: servis nije povezan."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "Nije moguÄe slanje poruke: adresa poÅiljaoca nije ispravna."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "Slanje poruke"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "Nije moguÄe slanje poruke: nisu odreÄeni primaoci."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Nije moguÄe slanje poruke: jedan ili viÅe neispravnih primalaca"
+msgstr "Nije uspelo privremeno potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Neuspela HELO komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "Neuspela HELO komanda"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "Neuspela naredba âHELOâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
-msgstr "SMTP autentifikacija"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "GreÅka pri pravljenju objekta SASL autentifikacije."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Neuspela AUTH komanda: %s"
+msgstr "SMTP potvrÄivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Neuspela AUTH komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "LoÅ odgovor na autentifikaciju od servera.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Neuspela MAIL FROM komanda: %s: poÅta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Neuspela MAIL FROM komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Neuspela RCPT TO komanda: %s: poÅta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> neuspelo"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Neuspela DATA komanda: %s: poÅta nije poslata"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Neuspela DATA komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "Neuspela RSET komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Neuspela RSET komanda"
+msgid "Error creating SASL authentication object."
+msgstr "GreÅka pri pravljenju objekta SASL potvrÄivanja identiteta."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "Neuspela naredba âAUTHâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "Neuspela naredba âMAIL FROMâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "Neuspela naredba âRCPT TOâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> nije uspelo"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "Neuspela naredba âDATAâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "Neuspela naredba âRSETâ: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "Neuspela naredba âQUITâ: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Neuspela QUIT komanda: %s"
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "GodiÅnjica"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Neuspela QUIT komanda"
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "RoÄendan"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Nadmetanje"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Ciljevi/zadaci"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Äestitke"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "VaÅni kontakti"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "MeÄunarodno"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "VaÅna muÅterija"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "LiÄno"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Telefonski pozivi"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "DobavljaÄi"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Vreme i izdaci"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Äekanje"
 
@@ -4772,8 +4819,7 @@ msgstr "Äekanje"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4827,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4835,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,615 +4843,1135 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659
-#: ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707
-#: ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834
-#: ../libedataserver/e-time-utils.c:1956
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strptime format for time of day, without seconds 24-hour format, and no colon.
+#: ../libedataserver/e-time-utils.c:1871
+msgid "%H%M"
+msgstr "%H:%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:1875
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupa LDAP serveru"
+
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
+msgid "Failed to authenticate.\n"
+msgstr "Nisam uspeo da potvrdim identitet.\n"
+
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Osobine kategorije"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "I_me kategorije"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "_Ikonica kategorije"
+
+#: ../libedataserverui/e-categories-dialog.c:185
+msgid "Category Icon"
+msgstr "Ikonica kategorije"
+
+#: ../libedataserverui/e-categories-dialog.c:191
+msgid "_No Image"
+msgstr "_Bez slike"
+
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "U podeÅavanju veÄ postoji kategorija â%sâ. Izaberite drugo ime"
+
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "Trenutno _koriÅÄene kategorije:"
+
+#: ../libedataserverui/e-categories-dialog.c:668
+msgid "_Available Categories:"
+msgstr "_Dostupne kategorije:"
+
+#: ../libedataserverui/e-categories-dialog.c:711
+msgid "_Edit"
+msgstr "_UreÄivanje"
+
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Ikonica"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Kategorija"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Izrada kategorije â%sâ"
+
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "PrikaÅi kontakte"
+
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "A_dresar:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Katego_rija:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_PretraÅi:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
+msgid "Any Category"
+msgstr "Bilo koja kategorija"
+
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "Ko_ntakti"
+
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Pretraga"
+
+#: ../libedataserverui/e-name-selector-dialog.c:292
+msgid "Address Book"
+msgstr "_Adresar"
+
+#: ../libedataserverui/e-name-selector-dialog.c:295
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Izaberite kontakte iz adresara"
+
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "GreÅka prilikom uÄitavanja adresara: %s"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../libedataserverui/e-name-selector-entry.c:2661
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "Prostri %s unutar"
+
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2676
+#, c-format
+msgid "Cop_y %s"
+msgstr "U_mnoÅi %s"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2686
+#, c-format
+msgid "C_ut %s"
+msgstr "I_seci %s"
+
+#. Edit Contact item
+#: ../libedataserverui/e-name-selector-entry.c:2703
+#, c-format
+msgid "_Edit %s"
+msgstr "_Uredi %s"
+
+#: ../libedataserverui/e-name-selector-list.c:509
+#, c-format
+msgid "_Delete %s"
+msgstr "_Ukloni â%sâ"
+
+#: ../libedataserverui/e-passwords.c:127
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr "KljuÄ priveska nije upotrebljiv: nema korisnika niti domaÄina"
+
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
+msgid "You have the Caps Lock key on."
+msgstr "UkljuÄili ste velika slova."
+
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
+msgid "_Remember this passphrase"
+msgstr "_Zapamti ovu lozinku"
+
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
+msgid "_Remember this password"
+msgstr "_Zapamti ovu lozinku"
+
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+
+#. prepare the dialog
+#: ../libedataserverui/e-source-selector-dialog.c:100
+msgid "Select destination"
+msgstr "Izaberite odrediÅte"
+
+#: ../libedataserverui/e-source-selector-dialog.c:170
+msgid "_Destination"
+msgstr "_OdrediÅte"
+
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "Neispravno povezivanje"
+
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "Neispravan odgovor servera"
+
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "Nema odgovora servera"
+
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "LoÅ parametar"
+
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "â%sâ u knjizi pre â%sâ"
+
+#~ msgid "book busy"
+#~ msgstr "knjiga zauzeta"
+
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA izuzetak pri pozivu â%sâ"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: nema trenutne operacije"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â%sâ na knjizi posle â%sâ"
+
+# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
+#~ msgid "%s: canceled"
+#~ msgstr "%s: otkazano"
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: nema dostupne proizvodnje za adresu â%s'"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: nije moguÄe pravljenje EBookListener"
+
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: nema sopstveni JIB kontakta smeÅten u gconf"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Nije moguÄe da napraviti niz za pribavljanje delti"
+
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Rad van mreÅe nije dostupan"
+
+#~ msgid "Verifying message"
+#~ msgstr "Proveravanje poruke"
+
+#~ msgid "Cannot open message"
+#~ msgstr "Nije moguÄe otvoriti poruku"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "NepodrÅana operacija: prikljuÄenje poruke: za %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "NepodrÅana operacija: pretraga po izrazu: za %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "NepodrÅana operacija: prebrojavanje po izrazu: za %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "NepodrÅana operacija: pretraga po JIB: za %s"
+
+#~ msgid "Learning junk"
+#~ msgstr "UÄenje Åta je Äubre"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "UÄenje Åta nije Äubre"
+
+#~ msgid "Canceled."
+#~ msgstr "Odustato."
+
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Ovo je deo poruke sa digitalnim potpisom"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Nije moguÄa provera potpisa poruke: nije moguÄe napraviti privremenu "
+#~ "datoteku: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "Nije moguÄe proÄitati sadrÅaj poruke"
+
+#~ msgid "cannot create thread"
+#~ msgstr "nije moguÄe pravljenje niza"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "Ova opcija Äe povezati na server koriÅÄenjem Kerberos 4 prijave."
+
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nije moguÄe dobiti Kerberos kartu:\n"
+#~ "%s"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel sesija ne podrÅava prosleÄivanje poruke."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "uvoz kljuÄeva: neizvedeno"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "izvoz kljuÄeva: neizvedeno"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Nije moguÄe napraviti fasciklu: neispravna operacija"
+
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Nije moguÄe dobijanje sertifikata izdavaÄa"
+
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Nije moguÄe dobiti listu povuÄenih sertifikata"
+
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Nije moguÄe deÅifrovanje potpisa sertifikata"
+
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Nije moguÄe deÅifrovanje potpisa za listu povuÄenih sertifikata"
+
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Nije moguÄe deÅifrovati javni kljuÄ izdavaÄa"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "Neuspeo potpis sertifikata"
+
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Neuspeo potpis za listu povuÄenih sertifikata"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Sertifikat joÅ nije vaÅeÄi"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "Sertifikat je istekao"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL joÅ nije vaÅeÄi"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL je istekao"
+
+#~ msgid "Error in CRL"
+#~ msgstr "GreÅka u CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "Nema viÅe memorije"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Samopotpisani sertifikat je nulte veliÄine"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Samopotpisani sertifikat u lancu"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Nije moguÄe lokalno dobiti izdavaÄev sertifikat"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Nije moguÄe dobiti potpis lista"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Lanac sertifikata je predugaÄak"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "PovuÄen sertifikat"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Neispravan izdavaÄ sertifikata (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "PremaÅena duÅina putanje"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Neispravna svrha"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Nepoverljiv sertifikat"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Odbijen sertifikat"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Naslov/izdavaÄ neslaganje"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID neslaganje"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/izdavaÄ serijsko neslaganje"
+
+#~ msgid "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"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "LoÅ sertifikat od %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Åelite li ipak da prihvatite?"
+
+# Ovo je bilo "korisnik poniÅten", ali mislim da je ovo ipak ispravnije
+#~ msgid "User canceled"
+#~ msgstr "Korisnik odustao"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Fascikla za smeÄe je puna. Ispraznite je."
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Za pristupanje Hula serverima"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Ova moguÄnost obezbeÄuje povezvanje na Hula server koriÅÄenjem lozinke u "
+#~ "obiÄnom tekstu."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "NeoÄekivani status odgovora â%sââ nakon naredbe APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Nema odziva nakon naredbe APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Nepoznata greÅka se javila tokom naredbe APPEND!"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "Pri_meni filtere na nove poruke u SANDUÄETU ovog servera"
+
+#~ msgid "Drafts"
+#~ msgstr "Priprema"
+
+#~ msgid "Sent"
+#~ msgstr "Poslato"
+
+#~ msgid "Templates"
+#~ msgstr "Åabloni"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "NeoÄekivan odgovor od IMAP4 servera %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "NeoÄekivan pozdrav od IMAP servera: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄe izabrati fasciklu â%sâ: neispravno ime sanduÄeta"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Nije moguÄe izabrati fasciklu â%sâ: loÅa naredba"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Veza sa IMAP4 serverom %s je neoÄekivano prekinuta: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "OmoguÄavanje otkrivanja dopisne liste je potrebno nekim filterima i "
+#~ "pravilima za vFascikle"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Isticanje zapamÄenih poruka koje nisu proÄitane za X sekundi"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Isticanje zapamÄenih porukastarijih od X sekundi"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Nije moguÄe pristupiti fascikli â%sâ: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: nepoznata greÅka"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Nije moguÄe uskladiti oznake za fasciklu â%sâ: loÅa naredba"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Nije moguÄe isprazniti fasciklu â%sâ: nepoznata greÅka"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Nije moguÄe isprazniti fasciklu â%sâ: loÅa naredba"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: nema takve poruke"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Nije moguÄe dobiti poruku %s iz fascikle â%sâ: loÅa naredba"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Nije moguÄe dodati poruku u fasciklu â%sâ: fascikla je samo za Äitanje"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: nepoznata greÅka"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Nije moguÄe dodati poruku u fasciklu â%sâ: loÅa naredba"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄe premestiti poruku iz fascikle â%sâ u fasciklu â%sâ: nepoznata "
+#~ "greÅka"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄe umnoÅiti poruke iz fascikle â%sâ u fasciklu â%sâ: nepoznata "
+#~ "greÅka"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguÄe premestiti poruke iz fascikle â%sâ u fasciklu â%sâ: loÅa "
+#~ "naredba"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguÄe umnoÅiti poruku iz fascikle â%sâ u fasciklu â%sâ: loÅa naredba"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Proveri da nema _Äubreta meÄu novim porukama"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Proveri da nema Äubreta samo u fascikli SANDUÄE"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
 
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838
-#: ../libedataserver/e-time-utils.c:1948
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Za Äitanje i smeÅtanje poÅte na IMAPv4rev1 servere."
 
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843
-#: ../libedataserver/e-time-utils.c:1953
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Ova opcija Äe povezati na IMAPv4rev1 server koriÅÄenjem lozinke u obiÄnom "
+#~ "tekstu."
 
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Neuspelo povezivanje na IMAP server %s u bezbednosnom reÅimu: server ne "
+#~ "podrÅava STARTTLS"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
-msgid "%H%M"
-msgstr "%H:%M"
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu mehanizma prijave %s"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Nije moguÄa prijava na IMAP server %s pomoÄu %s"
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupa LDAP serveru"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Nije moguÄe pravljenje IMAP fascikli u reÅimu van mreÅe."
 
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "Neuspela autentifikacija.\n"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄe dobiti fasciklu â%sâ sa IMAP servera %s: nepoznata greÅka"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "U podeÅavanju veÄ postoji kategorija â%sâ. Izaberite drugo ime"
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Nije moguÄe dobiti LIST informaciju za â%sâ sa IMAP servera %s: %s"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "Ikona"
+#~ msgid "Bad command"
+#~ msgstr "LoÅa komanda"
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "Kategorija"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄe napraviti fasciklu â%sâ: neispravno ime sanduÄeta"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Ikona kategorije"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Nije moguÄe napraviti fasciklu â%sâ: loÅa naredba"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "Osobine kategorije"
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Nije moguÄe brisanje IMAP fascikli u reÅimu van mreÅe."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_Ikona kategorije"
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄe obrisati fasciklu â%sâ: neispravno ime sanduÄeta"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "I_me kategorije"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Nije moguÄe obrisati fasciklu â%sâ: loÅa naredba"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: specijalna fascikla"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "_Dostupne kategorije:"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Nije moguÄe preimenovanje IMAP fascikli u reÅimu van mreÅe."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "_UreÄivanje"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: neispravno ime sanduÄeta"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "kategorije"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "Nije moguÄe preimenovati fasciklu â%sâ u â%sâ: loÅa naredba"
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-msgid "Create category \"%s\""
-msgstr "Izrada kategorije â%sâ"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "Nije moguÄe dobiti podatke %s za obrazac â%sâ sa IMAP servera %s: %s"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Podaci o bojama"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Nije moguÄa prijava na IMAP fascikle u reÅimu van mreÅe."
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Boja za obradu"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄa prijava na fasciklu â%sâ: neispravno ime sanduÄeta"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "Izaberite kontakte iz adresara"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Nije moguÄa prijava na fasciklu â%sâ: loÅa naredba"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "_Dodaj"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "Nije moguÄe odjavljivanje sa IMAP fascikli u reÅimu van mreÅe."
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "_Ukloni"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄa odjava sa fascikle â%sâ: neispravno ime sanduÄeta"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "Bilo koja kategorija"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Nije moguÄa odjava sa fascikle â%sâ: loÅa naredba"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Pretraga za izmenjenim porukama"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>Ko_ntakti</b>"
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP server %s nije usklaÄen."
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>PrikaÅi kontakte</b>"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Pribavljanje omota za nove poruke"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "A_dresar:"
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "NeoÄekivani element u odgovoru IMAP servera %s: "
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "_Adresar"
+#~ msgid "No data"
+#~ msgstr "Nema podataka"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "Katego_rija:"
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "Veza sa IMAP serverom %s je neoÄekivano prekinuta: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "Kontakti"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "Eksperimentalni IMAP 4(.1) klijent\n"
+#~ "Ovo je neproveren i nepodrÅan kod, bolje koristite obiÄan imap.\n"
+#~ "\n"
+#~ " !!! NE KORISTITE OVO ZA VAÅNU POÅTU  !!!\n"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "Pretraga"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "Nije moguÄe povezivanje na POP server %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_PretraÅi:"
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Prododata maildir poruka poniÅtena"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "Prostri %s unutar"
+#~ msgid "Invalid message contents"
+#~ msgstr "Neispravan sadrÅaj poruke"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
-#, c-format
-msgid "Cop_y %s"
-msgstr "U_mnoÅi %s"
+#~ msgid "Mail append canceled"
+#~ msgstr "Dodavanje poÅte otkazano"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
-#, c-format
-msgid "C_ut %s"
-msgstr "I_seci %s"
+#~ msgid "Message construction failed."
+#~ msgstr "Sastavljanje poruke neuspelo."
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
-#, c-format
-msgid "_Edit %s"
-msgstr "_Uredi %s"
+#~ msgid "MH append message canceled"
+#~ msgstr "MH dodavanje poruke otkazano"
 
-#: ../libedataserverui/e-name-selector-list.c:472
-#, c-format
-msgid "_Delete %s"
-msgstr "_Ukloni %s"
+#~ msgid "Use cancel"
+#~ msgstr "Koristite odustani"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "KljuÄ priveska nije upotrebljiv: nema korisnika niti domaÄina"
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Neuspela STARTTLS komanda"
 
-#: ../libedataserverui/e-passwords.c:1094
-msgid "You have the Caps Lock key on."
-msgstr "Morate da ukljuÄite velika slova."
+#~ msgid "HELO command failed"
+#~ msgstr "Neuspela HELO komanda"
 
-#: ../libedataserverui/e-passwords.c:1216
-msgid "_Remember this passphrase"
-msgstr "_Zapamti ovu lozinku"
+#~ msgid "AUTH command failed"
+#~ msgstr "Neuspela AUTH komanda"
 
-#: ../libedataserverui/e-passwords.c:1217
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "LoÅ odgovor na autentifikaciju od servera.\n"
 
-#: ../libedataserverui/e-passwords.c:1222
-msgid "_Remember this password"
-msgstr "_Zapamti ovu lozinku"
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Neuspela MAIL FROM komanda: %s: poÅta nije poslata"
 
-#: ../libedataserverui/e-passwords.c:1223
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Neuspela RCPT TO komanda: %s: poÅta nije poslata"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
-msgid "Select destination"
-msgstr "Izaberite odrediÅte"
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Neuspela DATA komanda: %s: poÅta nije poslata"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
-msgid "_Destination"
-msgstr "_OdrediÅte"
+#~ msgid "RSET command failed"
+#~ msgstr "Neuspela RSET komanda"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "Unesite lozinku za %s"
+#~ msgid "QUIT command failed"
+#~ msgstr "Neuspela QUIT komanda"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Unesite lozinku"
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "Vlasnik"
+#~ msgid "categories"
+#~ msgstr "kategorije"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "UreÄivaÄ za objavljivanje"
+#~ msgid "Color Info"
+#~ msgstr "Podaci o bojama"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "UreÄivaÄ"
+#~ msgid "The color to render"
+#~ msgstr "Boja za obradu"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Autor za objavljivanje"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Autor"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>Ko_ntakti</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Autor koji ne ureÄuje"
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>PrikaÅi kontakte</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Recenzent"
+#~ msgid "Enter password for %s"
+#~ msgstr "Unesite lozinku za %s"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Saradnik"
+#~ msgid "Enter password"
+#~ msgstr "Unesite lozinku"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "NiÅta"
+#~ msgid "Owner"
+#~ msgstr "Vlasnik"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "PrilagoÄeno"
+#~ msgid "Publishing Editor"
+#~ msgstr "UreÄivaÄ za objavljivanje"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "OpÅta greÅka"
+#~ msgid "Editor"
+#~ msgstr "UreÄivaÄ"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Fascikla istog imena veÄ postoji"
+#~ msgid "Publishing Author"
+#~ msgstr "Autor za objavljivanje"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Naveden tip fascikle nije ispravan"
+#~ msgid "Author"
+#~ msgstr "Autor"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O greÅka"
+#~ msgid "Non-editing Author"
+#~ msgstr "Autor koji ne ureÄuje"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Nema dovoljno prostora za pravljenje fascikle"
+#~ msgid "Reviewer"
+#~ msgstr "Recenzent"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Fascikla nije prazna"
+#~ msgid "Contributor"
+#~ msgstr "Saradnik"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Navedena fascikla nije pronaÄena"
+#~ msgid "None"
+#~ msgstr "NiÅta"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije primenjena u ovoj ostavi"
+#~ msgid "Custom"
+#~ msgstr "PrilagoÄeno"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Operacija nije podrÅana"
+#~ msgid "Generic error"
+#~ msgstr "OpÅta greÅka"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Navedeni tip u ovoj ostavi nije podrÅan"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Fascikla istog imena veÄ postoji"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Navedena fascikla ne moÅe biti izmenjena niti uklonjena"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Naveden tip fascikle nije ispravan"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Nije moguÄe napraviti fasciklu tako da se nalazi u njoj samoj"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nema dovoljno prostora za pravljenje fascikle"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Nije moguÄe napraviti fasciklu toga imena"
+#~ msgid "The folder is not empty"
+#~ msgstr "Fascikla nije prazna"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ova operacija ne moÅe biti izvedena u reÅimu van mreÅe."
+#~ msgid "The specified folder was not found"
+#~ msgstr "Navedena fascikla nije pronaÄena"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "Fascikle Äiji je vlasnik %s"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija nije primenjena u ovoj ostavi"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "LiÄne fascikle"
+#~ msgid "Operation not supported"
+#~ msgstr "Operacija nije podrÅana"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Omiljene javne fascikle"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Navedeni tip u ovoj ostavi nije podrÅan"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Sve javne fascikle"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Navedena fascikla ne moÅe biti izmenjena niti uklonjena"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Globalna lista adresa"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Nije moguÄe napraviti fasciklu tako da se nalazi u njoj samoj"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Obrisani predmeti"
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nije moguÄe napraviti fasciklu toga imena"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ova operacija ne moÅe biti izvedena u reÅimu van mreÅe."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "BeleÅke"
+#~ msgid "%s's Folders"
+#~ msgstr "Fascikle Äiji je vlasnik %s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Odlazna"
+#~ msgid "Personal Folders"
+#~ msgstr "LiÄne fascikle"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslati predmeti"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Omiljene javne fascikle"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ZaduÅenja"
+#~ msgid "All Public Folders"
+#~ msgstr "Sve javne fascikle"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Neispravno povezivanje"
+#~ msgid "Global Address List"
+#~ msgstr "Globalna lista adresa"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Neispravan odgovor servera"
+#~ msgid "Deleted Items"
+#~ msgstr "Obrisani predmeti"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Nema odgovora servera"
+#~ msgid "Journal"
+#~ msgstr "Dnevnik"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "LoÅ parametar"
+#~ msgid "Notes"
+#~ msgstr "BeleÅke"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "PodrÅka datoteke adresara za Evoluciju"
+#~ msgid "Outbox"
+#~ msgstr "Odlazna"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Datoteka kalendara i webcal podrÅka za Evoluciju"
+#~ msgid "Sent Items"
+#~ msgstr "Poslati predmeti"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Servis za proveru suÄelja Servera podataka Evolucije"
+#~ msgid "Tasks"
+#~ msgstr "ZaduÅenja"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servis za prijavu Servera podataka Evolucije"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "PodrÅka datoteke adresara za Evoluciju"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazati prozorÄe za greÅke\n"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Datoteka kalendara i webcal podrÅka za Evoluciju"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Servis za proveru suÄelja Servera podataka Evolucije"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Servis za prijavu Servera podataka Evolucije"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazati "
+#~ "prozorÄe za greÅke\n"
 
 #~ msgid "Fair"
 #~ msgstr "Äisto"
+
 #~ msgid "Snow showers"
 #~ msgstr "MeÄava"
+
 #~ msgid "Snow"
 #~ msgstr "Sneg"
+
 #~ msgid "Partly cloudy"
 #~ msgstr "MestimiÄno oblaÄno"
+
 #~ msgid "Smoke"
 #~ msgstr "Dim"
+
 #~ msgid "Thunderstorms"
 #~ msgstr "Grmljavine"
+
 #~ msgid "Cloudy"
 #~ msgstr "OblaÄno"
+
 #~ msgid "Drizzle"
 #~ msgstr "Slaba kiÅa"
+
 #~ msgid "Sunny"
 #~ msgstr "SunÄano"
+
 #~ msgid "Dust"
 #~ msgstr "PraÅina"
+
 #~ msgid "Clear"
 #~ msgstr "Vedro"
+
 #~ msgid "Mostly cloudy"
 #~ msgstr "PreteÅno oblaÄno"
+
 #~ msgid "Windy"
 #~ msgstr "Vetrovito"
+
 #~ msgid "Rain showers"
 #~ msgstr "Jaka kiÅa"
+
 #~ msgid "Foggy"
 #~ msgstr "Maglovito"
+
 #~ msgid "Rain/snow mixed"
 #~ msgstr "KiÅa i sneg"
+
 #~ msgid "Sleet"
 #~ msgstr "KiÅa praÄena snegom"
+
 #~ msgid "Very hot/humid"
 #~ msgstr "Veoma toplo/vlaÅno"
+
 #~ msgid "Blizzard"
 #~ msgstr "Ledena oluja"
+
 #~ msgid "Freezing rain"
 #~ msgstr "Ledena kiÅa"
+
 #~ msgid "Haze"
 #~ msgstr "Izmaglica"
+
 #~ msgid "Blowing snow"
 #~ msgstr "SneÅni naleti"
+
 #~ msgid "Freezing drizzle"
 #~ msgstr "Ledena slaba kiÅa"
+
 #~ msgid "Very cold/wind chill"
 #~ msgstr "Veoma hladno/vetrovito"
+
 #~ msgid "Rain"
 #~ msgstr "KiÅa"
+
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "Vreme: mestimiÄno oblaÄno"
+
 #~ msgid "%.1fÂC - %s"
 #~ msgstr "%.1fÂC - %s"
+
 #~ msgid "%.1fÂF - %s"
 #~ msgstr "%.1fÂF - %s"
+
 #~ msgid "%.1f/%.1fÂC - %s"
 #~ msgstr "%.1f/%.1fÂC - %s"
+
 #~ msgid "%.1f/%.1fÂF - %s"
 #~ msgstr "%.1f/%.1fÂF - %s"
+
 #~ msgid "%d%% chance of precipitation\n"
 #~ msgstr "Åansa od %d%% za padavine\n"
+
 #~ msgid "%.1fcm snow\n"
 #~ msgstr "%.1fcm sneg\n"
+
 #~ msgid "%.1fin snow\n"
 #~ msgstr "%.1fin sneg\n"
+
 #~ msgid "%.1f-%.1fcm snow\n"
 #~ msgstr "%.1f-%.1fcm sneg\n"
+
 #~ msgid "%.1f-%.1fin snow\n"
 #~ msgstr "%.1f-%.1fin sneg\n"
+
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "Neuspelo pravljenje sadrÅanog procesa â%sâ: %s"
+
 #~ msgid "Performing query on unknown header: %s"
 #~ msgstr "IzvrÅavanje pretrage na nepoznatom zaglavlju: %s"
+
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "Dekodiranje neuspelo, greÅka %d"
+
 #~ msgid "Cannot find certificate for `%s'"
 #~ msgstr "Nije moguÄe naÄi sertifikat za â%sâ"
+
 #~ msgid "%sPlease enter the GroupWise password for %s %s"
 #~ msgstr "%sUnesite Groupwise lozinku za %s %s"
+
 #~ msgid "Unable to authenticate to GroupWise server. "
 #~ msgstr "Nije moguÄa autentifikacija na GroupWise server."
+
 #~ msgid "Folder was destroyed and recreated on server."
 #~ msgstr "Fascikla je uniÅtena i ponovo na serveru napravljena."
+
 #~ msgid ""
 #~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
 #~ msgstr "NeoÄekivan odgovor servera: istovetni JIB za poruke %d i %d"
+
 #~ msgid "%sPlease enter the IMAP password for %s %s"
 #~ msgstr "%sUnesite IMAP lozinku za %s %s"
+
 #~ msgid "%sPlease enter the IMAP password for %s on host %s"
 #~ msgstr "%sUnesite IMAP lozinku korisnika %s na domaÄinu %s"
+
 #~ msgid "Could not save summary: %s: %s"
 #~ msgstr "Nije moguÄe Äuvanje pregleda: %s: %s"
+
 #~ msgid "Please enter the NNTP password for %s %s"
 #~ msgstr "Unesite NNTP lozinku za %s %s"
+
 #~ msgid "%sPlease enter the SMTP password for %s on host %s"
 #~ msgstr "%sUnesite SMTP lozinku za %s na domaÄinu %s"
+
 #~ msgid "Category _Color"
 #~ msgstr "_Boja kategorije"
+
 #~ msgid "Select User"
 #~ msgstr "Izaberite korisnika"
+
 #~ msgid "Addressbook..."
 #~ msgstr "Adresar..."
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "GreÅka pri pisanju u privremeno poÅtansko sanduÄe: %s"
+
 #~ 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."
+
 #~ msgid "Cannot delete GroupWise folders in offline mode."
 #~ msgstr "Nije moguÄe brisanje GroupWise fascikli u reÅimu van mreÅe."
+
 #~ msgid "Cannot rename GroupWise folders in offline mode."
 #~ msgstr "Nije moguÄe preimenovanje GroupWise fascikli u reÅimu van mreÅe."
+
 #~ msgid "%sEnter password for %s"
 #~ msgstr "%sUnesite lozinku za %s"
+
 #~ msgid ""
 #~ "Could not authenticate to server. (Password incorrect?)\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Nije moguÄa prijava na server. (NetaÄna lozinka?)\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Could not authenticate to server.\n"
 #~ "\n"
@@ -5425,14 +5989,17 @@ msgstr "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazat
 #~ "imena (npr. âDOMEN\\korisnik\").\n"
 #~ "Ili ste moÅda samo pogreÅno ukucali lozinku.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox za %s nije na ovom serveru."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "Server '%s' koristi Exchange 5.5 i stoga\n"
 #~ "nije kompatibilan sa Ximian Connector-om"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +6008,37 @@ msgstr "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazat
 #~ "Nije moguÄe pronaÄi Exchange Web Storage System na %s.\n"
 #~ "Ukoliko OWA radi na drugoj putanji, morate je navesti u\n"
 #~ "podeÅavanju naloga."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "Nema mailbox-a za korisnika %s na %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "Nije moguÄe povezivanje na server %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Nije moguÄe povezivanje na domaÄina"
+
 #~ msgid "Network error"
 #~ msgstr "GreÅka na mreÅi"
+
 #~ msgid "Folder Name"
 #~ msgstr "Ime fascikle"
+
 #~ msgid "Folder Size"
 #~ msgstr "VeliÄina fascikle"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise server %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: otkazan"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: nema dostupnih tvornica za adresu â%sâ"
+
 #~ msgid "File As"
 #~ msgstr "Zavedi kao"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +6047,153 @@ msgstr "DoÅlo je do viÅestrukih prekoraÄenja segmenata; nije moguÄe prikazat
 #~ "Nisam mogao da primenim GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "Nisam mogao da primenim GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "Adresar i kalendar"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "Agent za poÅtu:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "Koristi bezbednu vezu (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "Spisak za overu"
+
 #~ msgid "Server rejected username"
 #~ msgstr "Server je odbio korisnika"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "NeuspeÅno slanje korisniÄkog imena serveru"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "Server je odbio korisnika/lozinku"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "Ne mogu da uÄitam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Ne mogu da saÄuvam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "Datoteka adresara i LDAP podrÅka za Evoluciju"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? oÄekuje 1 argument"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? oÄekuje 1 argument da bude niska"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_add_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba izuzetak poziva Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_commit_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba izuzetak poziva Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba izuzetak poziva Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba izuzetak poziva Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba izuzetak poziva Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba izuzetak poziva Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba izuzetak poziva Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba izuzetak poziva Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba izuzetak poziva Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove na imeniku pre e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "vreme-sada oÄekuje 0 argumenata"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "unesi-vreme oÄekuje da argument 1 bude niz"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "dodaj-vreme oÄekuje 2 argumenta"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "vreme-poÄetka-dana oÄekuje 1 argument"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "vreme-poÄetka-dana oÄekuje da argument 1 bude time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "vreme-kraja-dana oÄekuje 1 argument"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "desi-se-u-periodu? oÄekuje 2 argumenta"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "desi-se-u-periodu? oÄekuje da argument 1 bude time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "desi-se-u-periodu? oÄekuje da argument 2 bude time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "ponavlja-se? ne oÄekuje argumente"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "je-gotov? oÄekuje 0 argumenata"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "gotov-pre? oÄekuje 1 argument"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "gotov-pre? oÄekuje da argument 1 bude time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "Na ovom raÄunaru"



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