[evolution-data-server/gnome-2-30] Updated Serbian translations

From: Miloš Popović <mpopovic src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-2-30] Updated Serbian translations
Date: Wed, 24 Mar 2010 10:19:55 +0000 (UTC)
commit 2c0582dabfd69f99ecde702ccfa614205f11ae3e
Author: Ð?Ð³Ð¾Ñ? Ð?ÐµÑ?Ñ?Ð¾Ñ?Ð¾Ð²Ð¸Ñ? <igor prevod org>
Date:   Wed Mar 24 11:13:49 2010 +0100

    Updated Serbian translations

 po/sr.po       | 3543 +++++++++++++++++++++++++-------------------------------
 po/sr latin po | 3543 +++++++++++++++++++++++++-------------------------------
 2 files changed, 3098 insertions(+), 3988 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 4190689..3a5b518 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,10 +9,10 @@
 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
+"POT-Creation-Date: 2010-03-22 20:40+0000\n"
+"PO-Revision-Date: 2010-03-23 19:32+0100\n"
+"Last-Translator: Ð?Ð³Ð¾Ñ? Ð?ÐµÑ?Ñ?Ð¾Ñ?Ð¾Ð²Ð¸Ñ? <igor prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,206 +20,81 @@ msgstr ""
 "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"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 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/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%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:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ð·ÐµÑ?Ð¸Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð° (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð¸Ñ?Ñ?Ð°ÐºÐ½Ñ?Ñ?Ð¾Ð³ Ð¸Ð¼ÐµÐ½Ð° (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "Ð£ÐºÐ»Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ?Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ?Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 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/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ðµ Ð¿Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñ?Ðµ Ð·Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? â??%s'"
-
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ EBookListener"
-
-#: ../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:3738
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: Ð½ÐµÐ¼Ð° Ð¸Ð·Ð²Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð¸Ð± â??%sâ?? Ñ?Ð¼ÐµÑ?Ñ?ÐµÐ½Ð¾Ð³ Ñ? gconf."
 
 #. 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,809 +102,878 @@ 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. ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "2. ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "3. ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 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. Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½ Ð½Ð° Ð¿Ð¾Ñ?Ð»Ñ?"
 
-#: ../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ÐµÐ»ÐµÑ?Ð¾Ð½ Ð·Ð° Ð¿Ð¾Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../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. ÐºÑ?Ñ?Ð½Ð¸ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../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"
 
-#: ../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:671
 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 ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../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
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "2. Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "3. Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "2. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "3. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "2. ÐºÑ?Ñ?Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "3. ÐºÑ?Ñ?Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Jabber Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "2. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "3. ÐºÑ?Ñ?Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¾ Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¾ Ð¸Ð¼Ðµ Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "1. ÐºÑ?Ñ?Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "2. ÐºÑ?Ñ?Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "3. ÐºÑ?Ñ?Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "1. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "2. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "3. Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ ICQ Ð½Ð°Ð»Ð¾Ð³"
 
 #. 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 "Ð?Ð¸Ñ?Ñ?Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°"
 
 #. 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 "Ð?Ð¸Ñ?Ñ?Ð° ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ¸Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¸Ñ? Ð¸Ð¼ÐµÐ½Ð° Ð·Ð° AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° GroupWise Ð¸Ð±-Ð°"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Jabber Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¸Ñ? Ð¸Ð¼ÐµÐ½Ð° Ð·Ð° Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¸Ñ? Ð¸Ð¼ÐµÐ½Ð° Ð·Ð° MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° ICQ Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Ð?ÐµÐ»Ð¸ HTML Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 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:715
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ð°"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Gadu-Gadu ÐºÑ?Ñ?Ð½Ð¸ Ð?Ð± 1"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Gadu-Gadu ÐºÑ?Ñ?Ð½Ð¸ Ð?Ð± 2"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Gadu-Gadu ÐºÑ?Ñ?Ð½Ð¸ Ð?Ð± 3"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Gadu-Gadu Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Ð?Ð± 1"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Gadu-Gadu Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Ð?Ð± 2"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Gadu-Gadu Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸ Ð?Ð± 3"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "Gadu-Gadu Ð?Ð± Ð»Ð¸Ñ?Ñ?Ð°"
 
 #. 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 ÐºÐ¾Ð´ ÐºÑ?Ñ?Ðµ"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "2. Ð¸Ð¼Ðµ Ð·Ð° Skype ÐºÐ¾Ð´ ÐºÑ?Ñ?Ðµ"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "3. Ð¸Ð¼Ðµ Ð·Ð° Skype ÐºÐ¾Ð´ ÐºÑ?Ñ?Ðµ"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "1. Ð¸Ð¼Ðµ Ð·Ð° Skype Ð½Ð° Ð¿Ð¾Ñ?Ð»Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "2. Ð¸Ð¼Ðµ Ð·Ð° Skype Ð½Ð° Ð¿Ð¾Ñ?Ð»Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "3. Ð¸Ð¼Ðµ Ð·Ð° Skype Ð½Ð° Ð¿Ð¾Ñ?Ð»Ñ?"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ð½Ð°Ð´ÐµÐ½Ñ?Ñ?Ð¸Ñ? Ð¸Ð¼ÐµÐ½Ð° Ð·Ð° Skype"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ð±ÐµÐ· Ð¸Ð¼ÐµÐ½Ð°"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "Ð?Ñ?Ð°Ð·Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð°"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¸Ð·Ð²Ð¾Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#| msgid "Cannot open message"
+msgid "Cannot open book"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ ÐºÑ?Ð¸Ð³Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ ÐºÑ?Ð¸Ð³Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "Ð?Ñ?Ð°Ð·Ð°Ð½ Ñ?Ð¿Ð¸Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ¾Ð²Ð°Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+#| msgid "Cannot add encryption certificate"
+msgid "Cannot add contact"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+#| msgid "Cannot create encoder context"
+msgid "Cannot modify contact"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+#| msgid "Cannot create encoder context"
+msgid "Cannot remove contacts"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ð¿Ð¸Ñ?"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+#| msgid "Could not cancel operation"
+msgid "Cannot complete operation"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ð°: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸Ð· ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°: Ð»Ð¾Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 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
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ð¾Ñ?Ñ?Ð°Ð²Ñ?"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
 msgid "Could not create thread for populating cache"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð¸Ð· Ð·Ð° Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ñ?Ñ?Ð°Ð²Ðµ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?: Ð·Ð° "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?: ÐºÐ°Ð´Ð° Ñ?Ðµ Ð·Ð³Ð¾Ð´Ð½Ð¾"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:280
 #, c-format
 msgid "Loading %s items"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ %s Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð°"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:944
 msgid "Calendar"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
 msgid "Invalid server URI"
 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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¼ÐµÑ?ÐµÐ½Ð¾ Ð½Ð° Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "Ð?Ð¾Ñ? Ð¾Ð±Ð»Ð¸Ðº Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "Ð?Ð¸Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¼Ð°Ð³Ð»Ð°"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¾Ð±Ð»Ð°Ñ?Ð½Ð° Ð½Ð¾Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¼ÐµÑ?Ñ?Ð¸Ð¼Ð¸Ñ?Ð½Ð¾ Ð¾Ð±Ð»Ð°Ñ?Ð½Ð¾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð¿Ñ?Ñ?Ñ?Ð°Ðº"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ð½ÐµÐ³"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ñ?Ð½Ñ?Ð°Ð½Ð¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð²ÐµÐ´Ñ?Ð° Ð½Ð¾Ñ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ñ?Ñ?Ð½Ñ?Ð°Ð½Ð¾"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð³Ñ?Ð¼Ñ?Ð°Ð²Ð¸Ð½Ðµ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "Ð?Ñ?Ð¾Ð³Ð½Ð¾Ð·Ð°"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "Ð?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:688
+#: ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "Ð?Ð¸Ñ?Ð¾ÐºÐ¾"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:690
+#: ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð°Ð»Ð½Ð¾"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:692
+#: ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "Ð?Ð¸Ñ?ÐºÐ¾"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "Ð?ÐµÐ´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../calendar/libecal/e-cal.c:1677
+#: ../calendar/libecal/e-cal.c:1173
 #: ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1039,245 +983,391 @@ 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:1187
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð±Ð¸Ð¾ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½ Ð·Ð° %s"
 
-#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libecal/e-cal.c:3996
 msgid "Invalid argument"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:3998
 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:4000
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 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:4002
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 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:4004
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../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:4006
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ?"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4008
 msgid "URI not loaded"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4010
 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
+#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 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:4014
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../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:4016
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "Ð?Ð? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4018
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð» Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4020
 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:4022
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 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:4026
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Ð?Ð±Ð°Ð²ÐµÐ·Ð½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:4028
 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
+#: ../calendar/libecal/e-cal.c:4030
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:523
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
+#: ../camel/providers/imap/camel-imap-store.c:741
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 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:4032
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 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â??"
 
-#: ../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)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð¿Ñ?ÐµÐ³"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¾ Ð¿Ð¾Ñ?Ðµ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ Ð¼ÐµÑ?Ð¾Ð´"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "Ð?ÐµÐ¼Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ Ð¼ÐµÑ?Ð¾Ð´ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "Ð Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "Ð?Ñ?ÐµÐ¼Ð°Ñ?ÐµÐ½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "Ð?Ñ?Ñ?ÐµÐºÐ»Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ð¿Ð¸Ñ?"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "Ð£Ð¿Ð¸Ñ? Ð¾Ð´Ð±Ð¸Ñ?ÐµÐ½"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar address"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+#| msgid "Cannot save calendar data: Malformed URI."
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? Ð·Ð° Ð°Ð»Ð°Ñ?Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ ldap Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ñ?Ð°Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÑ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð´Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ð°Ð»Ð°Ñ?Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÑ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve default calendar object path"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ñ? Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:781
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¾Ð±Ñ?ÐµÐºÐ°Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment list"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not complete calendar query"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ? Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:877
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:895
+#, c-format
+#| msgid "Could not cancel operation"
+msgid "Could not add calendar time zone"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal.c:933
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar changes"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð½Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+#| msgid "Invalid server URI"
+msgid "Invalid URI"
+msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð°"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¾Ð³ Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ð° Ð·Ð° â??%sâ?? Ð¾Ð´ â??%sâ??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ?"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "Ð£Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ?ÐµÐ½Ð¸ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
@@ -1318,7 +1408,7 @@ msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ ÐºÑ?Ñ?Ñ?ÐµÐ²Ðµ Ñ?Ð°
 msgid "You may not export keys with this cipher"
 msgstr "Ð?Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¸Ð·Ð²ÐµÐ·ÐµÑ?Ðµ ÐºÑ?Ñ?Ñ?ÐµÐ²Ðµ Ñ?Ð° Ð¾Ð²Ð¸Ð¼ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð¾Ð¼"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð·Ð° Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?Ñ?Ð²Ð°Ñ?Ðµ"
 
@@ -1327,11 +1417,11 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ñ?Ñ?Ð°Ñ?Ñ? Ð·Ð° Ð¿Ñ?Ð¸Ð²Ñ?Ðµ
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ñ?Ð½Ð¾Ñ? Ð¸Ð· Ð¾Ñ?Ñ?Ð°Ð²Ðµ: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-db.c:416
 msgid "Insufficient memory"
 msgstr "Ð?ÐµÐ´Ð¾Ð²Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÐ¼Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1342,8 +1432,8 @@ msgstr ""
 "Ð?Ð°Ñ?Ðµ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð²Ñ?Ñ?ÐµÐ½Ðµ ÐºÐ°Ð´Ð°\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:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1354,131 +1444,134 @@ msgstr ""
 "%s\n"
 "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?ÐºÐ»Ð°Ñ?ÐµÐ½Ðµ."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ñ?Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼"
 
 #: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
+#: ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
 #: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð½Ð¾Ð²Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, 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
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imapx/camel-imapx-store.c:620
+#: ../camel/providers/imapx/camel-imapx-store.c:650
 msgid "You must be working online to complete this operation"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð±Ñ?Ð´ÐµÑ?Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸ Ð´Ð° Ð±Ð¸ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð»Ð¸ Ð¾Ð²Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ð¾Ð¿Ð¸Ñ?Ð°"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794
+#: ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ð° â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð½Ð¸Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¼Ñ?ÐµÐ½ Ð¾Ð´ %s: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121
+#: ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130
+#: ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ðµ"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ðµ"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1264
 #, 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:1278
+#: ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282
+#: ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %d Ð¾Ð´ %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %d Ð¾Ð´ %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸ Ð·Ð° (Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐ°-Ð¾Ð·Ð½Ð°ÐºÐ°)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 msgid "Invalid arguments to (user-tag)"
 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:735
+#: ../camel/camel-filter-search.c:743
 #, 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:455
+#: ../camel/camel-folder-search.c:610
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1488,8 +1581,8 @@ msgstr ""
 "%s"
 
 #: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:620
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1498,54 +1591,55 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð¸Ð·Ñ?Ð°Ð·Ð° Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:812
+#: ../camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ñ?Ð°Ð¼Ð¾ Ñ?ÐµÐ´Ð°Ð½ Ð»Ð¾Ð³Ð¸Ñ?ÐºÐ¸ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:907
 #, 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:913
+#: ../camel/camel-folder-search.c:920
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð½Ð¸Ñ?ÐºÑ? Ñ?Ð° Ñ?Ð¸Ð¿Ð¾Ð¼ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ð°"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) Ð¾Ñ?ÐµÐºÑ?Ñ?Ðµ Ð½Ð¸Ð· ÐºÐ°Ð¾ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ñ?ÐºÑ?Ð¿ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:690
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°: Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð·Ð° %s"
 
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1401
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°: Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð¿Ð¾ Ð¸Ð·Ñ?Ð°Ð·Ñ?: Ð·Ð° %s"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1442
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°: Ð¿Ñ?ÐµÐ±Ñ?Ð¾Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾ Ð¸Ð·Ñ?Ð°Ð·Ñ?: Ð·Ð° %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1483
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°: Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð¿Ð¾ Ð?Ð?Ð?: Ð·Ð° %s"
 
 #: ../camel/camel-folder.c:1596
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
@@ -1553,19 +1647,19 @@ msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 msgid "Copying messages"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1945
 msgid "Learning junk"
 msgstr "Ð£Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð° Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1963
 msgid "Learning non-junk"
 msgstr "Ð£Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ(Ð°)"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1576,16 +1670,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ gpg userid Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð·Ð° gpg Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1594,7 +1688,7 @@ msgstr ""
 "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ð?Ð°Ð¼ Ñ?Ðµ Ð?Ð?Ð? Ð·Ð° Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ ÐºÑ?Ñ?Ñ?Ð° Ð·Ð°\n"
 "SmartCard: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1603,109 +1697,105 @@ msgstr ""
 "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð?Ð°Ð¼ Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð·Ð° Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ ÐºÑ?Ñ?Ñ?Ð°\n"
 "ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð·Ð°Ñ?Ñ?ÐµÐ² Ð¾Ð´ GnuPG-Ð° Ð·Ð° â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
+#: ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:1113
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "Ð?Ð´Ñ?Ñ?Ñ?Ð°Ñ?Ð¾."
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ð½Ð¾Ð³ ÐºÑ?Ñ?Ñ?Ð°: Ñ?Ð½ÐµÑ?Ðµ Ñ?Ñ? 3 Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ð´ GnuPG-Ð°: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ: Ð½Ð¸Ñ?Ñ? Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸."
 
 #. 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:1262
+#: ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953
+#: ../camel/camel-gpg-context.c:1998
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355
+#: ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð·Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ: %s"
 
-#: ../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:1402
+#: ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646
+#: ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
 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
+#: ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546
+#: ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929
+#: ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð±Ð»Ð¸Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?: %s"
 
-#: ../camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1761
 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:1814
+#: ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´ÐµÑ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð±Ð»Ð¸Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´ÐµÑ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ð¸ MIME Ð´ÐµÐ¾: Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ñ?"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:1909
+#: ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?"
 
-#: ../camel/camel-gpg-context.c:1827
+#: ../camel/camel-gpg-context.c:1930
 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
+#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1999
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Unknown"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¾"
 
@@ -1719,13 +1809,13 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð²ÐµÐ·Ñ? ÐºÐ° Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº
 msgid "Cannot fork locking helper: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸ÐºÐ° Ð·Ð°ÐºÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203
+#: ../camel/camel-lock-client.c:226
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð°Ñ?Ð¸ â??%sâ??: Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ñ? Ñ?Ð° Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸ÐºÐ¾Ð¼ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð°Ñ?Ð¸ â??%sâ??"
@@ -1805,56 +1895,56 @@ msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¸Ñ?Ð°Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ 
 msgid "Error copying mail temp file: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 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
+#: ../camel/camel-net-utils.c:503
+#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:817
+#: ../camel/providers/pop3/camel-pop3-store.c:478
+#: ../camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "Ð?Ð´Ñ?Ñ?Ñ?Ð°Ñ?Ð¾"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:523
 msgid "cannot create thread"
 msgstr "Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð½Ð¸Ð·Ð°"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:682
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ð?Ð°Ð»Ð°Ð¶ÐµÑ?Ðµ: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:704
 msgid "Host lookup failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ñ?Ð°Ð¶ÐµÑ?Ðµ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð°"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ñ?Ð°Ð¶ÐµÑ?Ðµ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð°: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:821
 msgid "Resolving address"
 msgstr "Ð?Ð°Ð»Ð°Ð¶ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:841
 msgid "Name lookup failed"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÑ?Ðµ Ð¸Ð¼ÐµÐ½Ð° Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:844
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÑ?Ðµ Ð¸Ð¼ÐµÐ½Ð° Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ â??%sâ?? Ñ?Ð° Ð´Ð¸Ñ?ÐºÐ¾Ð¼"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159
+#: ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð½Ð¾Ñ? Ñ? Ð´Ð½ÐµÐ²Ð½Ð¸Ðº Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: %s"
@@ -1882,26 +1972,26 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ %s: Ð½ÐµÐ¼Ð° ÐºÐ¾Ð´Ð° Ð·Ð° Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ñ? Ð¼Ð¾Ð´Ñ?Ð»Ñ?."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379
+#: ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ð¿Ð¾Ð½Ñ?Ñ?Ð°Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð» â??%sâ??"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ðµ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ."
 
-#: ../camel/camel-sasl-anonymous.c:124
+#: ../camel/camel-sasl-anonymous.c:121
 #: ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1910,7 +2000,7 @@ msgstr ""
 "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ð¿Ð¾Ñ?ÐµÐºÐ»Ñ? ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2009,7 @@ msgstr ""
 "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ñ?Ð»Ð¾Ð¶ÐµÐ½Ð¾Ð¼ Ð¿Ð¾Ñ?ÐµÐºÐ»Ñ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1944,108 +2034,90 @@ msgstr "DIGEST-MD5"
 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:845
+#: ../camel/camel-sasl-digest-md5.c:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Ð£Ð¿Ð¸Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ñ?Ð²Ð¸Ñ?Ðµ Ð´Ñ?Ð³ (>2048 Ð¾ÐºÑ?ÐµÑ?Ð°)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "Ð£Ð¿Ð¸Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Ð£Ð¿Ð¸Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð¾ Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ â??Ð?Ð²Ð°Ð»Ð¸Ñ?ÐµÑ? Ð·Ð°Ñ?Ñ?Ð¸Ñ?Ðµâ?? Ñ?Ð½Ð¾Ñ?"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð¾ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð°Ñ?Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð¾ Ð½ÐµÐºÐ¾Ð¼Ð¿Ð»ÐµÑ?Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð°Ñ?Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ð¸"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ðµ Ð½Ðµ Ñ?Ð»Ð°Ð¶Ðµ"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Kerberos 5 Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:168
 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:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Ð?Ð¾Ð½Ñ?Ñ?ÐµÐ½Ð¸ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ð°Ñ? target_name Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¾Ð±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:176
 msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr "Ð?Ð¾Ð½Ñ?Ñ?ÐµÐ½Ð¸ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ð°Ñ? target_name Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð¾ Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¸Ð»Ð¸ Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ Ñ?Ð¸Ð¿ Ð¸Ð¼ÐµÐ½Ð°."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:180
 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
+#: ../camel/camel-sasl-gssapi.c:185
 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
+#: ../camel/camel-sasl-gssapi.c:189
 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:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Ð?Ñ?Ñ?Ð¶ÐµÐ½ Ð½Ð¾Ñ?Ð°Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ð¸Ð²Ð°Ð¾ Ð½Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ñ?ÐµÐ»Ð¾Ð²Ð¸Ñ?Ð¾Ñ?Ñ?Ð¸ Ð½Ð° input_token."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ñ?ÐµÐ»Ð¾Ð²Ð¸Ñ?Ð¾Ñ?Ñ?Ð¸ Ð½Ð° Ñ?Ð²ÐµÑ?ÐµÑ?Ð¸Ð¼Ð°."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:203
 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:209
+#: ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358
+#: ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "Ð?Ð¾Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ? Ð¾Ð´ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
 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
 msgid "Login"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð°"
@@ -2055,7 +2127,7 @@ msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð°"
 msgid "This option will connect to the server using a simple password."
 msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð¾Ð±Ð¸Ñ?Ð½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
 msgid "Unknown authentication state."
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ."
 
@@ -2091,27 +2163,27 @@ msgstr "POP Ð¿Ñ?Ðµ SMTP auth ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¾Ð³ Ñ?Ñ?Ð°Ð½
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Ð¿Ñ?Ðµ SMTP auth ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð¸Ð·Ð²Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸ Ð½Ð¸Ñ?Ðµ pop"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?ÐµÐ²Ð¾Ñ?ÐµÑ?Ðµ Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¾Ð³ Ð¸Ð·Ñ?Ð°Ð·Ð°: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° â??%sâ?? Ñ?Ñ?Ð°Ð¶Ð¸ Ð´ÐµÐ¾ Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸Ð¼ Ð¸Ð¼ÐµÐ½Ð¾Ð¼"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° â??%sâ?? Ñ?Ñ?Ð°Ð¶Ð¸ Ð´ÐµÐ¾ Ñ?Ð° Ð¸Ð¼ÐµÐ½Ð¾Ð¼ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð°"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° â??%sâ?? Ñ?Ñ?Ð°Ð¶Ð¸ Ð´ÐµÐ¾ Ñ?Ð° Ð¿Ñ?Ñ?Ð°Ñ?Ð¾Ð¼"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2120,225 +2192,225 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:484
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ %s Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s Ð½Ð° Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ñ? %s."
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:832
 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:447
+#: ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ð¶ÐµÑ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° â??%sâ??"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ CMS Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ CMS Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ðµ CMS Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶Ð¸Ñ?Ð¸ CMS Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾ CMS Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸ÐºÑ?"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ð¶ÐµÑ?Ðµ Ð»Ð°Ð½Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° CMS Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ â??%sâ?? Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð° SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð°Ñ?Ñ?Ð¸Ð±Ñ?Ñ?Ð° MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° Ð¾ CMS Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸ÐºÑ?"
 
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ ÐºÐ¾Ð½Ñ?ÐµÐºÑ?Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ."
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? CMS ÐµÐ½ÐºÐ¾Ð´ÐµÑ?"
 
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627
+#: ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "Ð?ÐµÐ¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "Ð?Ð¾Ð±Ð°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "Ð?Ð¾Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½ Ð¸Ð»Ð¸ Ð¾Ñ?Ñ?ÐµÑ?ÐµÐ½ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ½"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÑ?Ñ?Ð¸Ð²"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "Ð?Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "Ð?Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð´Ð¸"
 
 # Ñ?Ð¼, Ñ?Ð¼...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¾Ð³ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ñ?"
 
 # Ñ?Ð¼, Ð¼Ð¾Ð¶Ðµ Ñ?Ð¾ Ð¸ Ð±Ð¾Ñ?Ðµ Ð¾Ð´ â??Ð¾ÐºÑ?Ñ?Ð¶ÐµÐ½Ð¸Ñ?â??...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ? Ð·Ð±Ð¸Ñ?ÐºÐµ Ð¸Ð· Ð¾ÐºÑ?Ñ?Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790
+#: ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ñ?Ð°Ñ?Ñ?Ð½Ð°Ñ?Ð¸ Ð·Ð±Ð¸Ñ?ÐºÐµ"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð·Ð±Ð¸Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821
+#: ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ¾ Ñ?Ð²Ð¾Ð· Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð¸Ð¼Ð° Ñ?Ð°Ð¼Ð¾ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?, Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð¸Ð¼Ð° Ñ?Ð°Ð¼Ð¾ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?, Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸ Ñ?Ð²ÐµÐ·ÐµÐ½Ð¸ Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ð¸"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸ Ð·Ð±Ð¸Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, 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:960
+#: ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´ÐµÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸ Ð¾Ð¿Ñ?Ñ?Ð¸ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð³Ð¾Ð¼Ð¸Ð»Ðµ"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ Ð¼ÐµÑ?Ñ?Ð¾ ÐºÑ?Ñ?Ñ?Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð³Ð¾Ð¼Ð¸Ð»Ðµ"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ CMS Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð°Ñ?Ðµ CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð°Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ñ?Ð° CMS Ð¿Ð¾Ð´Ð°Ñ?Ð¸Ð¼Ð°"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ CMS Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° Ð¾ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ CMS Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ñ?"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? ÐµÐ½ÐºÐ¾Ð´ÐµÑ?"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Ð´ÐµÑ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ: Ð½Ð¸Ñ?Ñ? Ð½Ð°Ñ?ÐµÐ½Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../camel/camel-smime-context.c:1199
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "Ñ?Ð²Ð¾Ð· ÐºÑ?Ñ?Ñ?ÐµÐ²Ð°: Ð½ÐµÐ¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾"
 
-#: ../camel/camel-smime-context.c:1207
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "Ð¸Ð·Ð²Ð¾Ð· ÐºÑ?Ñ?Ñ?ÐµÐ²Ð°: Ð½ÐµÐ¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°"
 
@@ -2357,150 +2429,32 @@ msgid "Cannot create folder: %s: folder exists"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
 #: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
+#: ../camel/camel-vee-store.c:377
 #: ../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/camel-vee-store.c:414
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
+#: ../camel/camel-store.c:900
 #: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "Ð¡Ð¼ÐµÑ?Ðµ"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
+#: ../camel/camel-store.c:903
 #: ../camel/camel-vtrash-folder.c:56
 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-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL Ñ?Ðµ Ð¸Ñ?Ñ?ÐµÐºÐ°Ð¾"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Ð?ÐµÐ¼Ð° Ð²Ð¸Ñ?Ðµ Ð¼ÐµÐ¼Ð¾Ñ?Ð¸Ñ?Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Ð¡Ð°Ð¼Ð¾Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ñ?Ðµ Ð½Ñ?Ð»Ñ?Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Ð¡Ð°Ð¼Ð¾Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ñ? Ð»Ð°Ð½Ñ?Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð´Ð°Ð²Ð°Ñ?ÐµÐ² Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ? Ð»Ð¸Ñ?Ñ?Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Ð?Ð°Ð½Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð³Ð°Ñ?Ð°Ðº"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Ð?Ð¾Ð²Ñ?Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¸Ð·Ð´Ð°Ð²Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Ð?Ñ?ÐµÐ¼Ð°Ñ?ÐµÐ½Ð° Ð´Ñ?Ð¶Ð¸Ð½Ð° Ð¿Ñ?Ñ?Ð°Ñ?Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ð²Ñ?Ñ?Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Ð?ÐµÐ¿Ð¾Ð²ÐµÑ?Ñ?Ð¸Ð² Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Ð?Ð´Ð±Ð¸Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð²/Ð¸Ð·Ð´Ð°Ð²Ð°Ñ? Ð½ÐµÑ?Ð»Ð°Ð³Ð°Ñ?Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID Ð½ÐµÑ?Ð»Ð°Ð³Ð°Ñ?Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/Ð¸Ð·Ð´Ð°Ð²Ð°Ñ? Ñ?ÐµÑ?Ð¸Ñ?Ñ?ÐºÐ¾ Ð½ÐµÑ?Ð»Ð°Ð³Ð°Ñ?Ðµ"
-
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Ð£Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð° ÐºÑ?Ñ?Ñ?Ð° Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð¼"
-
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°"
-
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2467,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:876
 msgid "GOOD"
 msgstr "Ð?Ð?Ð?Ð Ð?"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:876
 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:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2558,7 +2491,7 @@ msgstr ""
 "\n"
 "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ðµ?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2567,7 +2500,7 @@ msgstr ""
 "Ð?Ñ?Ð¾Ð±Ð»ÐµÐ¼ Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð¼: %s\n"
 "Ð?Ð·Ð´Ð°Ð²Ð°Ñ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2576,7 +2509,7 @@ msgstr ""
 "Ð?Ð¾Ñ? Ð´Ð¾Ð¼ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°: %s\n"
 "Ð?Ð·Ð´Ð°Ð²Ð°Ñ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2585,7 +2518,7 @@ msgstr ""
 "Ð?Ñ?Ñ?ÐµÐºÐ°Ð¾ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?: %s\n"
 "Ð?Ð·Ð´Ð°Ð²Ð°Ñ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2599,33 +2532,33 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ñ? â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¼ÐµÑ?Ñ?Ð°Ñ?Ñ? â??%sâ??: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %s Ñ? %s"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:813
+#: ../camel/camel-vee-folder.c:819
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð²Ð¸Ñ?Ñ?Ñ?ÐµÐ»Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
+#: ../camel/camel-vee-store.c:113
 #: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "Ð?ÐµÐ¿Ð¾ÐºÐ»Ð¾Ð¿Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: Ð½ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ð¸ Ð¸Ð¼Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸: %s: Ð½ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
@@ -2638,7 +2571,7 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2647,21 +2580,22 @@ 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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
 # Ð?Ð²Ð¾ Ñ?Ðµ Ð±Ð¸Ð»Ð¾ "ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ð½Ð¸Ñ?Ñ?ÐµÐ½", Ð°Ð»Ð¸ Ð¼Ð¸Ñ?Ð»Ð¸Ð¼ Ð´Ð° Ñ?Ðµ Ð¾Ð²Ð¾ Ð¸Ð¿Ð°Ðº Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ñ?Ðµ
-#: ../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/groupwise/camel-groupwise-folder.c:149
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2669,12 +2603,12 @@ msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgid "User canceled"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¾Ð´Ñ?Ñ?Ñ?Ð°Ð¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../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/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2684,281 +2618,302 @@ msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¾Ð´Ñ?Ñ?Ñ?Ð°Ð¾"
 msgid "Cannot get message %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? %s: %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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../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:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
 msgid "Could not get message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð·Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, c-format
+#| msgid "Checking for new messages"
+msgid "Checking for deleted messages %s"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
 msgid "Trash Folder Full. Please Empty."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð·Ð° Ñ?Ð¼ÐµÑ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð½Ð°. Ð?Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸Ñ?Ðµ Ñ?Ðµ."
 
-#: ../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:1564
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Ð?Ñ?Ð¸ÐºÑ?Ð¿Ñ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %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:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ: Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð¾Ñ?Ñ?Ð°Ð²Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
+#: ../camel/providers/imap4/camel-imap4-journal.c:327
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð° Ð½Ð¾Ð²Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "Ð?Ñ?Ð¾_Ð²ÐµÑ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð²Ð¸Ð¼ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 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:63
 msgid "Check new messages for J_unk contents"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð½ÐµÐ¼Ð° Ñ?_Ñ?Ð±Ñ?ÐµÑ?Ð° Ð¼ÐµÑ?Ñ? Ð½Ð¾Ð²Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 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:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?_Ñ?ÐºÐ»Ð°Ð´Ð¸ Ð½Ð°Ð»Ð¾Ð³ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
 msgstr "SOAP Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Ð?Ð¾Ñ?Ñ? Ð¡Ð?Ð?Ð? Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Ð?Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð°Ñ?Ðµ Novell Groupwise Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸Ð¼Ð°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../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/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ñ? Ð¾Ð±Ð¸Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐºÑ?Ñ?Ñ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
 msgstr "Ð?Ð¾Ð¼Ð°Ñ?Ð¸Ð½ Ð¸Ð»Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð½Ð¸Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imapx/camel-imapx-server.c:2302
 msgid "You did not enter a password."
 msgstr "Ð?Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
 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:533
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:331
 #, c-format
 msgid "No such folder %s"
 msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ GroupWise Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../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:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/imapx/camel-imapx-store.c:687
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ð?Ð»Ð°Ð²Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ? Ñ?ÐµÐ±Ð¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ GroupWise Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%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:1349
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð·Ð° %s Ð½Ð° %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise Ð´Ð¾Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐºÐ¾ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 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:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð° Ð½Ð¾Ð²Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "Connection to Server"
 msgstr "Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Use custom command to connect to server"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ? Ð·Ð° Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Command:"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð°:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "Ð?Ñ?Ð¸Ðº_Ð°Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "O_verride server-supplied folder namespace"
 msgstr "Ð?_Ñ?ÐµÐ¼Ð¾Ñ?Ñ?Ð¸ Ð¾Ð±Ð»Ð¸Ðº Ð¸Ð¼ÐµÐ½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ ÐºÐ¾Ñ?Ðµ Ð´Ð°Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "Ð?Ð±Ð»Ð¸Ðº Ð¸Ð¼ÐµÐ½Ð°"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "Ð¥Ñ?Ð»Ð°"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Ð?Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð°Ñ?Ðµ Ð¥Ñ?Ð»Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸Ð¼Ð°"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../camel/providers/hula/camel-hula-provider.c:95
 msgid "This option will connect to the Hula server using a plaintext password."
 msgstr "Ð?Ð²Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð±ÐµÐ·Ð±ÐµÑ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¥Ñ?Ð»Ð° Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ñ? Ð¾Ð±Ð¸Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐºÑ?Ñ?Ñ?."
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 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:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 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:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð°"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, 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:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2967,131 +2922,139 @@ msgstr ""
 "Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ Ð¾Ð´ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ð´ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° IMAP ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð¾ %s Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð£ Ñ?ÐµÐ´Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ð´ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "Ð£Ð²ÐµÐº Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %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:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð·Ð° Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° Ñ? %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð° â??%sâ??â?? Ð½Ð°ÐºÐ¾Ð½ Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1965
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "Ð?ÐµÐ¼Ð° Ð¾Ð´Ð·Ð¸Ð²Ð° Ð½Ð°ÐºÐ¾Ð½ Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ñ?Ð°Ð²Ð¸Ð»Ð° Ñ?Ð¾ÐºÐ¾Ð¼ Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ APPEND!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imapx/camel-imapx-server.c:3943
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° Ð?Ð? %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:3944
 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:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ð¿Ñ?Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð½Ð¸Ñ?Ñ? Ð´Ð°Ñ?Ð¸ Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÑ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ð¿Ñ?Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: Ð?Ð?Ð? Ð½Ð¸Ñ?Ðµ Ð´Ð°Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÑ? %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ?ÐµÐ»Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? FETCH Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ñ?."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð¾Ñ?Ñ?Ð°Ð²Ðµ: %s"
 
-#: ../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:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?Ñ?Ð²Ð°Ñ?Ðµ %s: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
 msgid "Namespace:"
 msgstr "Ð?Ð±Ð»Ð¸Ðº Ð¸Ð¼ÐµÐ½Ð°:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "Ð?Ñ?Ð¸_Ð¼ÐµÐ½Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ðµ Ð½Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð¡Ð?Ð?Ð?Ð£Ð§Ð?Ð¢Ð£ Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 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/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸ Ñ?Ð´_Ð°Ñ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼"
 
@@ -3100,124 +3063,121 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:92
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Ð?Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ñ?Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð° IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ."
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:108
 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
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP Ñ?ÐµÑ?Ð²ÐµÑ? %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:203
 #, 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:566
+#: ../camel/providers/imap/camel-imap-store.c:581
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %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:567
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:2164
 msgid "Connection cancelled"
 msgstr "Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../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:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2209
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° IMAP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ð¾Ð¼ Ð¼Ð¾Ð´Ñ?: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2210
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¾"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2232
 msgid "SSL negotiations failed"
 msgstr "SSL Ð¿Ñ?ÐµÐ³Ð¾Ð²Ð¾Ñ?Ð¸ Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð¿ÐµÐ»Ð¸"
 
-#: ../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:715
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "SSL Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ñ? Ð¾Ð²Ð¾Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ð¸"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, 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/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/imapx/camel-imapx-store.c:383
+#: ../camel/providers/imapx/camel-imapx-store.c:856
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../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
+#: ../camel/providers/local/camel-spool-store.c:461
 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 "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¾"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ð¸"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP Ñ?ÐµÑ?Ð²ÐµÑ? %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:1313
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð´Ñ?Ñ?ÐºÐµ Ð·Ð° Ñ?Ð¸Ð¿ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-server.c:2328
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3228,380 +3188,385 @@ msgstr ""
 "%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
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imapx/camel-imapx-store.c:672
 #, 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/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../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
+#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imapx/camel-imapx-store.c:680
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:3107
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "Ð?ÐµÐ·Ð° Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼ Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð¸Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð°"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð»Ð°Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
+#: ../camel/providers/imap4/camel-imap4-command.c:681
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð¾Ð´ IMAP4 Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap4/camel-imap4-engine.c:215
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð² Ð¾Ð´ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: %s."
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap4/camel-imap4-engine.c:440
 #, c-format
 msgid "Cannot select folder '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#: ../camel/providers/imap4/camel-imap4-engine.c:446
 #, c-format
 msgid "Cannot select folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#: ../camel/providers/imap4/camel-imap4-engine.c:1414
 #, c-format
 msgid "Failed to send command to IMAP server %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð»Ð°Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:1546
+#: ../camel/providers/imap4/camel-imap4-engine.c:1584
+#: ../camel/providers/imap4/camel-imap4-engine.c:1628
+#: ../camel/providers/imap4/camel-imap4-engine.c:1683
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "Ð?ÐµÐ·Ð° Ñ?Ð° IMAP4 Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼ %s Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð¿Ñ?ÐµÐºÐ¸Ð½Ñ?Ñ?Ð°: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
 msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
 msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ñ?ÐºÑ?Ð¸Ð²Ð°Ñ?Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ðµ Ð»Ð¸Ñ?Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð½ÐµÐºÐ¸Ð¼ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸Ð¼Ð° Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¸Ð¼Ð° Ð·Ð° Ð²Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../camel/providers/imap4/camel-imap4-folder.c:88
 msgid "Expire cached messages that haven't been read in X seconds"
 msgstr "Ð?Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð½Ð¸Ñ?Ñ? Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð·Ð° X Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
 msgid "Expire cached messages older than X seconds"
 msgstr "Ð?Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð¸Ñ? Ð¾Ð´ X Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imap4/camel-imap4-folder.c:427
 #, c-format
 msgid "Cannot access folder '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ â??%sâ??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imap4/camel-imap4-folder.c:484
 #, c-format
 msgid "Cannot sync flags to folder '%s': Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ð¸ Ð¾Ð·Ð½Ð°ÐºÐµ Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
+#: ../camel/providers/imap4/camel-imap4-folder.c:490
 #, c-format
 msgid "Cannot sync flags to folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ð¸ Ð¾Ð·Ð½Ð°ÐºÐµ Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
+#: ../camel/providers/imap4/camel-imap4-folder.c:630
 #, c-format
 msgid "Cannot expunge folder '%s': Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#: ../camel/providers/imap4/camel-imap4-folder.c:635
 #, c-format
 msgid "Cannot expunge folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#: ../camel/providers/imap4/camel-imap4-folder.c:891
 #, c-format
 msgid "Cannot get message %s from folder '%s': No such message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? %s Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: Ð½ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#: ../camel/providers/imap4/camel-imap4-folder.c:896
 #, c-format
 msgid "Cannot get message %s from folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? %s Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
 msgid "Cannot append message to folder '%s': Folder is read-only"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, c-format
 msgid "Cannot append message to folder '%s': Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#: ../camel/providers/imap4/camel-imap4-folder.c:1063
 #, c-format
 msgid "Cannot append message to folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
+#: ../camel/providers/imap4/camel-imap4-folder.c:1182
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1186
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð½ÐµÐ¼Ð° _Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ð¼ÐµÑ?Ñ? Ð½Ð¾Ð²Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:57
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð½ÐµÐ¼Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ñ?Ð°Ð¼Ð¾ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¡Ð?Ð?Ð?Ð£Ð§Ð?"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAPv4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "Ð?Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ñ?Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð° IMAPv4rev1 Ñ?ÐµÑ?Ð²ÐµÑ?Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
 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
+#: ../camel/providers/imap4/camel-imap4-store.c:259
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap4/camel-imap4-store.c:296
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS negotiations failed"
 msgstr "TLS Ð¿Ñ?ÐµÐ³Ð¾Ð²Ð¾Ñ?Ð¸ Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð¿ÐµÐ»Ð¸"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imap4/camel-imap4-store.c:411
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:534
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:697
+#: ../camel/providers/imap4/camel-imap4-store.c:964
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ IMAP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:736
 #, c-format
 msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ?? Ñ?Ð° IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
 #, c-format
 msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ LIST Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ? Ð·Ð° â??%sâ?? Ñ?Ð° IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
 msgid "Bad command"
 msgstr "Ð?Ð¾Ñ?Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
 #, c-format
 msgid "Cannot create folder '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
 msgid "Cannot create folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
 #, c-format
 msgid "Cannot delete folder '%s': Special folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ñ?Ð¿ÐµÑ?Ð¸Ñ?Ð°Ð»Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ IMAP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
 #, c-format
 msgid "Cannot delete folder '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
 msgid "Cannot delete folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Special folder"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ?? Ñ? â??%sâ??: Ñ?Ð¿ÐµÑ?Ð¸Ñ?Ð°Ð»Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ðµ IMAP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ?? Ñ? â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ?? Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
 #. 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
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
 #, c-format
 msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ %s Ð·Ð° Ð¾Ð±Ñ?Ð°Ð·Ð°Ñ? â??%sâ?? Ñ?Ð° IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° IMAP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
 #, c-format
 msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð´Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° IMAP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð´Ñ?Ð°Ð²Ð° Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð´Ñ?Ð°Ð²Ð° Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: Ð»Ð¾Ñ?Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð·Ð° Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "IMAP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ð½Ð¸Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ñ?ÐµÐ½."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "Ð?Ñ?Ð¸Ð±Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¾Ð¼Ð¾Ñ?Ð° Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¸ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ? Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ñ? IMAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %s: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, 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/imapx/camel-imapx-folder.c:86
+#, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:94
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð¾Ñ?Ñ?Ð°Ð²Ñ? Ð·Ð° %s"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ _Ð½ÐµÐ°ÐºÑ?Ð¸Ð²Ð½Ð¾ Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð¾ Ñ?ÐµÑ?Ð²ÐµÑ? Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð°"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "Ð?_Ñ?Ð¾Ñ? Ð²ÐµÐ·Ð° Ð¸Ð· Ð¾Ñ?Ñ?Ð°Ð²Ðµ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 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"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2167
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° %s (Ð¿Ð¾Ñ?Ñ? %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:395
 #, 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:402
 #, c-format
-msgid "mailbox:%s (%s)"
-msgstr "Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ:%s (%s)"
+#| 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:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3660,53 +3625,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Unix mbox spool Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: ../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:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð° root %s Ð½Ð¸Ñ?Ðµ Ð°Ð¿Ñ?Ð¾Ð»Ñ?Ñ?Ð½Ð° Ð¿Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð° root %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:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ðµ Ð¾Ñ?Ñ?Ð°Ð²Ðµ Ð½ÐµÐ¼Ð°Ñ?Ñ? Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¿Ð¾Ñ?Ñ?Ðµ %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? %s Ñ? %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%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:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%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:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¼ÐµÑ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: %s"
@@ -3715,27 +3680,28 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¼ÐµÑ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð°Ñ?
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ñ?Ð°Ð·Ð»Ð¾Ð³"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Ð?Ñ?Ð¾Ð´Ð¾Ð´Ð°Ñ?Ð° maildir Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ð½Ð¸Ñ?Ñ?ÐµÐ½Ð°"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, 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
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:225
+#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:244
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3744,27 +3710,32 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?: %s Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
+#: ../camel/providers/local/camel-maildir-folder.c:418
+#| msgid "Cannot copy messages to the Junk folder"
+msgid "Cannot transfer message to destination folder"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ½ÐµÑ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
+
 #: ../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-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%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-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%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-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3787,76 +3758,76 @@ msgid "not a maildir directory"
 msgstr "Ð½Ð¸Ñ?Ðµ maildir Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
 #: ../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-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ñ?Ð°Ñ?Ðµ maildir Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ñ?ÐµÐ»Ð¾Ð²Ð¸Ñ?Ð¾Ñ?Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 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-maildir-summary.c:724
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
 #: ../camel/providers/local/camel-spool-summary.c:150
 msgid "Storing folder"
 msgstr "Ð¡Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? mbox Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð½ÐµÐ¿Ð¾Ð¿Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð¾ Ð¾Ñ?Ñ?ÐµÑ?ÐµÐ½Ð°."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾."
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¾Ð²Ð¾Ð³ Ð¸Ð¼ÐµÐ½Ð°."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½Ð¸Ñ?Ðµ Ð¾Ð±Ð¸Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°."
 
-#: ../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:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3865,130 +3836,130 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, 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:252
 #, 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:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ â??%sâ??: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "Ð?Ð¾Ð²Ð¾ Ð¸Ð¼Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ?Ðµ Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ â??%sâ??: â??%sâ??: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ â??%sâ?? Ñ? %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ð?Ð¾Ð±Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð° Ð¼ÐµÑ?Ñ?Ñ? %ld Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %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-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
 #: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %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:752
+#: ../camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %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:858
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c: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:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
+#: ../camel/providers/local/camel-mbox-summary.c:1114
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 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:1047
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, 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:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ñ? Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ð¸Ñ?Ð°Ñ?Ðµ Ñ? Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "MH Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? mh Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?: %s: %s"
@@ -4003,27 +3974,27 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??: Ð½Ð¸Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ñ?Ð°Ñ?Ñ? MH Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð° â??%sâ?? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:144
 #, 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:163
 #, 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:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4032,12 +4003,12 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:177
 #, 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:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4046,48 +4017,48 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:190
 #, 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:207
 msgid "Store does not support an INBOX"
 msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð° Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¡Ð?Ð?Ð?Ð£Ð§Ð?"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¿Ð¾Ñ?Ñ?Ðµ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ð¡Ñ?Ð°Ð±Ð»Ð¾ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð·Ð° Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ? Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ðµ"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ? Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../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:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync 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:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4096,26 +4067,26 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ? %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:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: Ð?Ð?Ð? Ñ? Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ Ð¾Ð±Ð»Ð¸ÐºÑ?: %s"
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
 #: ../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:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð¿Ð¾Ñ?Ð¸Ñ?ÐºÐ°: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ NNTP Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð°ÐºÐ¾ Ð½Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· NNTP Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ!"
 
@@ -4139,22 +4110,22 @@ msgstr "Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ð½Ñ?Ñ?Ð°Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ñ?Ð»Ð°Ñ?Ðµ Ð½Ð° USENET 
 msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð° NNTP Ñ?ÐµÑ?Ð²ÐµÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ñ? Ð¾Ð±Ð¸Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐºÑ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð²Ð° Ð¾Ð´ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ñ?Ðµ Ñ?Ð·Ð²Ñ?Ð°Ñ?Ð¸Ð¾ ÐºÐ¾Ð´Ð¾Ð¼ Ð¾ Ð³Ñ?ÐµÑ?Ñ?Ð¸ %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Ð²ÐµÑ?Ñ?Ð¸ Ð¿Ñ?ÐµÐºÐ¾ %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,7 +4136,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4175,7 +4146,7 @@ msgstr ""
 "\n"
 "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ð³Ñ?Ñ?Ð¿Ðµ. Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð° Ñ?Ñ?Ð°Ð²ÐºÐ° Ñ?Ðµ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð½Ð°Ð´Ñ?ÐµÑ?ÐµÐ½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4185,62 +4156,62 @@ msgstr ""
 "\n"
 "Ð³Ñ?Ñ?Ð¿Ð° Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð²ÐµÑ?Ñ?Ð¸: Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ñ?Ðµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot rename a folder in a News store."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð²ÐµÑ?Ñ?Ð¸."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð²ÐµÑ?Ñ?Ð¸: Ð¾Ð´Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ñ?Ðµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð°Ð»Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ð½ÐµÑ?Ð¾"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð°: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Ð?ÐµÐ¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¾."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, 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:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð¾Ð²Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? xover-Ð°: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ð?ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? head-Ð°: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð´Ñ?Ñ?Ñ?Ð°Ð½Ð¸"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°: %s"
@@ -4280,88 +4251,99 @@ msgid "Unknown reason"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ñ?Ð°Ð·Ð»Ð¾Ð³"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "Ð?Ñ?Ñ?Ð°Ð²Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "_Ð?Ñ?Ñ?Ð°Ð²Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, 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:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ð¸ _Ð¿Ð¾Ð´Ñ?Ñ?ÐºÑ? Ð·Ð° Ñ?Ð²Ð° POP3 Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð°"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Ð?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
 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:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
 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 Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð°. Ð?Ð²Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ñ?Ð°Ð´Ð¸Ñ?Ð¸ Ñ?Ð²Ð¸Ð¼ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ñ?Ð°Ðº Ð¸ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ð²Ñ?Ð´Ðµ Ð´Ð° Ñ?Ð¾ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð°Ñ?Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð³ Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð²Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ?Ð° %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:246
+#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:281
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° 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:263
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:282
 msgid "TLS is not available in this build"
 msgstr "TLS Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ñ? Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ñ?Ñ?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:388
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:429
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #, c-format
 msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %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:448
 #, 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"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° SASL Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° â??%sâ?? Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:462
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s: Ð³Ñ?ÐµÑ?ÐºÐ° SASL Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð°"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:540
 #, 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 Ð?Ð?. Ð?Ð¾Ð³Ñ?Ñ? Ð½Ð°Ð¿Ð°Ð´ Ð·Ð°Ð¼ÐµÐ½Ð¾Ð¼ Ð¸Ð´ÐµÐ½Ñ?Ð¸Ñ?ÐµÑ?Ð°. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4370,16 +4352,33 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %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:591
+#, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s.\n"
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾Ð³ Ð¸Ð¼ÐµÐ½Ð°%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° POP Ñ?ÐµÑ?Ð²ÐµÑ? %s.\n"
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾Ð³ Ð¸Ð¼ÐµÐ½Ð°: %s"
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:707
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??."
@@ -4392,173 +4391,173 @@ msgstr "Sendmail"
 msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "Ð?Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?ÐµÐ¼ â??sendmailâ?? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ñ? Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð²ÐµÐ·Ñ? ÐºÐ° sendmail-Ñ?: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ sendmail: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð¾ Ñ?Ð¸Ð³Ð½Ð°Ð»Ð¾Ð¼ %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ð¸Ñ?Ð¸ %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð¾ Ñ?Ð° Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð¼ %d: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "Mail delivery via the sendmail program"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐºÐ¾ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð° sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Ð?Ð° Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?ÐµÐ¼ Ð½Ð° Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ñ? Ð¼Ñ?ÐµÐ¶Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ñ?Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸, ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ñ?Ð¸Ð½Ñ?Ð°ÐºÑ?Ð¸ Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸Ð¼Ð° Ð¸Ð»Ð¸ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸Ð¼Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
 msgstr "Ð?Ð¾Ð¼Ð°Ð½Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ð°Ñ? ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°, Ð¸Ð»Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð¾ Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ñ?Ð¿Ñ?ÐµÐ¼Ð°Ð½"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service closing transmission channel"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð·Ð°Ñ?Ð²Ð°Ñ?Ð° ÐºÐ°Ð½Ð°Ð» Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service not available, closing transmission channel"
 msgstr "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½, Ð·Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð½Ð°Ð»Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÐ½Ð° Ñ?Ð°Ð´Ñ?Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ? Ñ? Ñ?ÐµÐ´Ñ?, Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 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:189
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÐ½Ð° Ñ?Ð°Ð´Ñ?Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð·ÐµÑ?Ð°: Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÐ½Ð° Ñ?Ð°Ð´Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð·ÐµÑ?Ð°: Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action aborted: error in processing"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÐ½Ð° Ñ?Ð°Ð´Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð·ÐµÑ?Ð°: Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð±Ñ?Ð°Ð´Ð¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; please try <forward-path>"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð½Ð¸Ñ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð°Ð½; Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ <Ð¿Ñ?Ñ?Ð°Ñ?Ð°-Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÐ½Ð° Ñ?Ð°Ð´Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð·ÐµÑ?Ð°: Ð½ÐµÐ´Ð¾Ð²Ð¾Ñ?Ð½Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð° Ð½Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Ð?Ð´Ñ?Ñ?Ñ?Ð°Ñ?Ð¾ Ð¾Ð´ Ñ?Ñ?Ð°Ð¶ÐµÐ½Ðµ Ñ?Ð°Ð´Ñ?Ðµ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?: Ð¿Ñ?ÐµÐ¼Ð°Ñ?ÐµÐ½ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 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:203
 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:205
 msgid "Transaction failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ¾ Ð¿Ñ?ÐµÐ½Ð¾Ñ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "A password transition is needed"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Authentication mechanism is too weak"
 msgstr "Ð?ÐµÑ?Ð°Ð½Ð¸Ð·Ð°Ð¼ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ð»Ð°Ð±"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Ð?ÐµÐ¾Ð¿Ñ?Ð¾Ð´Ð½Ð¾ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸ Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð°Ð¼ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° SMTP Ñ?ÐµÑ?Ð²ÐµÑ? %s Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° STARTTLS ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° STARTTLS ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4569,93 +4568,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP Ñ?ÐµÑ?Ð²ÐµÑ? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP Ð´Ð¾Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐºÐ¾ %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð°Ð´Ñ?ÐµÑ?Ð° Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð°."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ñ? Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 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:985
 msgid "SMTP Greeting"
 msgstr "SMTP Ð¿Ð¾Ð·Ð´Ñ?Ð°Ð²"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° HELO ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° HELO ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "SMTP Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?Ð° SASL Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° AUTH ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° AUTH ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "Ð?Ð¾Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ? Ð¾Ð´ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° MAIL FROM ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° MAIL FROM ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° RCPT TO ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° DATA ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s: Ð¿Ð¾Ñ?Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
@@ -4663,108 +4662,108 @@ 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "DATA command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° DATA ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° RSET ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° RSET ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° QUIT ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° QUIT ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "Ð?Ð¾Ñ?Ð°Ð¾"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "Ð?Ð°Ð´Ð¼ÐµÑ?Ð°Ñ?Ðµ"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "Ð?Ð¼Ð¸Ñ?ÐµÐ½Ð¾"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "Ð?Ð¾ÐºÐ»Ð¾Ð½Ð¸"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "Ð¦Ð¸Ñ?ÐµÐ²Ð¸/Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "Ð?Ñ?Ð°Ð·Ð½Ð¸Ðº"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "Ð§ÐµÑ?Ñ?Ð¸Ñ?ÐºÐµ"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "Ð?Ð°Ð¶Ð½Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "Ð?Ð´ÐµÑ?Ðµ"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "Ð?ÐµÑ?Ñ?Ð½Ð°Ñ?Ð¾Ð´Ð½Ð¾"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "Ð?Ð°Ð¶Ð½Ð° Ð¼Ñ?Ñ?Ñ?ÐµÑ?Ð¸Ñ?Ð°"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "Ð Ð°Ð·Ð½Ð¾"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¾"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 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:63
 msgid "Status"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ?"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "Ð¡Ñ?Ñ?Ð°Ñ?ÐµÐ³Ð¸Ñ?Ðµ"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð°Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¸ Ð¸Ð·Ð´Ð°Ñ?Ð¸"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "Ð§ÐµÐºÐ°Ñ?Ðµ"
 
@@ -4772,8 +4771,8 @@ 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:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4780,8 @@ 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:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4789,8 @@ 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:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4798,83 @@ 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:1889
 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:1765
+#: ../libedataserver/e-time-utils.c:1884
 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:1768
 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
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
 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:1838
-#: ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4883,26 +4882,26 @@ msgstr "%H:%M:%S"
 #. 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
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
 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:1847
-#: ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
 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:1850
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4914,52 +4913,57 @@ msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?"
 msgid "Failed to authenticate.\n"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "Ð?ÐºÐ¾Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "_Ð?ÐµÐ· Ñ?Ð»Ð¸ÐºÐµ"
+
+#: ../libedataserverui/e-categories-dialog.c:372
 #, c-format
 msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "Ð£ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ñ? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð° â??%sâ??. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾ Ð¸Ð¼Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "Ð?ÐºÐ¾Ð½Ð°"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Ð?ÐºÐ¾Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "_Ð?ÐºÐ¾Ð½Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "Ð?_Ð¼Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Ð?Ñ?ÐµÐ´Ð¼ÐµÑ?(Ð¸) Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°(Ñ?Ñ?) Ð¾Ð²Ð¸Ð¼ _ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼Ð°:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+#| msgid "Item(s) belong to these _categories:"
+msgid "Item(s) _belong to these categories:"
+msgstr "Ð?Ñ?ÐµÐ´Ð¼ÐµÑ?(Ð¸) _Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°(Ñ?Ñ?) Ð¾Ð²Ð¸Ð¼ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼Ð°:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Ð?Ð·Ñ?Ð°Ð´Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ â??%sâ??"
@@ -4972,111 +4976,110 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð±Ð¾Ñ?Ð°Ð¼Ð°"
 msgid "The color to render"
 msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° Ð¾Ð±Ñ?Ð°Ð´Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð· Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "_Ð£ÐºÐ»Ð¾Ð½Ð¸"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Ð?Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>Ð?Ð¾_Ð½Ñ?Ð°ÐºÑ?Ð¸</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "Ð?_Ð´Ñ?ÐµÑ?Ð°Ñ?:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "_Ð?Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾_Ñ?Ð¸Ñ?Ð°:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Ð?Ñ?Ð¾Ñ?Ñ?Ñ?Ð¸ %s Ñ?Ð½Ñ?Ñ?Ð°Ñ?"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "Ð£_Ð¼Ð½Ð¾Ð¶Ð¸ %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð?_Ñ?ÐµÑ?Ð¸ %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "_Ð£Ñ?ÐµÐ´Ð¸ %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ð£ÐºÐ»Ð¾Ð½Ð¸ %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:240
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ð?Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸Ð²ÐµÑ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ?Ð¸Ð²: Ð½ÐµÐ¼Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° Ð½Ð¸Ñ?Ð¸ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð°"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1099
 msgid "You have the Caps Lock key on."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð²ÐµÐ»Ð¸ÐºÐ° Ñ?Ð»Ð¾Ð²Ð°."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this passphrase"
 msgstr "_Ð?Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð¾Ð²Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Ð?Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð¾Ð²Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð´Ð¾ ÐºÑ?Ð°Ñ?Ð° Ð¾Ð²Ðµ Ñ?ÐµÑ?Ð¸Ñ?Ðµ"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1227
 msgid "_Remember this password"
 msgstr "_Ð?Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð¾Ð²Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1228
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ð?Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð¾Ð²Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð´Ð¾ ÐºÑ?Ð°Ñ?Ð° Ð¾Ð²Ðµ Ñ?ÐµÑ?Ð¸Ñ?Ðµ"
 
@@ -5085,488 +5088,40 @@ msgstr "_Ð?Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð¾Ð²Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð´Ð¾ ÐºÑ?Ð°Ñ?Ð° Ð¾Ð²Ðµ Ñ?ÐµÑ?Ð¸Ñ?
 msgid "Select destination"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-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 "Ð?Ð»Ð°Ñ?Ð½Ð¸Ðº"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð·Ð° Ð¾Ð±Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Ð?Ñ?Ñ?Ð¾Ñ? Ð·Ð° Ð¾Ð±Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Ð?Ñ?Ñ?Ð¾Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Ð?Ñ?Ñ?Ð¾Ñ? ÐºÐ¾Ñ?Ð¸ Ð½Ðµ Ñ?Ñ?ÐµÑ?Ñ?Ñ?Ðµ"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Ð ÐµÑ?ÐµÐ½Ð·ÐµÐ½Ñ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Ð¡Ð°Ñ?Ð°Ð´Ð½Ð¸Ðº"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾"
-
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Ð?Ð¿Ñ?Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¸Ñ?Ñ?Ð¾Ð³ Ð¸Ð¼ÐµÐ½Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Ð?Ð°Ð²ÐµÐ´ÐµÐ½ Ñ?Ð¸Ð¿ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O Ð³Ñ?ÐµÑ?ÐºÐ°"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾Ñ?Ð½Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð°Ð·Ð½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Ð?Ð°Ð²ÐµÐ´ÐµÐ½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Ð¤Ñ?Ð½ÐºÑ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼ÐµÑ?ÐµÐ½Ð° Ñ? Ð¾Ð²Ð¾Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ð¸"
-
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Ð?Ð°Ð²ÐµÐ´ÐµÐ½Ð¸ Ñ?Ð¸Ð¿ Ñ? Ð¾Ð²Ð¾Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Ð?Ð°Ð²ÐµÐ´ÐµÐ½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð½Ð¸Ñ?Ð¸ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?Ð°ÐºÐ¾ Ð´Ð° Ñ?Ðµ Ð½Ð°Ð»Ð°Ð·Ð¸ Ñ? Ñ?Ð¾Ñ? Ñ?Ð°Ð¼Ð¾Ñ?"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?Ð¾Ð³Ð° Ð¸Ð¼ÐµÐ½Ð°"
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-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"
-
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "Ð?Ð¸Ñ?Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Ð?Ð¼Ð¸Ñ?ÐµÐ½Ðµ Ñ?Ð°Ð²Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Ð¡Ð²Ðµ Ñ?Ð°Ð²Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Ð?Ð»Ð¾Ð±Ð°Ð»Ð½Ð° Ð»Ð¸Ñ?Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð¸"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐµ"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Ð?Ð´Ð»Ð°Ð·Ð½Ð°"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð¸"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Ð?Ð°Ð´Ñ?Ð¶ÐµÑ?Ð°"
-
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "Ð?ÐµÐ¼Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "Ð?Ð¾Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ð°Ñ?"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Ð?Ð¾Ð´Ñ?Ñ?ÐºÐ° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð·Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-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 "Ð¡ÐµÑ?Ð²Ð¸Ñ? Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ñ?Ñ?Ñ?ÐµÑ?Ð° Ð¡ÐµÑ?Ð²ÐµÑ?Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-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 "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"
-#~ "This probably means that your server requires you\n"
-#~ "to specify the Windows domain name as part of your\n"
-#~ "username (eg, \"DOMAIN\\user\").\n"
-#~ "\n"
-#~ "Or you might have just typed your password wrong.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?.\n"
-#~ "\n"
-#~ "Ð?Ð²Ð¾ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð´Ð°\n"
-#~ "Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ Ð¸Ð¼Ðµ Windows Ð´Ð¾Ð¼ÐµÐ½Ð° ÐºÐ°Ð¾ Ð´ÐµÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾Ð³\n"
-#~ "Ð¸Ð¼ÐµÐ½Ð° (Ð½Ð¿Ñ?. â??Ð?Ð?Ð?Ð?Ð?\\ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº\").\n"
-#~ "Ð?Ð»Ð¸ Ñ?Ñ?Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ð°Ð¼Ð¾ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾ Ñ?ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?.\n"
-#~ "\n"
-#~ msgid "Mailbox for %s is not on this server."
-#~ msgstr "Mailbox Ð·Ð° %s Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?."
-#~ msgid ""
-#~ "The server '%s' is running Exchange 5.5 and is\n"
-#~ "therefore not compatible with Ximian Connector"
-#~ msgstr ""
-#~ "Ð¡ÐµÑ?Ð²ÐµÑ? '%s' ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Exchange 5.5 Ð¸ Ñ?Ñ?Ð¾Ð³Ð°\n"
-#~ "Ð½Ð¸Ñ?Ðµ ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð°Ð½ Ñ?Ð° Ximian Connector-Ð¾Ð¼"
-#~ msgid ""
-#~ "Could not find Exchange Web Storage System at %s.\n"
-#~ "If OWA is running on a different path, you must specify that in the\n"
-#~ "account configuration dialog."
-#~ msgstr ""
-#~ "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Exchange Web Storage System Ð½Ð° %s.\n"
-#~ "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ OWA Ñ?Ð°Ð´Ð¸ Ð½Ð° Ð´Ñ?Ñ?Ð³Ð¾Ñ? Ð¿Ñ?Ñ?Ð°Ñ?Ð¸, Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ Ñ?\n"
-#~ "Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ñ? Ð½Ð°Ð»Ð¾Ð³Ð°."
-#~ msgid "No mailbox for user %s on %s.\n"
-#~ msgstr "Ð?ÐµÐ¼Ð° mailbox-Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° %s Ð½Ð° %s.\n"
-#~ msgid "Could not connect to server %s: %s"
-#~ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? %s: %s"
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð°"
-#~ msgid "Network error"
-#~ msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
-#~ msgid "Folder Name"
-#~ msgstr "Ð?Ð¼Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-#~ msgid "Folder Size"
-#~ msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
-#~ msgid "Groupwise server %s"
-#~ msgstr "GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? %s"
-#~ msgid "e_book_open: cancelled"
-#~ msgstr "e_book_open: Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½"
-#~ msgid "e_book_load_uri: no factories available for uri `%s'"
-#~ msgstr "e_book_load_uri: Ð½ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? Ñ?Ð²Ð¾Ñ?Ð½Ð¸Ñ?Ð° Ð·Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? â??%sâ??"
-#~ msgid "File As"
-#~ msgstr "Ð?Ð°Ð²ÐµÐ´Ð¸ ÐºÐ°Ð¾"
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ð?Ð¸Ñ?Ð°Ð¼ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ð¸Ð¼ GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Ð?Ð¸Ñ?Ð°Ð¼ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ð¸Ð¼ GPG %s: %s\n"
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°Ñ? Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
-#~ msgid "Post Office Agent:"
-#~ msgstr "Ð?Ð³ÐµÐ½Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?:"
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ñ? Ð²ÐµÐ·Ñ? (SSL)"
-#~ msgid "Checklist"
-#~ msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð° Ð¾Ð²ÐµÑ?Ñ?"
-#~ msgid "Server rejected username"
-#~ msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ñ?Ðµ Ð¾Ð´Ð±Ð¸Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°"
-#~ msgid "Failed to send username to server"
-#~ msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ñ?Ð»Ð°Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾Ð³ Ð¸Ð¼ÐµÐ½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?"
-#~ msgid "Server rejected username/password"
-#~ msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ñ?Ðµ Ð¾Ð´Ð±Ð¸Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°/Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
-#~ msgid "Could not get group list from server."
-#~ msgstr "Ð?Ð¸Ñ?Ð°Ð¼ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð¿Ñ?ÐµÑ?Ð·Ð¼ÐµÐ¼ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð³Ñ?Ñ?Ð¿Ð° Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð¼ Ð³Ñ?Ñ?Ð¿Ð° Ð·Ð° %s: %s"
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð¼ Ð³Ñ?Ñ?Ð¿Ð° Ð·Ð° %s: %s"
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð¸ LDAP Ð¿Ð¾Ð´Ñ?Ñ?ÐºÐ° Ð·Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
-#~ msgid "uid? expects 1 argument"
-#~ msgstr "uid? Ð¾Ñ?ÐµÐºÑ?Ñ?Ðµ 1 Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?"
-#~ msgid "uid? expects argument 1 to be a string"
-#~ msgstr "uid? Ð¾Ñ?ÐµÐºÑ?Ñ?Ðµ 1 Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ? Ð´Ð° Ð±Ñ?Ð´Ðµ Ð½Ð¸Ñ?ÐºÐ°"
-#~ msgid "e_book_add_contact called on book before e_book_load_uri"
-#~ msgstr "Ð¿Ð¾Ð·Ð²Ð°Ð½ Ñ?Ðµ e_book_add_contact Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::addContact call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::addContact"
-#~ msgid "e_book_commit_contact called on book before e_book_load_uri"
-#~ msgstr "Ð¿Ð¾Ð·Ð²Ð°Ð½ Ñ?Ðµ e_book_commit_contact Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::modifyContact call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::modifyContact"
-#~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_fields Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getSupportedFields call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getSupportedFields"
-#~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_auth_methods Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getSupportedAuthMethods call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getSupportedAuthMethods"
-#~ msgid "e_book_authenticate_user on book before e_book_load_uri"
-#~ msgstr "e_book_authenticate_user Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::authenticateUser call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::authenticateUser"
-#~ msgid "e_book_get_contact on book before e_book_load_uri"
-#~ msgstr "e_book_get_contact Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getContact call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getContact"
-#~ msgid "e_book_remove_contact on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contact Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "e_book_remove_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contacts Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::removeContacts call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::removeContacts"
-#~ msgid "e_book_get_book_view on book before e_book_load_uri"
-#~ msgstr "e_book_get_book_view Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getBookView call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getBookView"
-#~ msgid "e_book_get_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_get_contacts Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getContactList call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getContactList"
-#~ msgid "e_book_get_changes on book before e_book_load_uri"
-#~ msgstr "e_book_get_changes Ð½Ð° Ð¸Ð¼ÐµÐ½Ð¸ÐºÑ? Ð¿Ñ?Ðµ e_book_load_uri"
-#~ msgid "Corba exception making Book::getChanges call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::getChanges"
-#~ msgid "Corba exception making Book::cancelOperation call"
-#~ msgstr "Corba Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº Ð¿Ð¾Ð·Ð¸Ð²Ð° Book::cancelOperation"
-#~ 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"
+#~ 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: could not cancel"
+#~ msgstr "%s: Ð½Ð¸Ñ?Ðµ Ð±Ð¸Ð»Ð¾ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ñ?Ð¸"
 
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â??%sâ?? Ð½Ð° ÐºÑ?Ð¸Ð·Ð¸ Ð¿Ð¾Ñ?Ð»Ðµ â??%sâ??"
diff --git a/po/sr latin po b/po/sr latin po
index a6f7867..7353ca0 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -9,10 +9,10 @@
 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
+"POT-Creation-Date: 2010-03-22 20:40+0000\n"
+"PO-Revision-Date: 2010-03-23 19:32+0100\n"
+"Last-Translator: Igor NestoroviÄ? <igor prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,206 +20,81 @@ msgstr ""
 "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"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "UÄ?itavanje je u toku..."
 
 #: ../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/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "PretraÅ¾ivanje je u toku..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Preuzimanje kontakata (%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:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "OsveÅ¾avanje preuzetih kontakata (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "KoriÅ¡Ä?enje istaknutog imena (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 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:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovno povezivanje na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "Dodavanje kontakta na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "Uklanjanje kontakta sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "Menjanje kontakta sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "Primanje rezultata pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 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/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: nema dostupne proizvodnje za adresu â??%s'"
-
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: nije moguÄ?e pravljenje EBookListener"
-
-#: ../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:3738
+#: ../addressbook/libebook/e-book.c:2152
 #, 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."
 
 #. 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,809 +102,878 @@ 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"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "2. elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "3. elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 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"
 
-#: ../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"
 
-#: ../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:671
 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
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "1. kuÄ?no nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "2. nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "3. nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "1. poslovno nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "2. poslovno nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "3. poslovno nadenuto ime za AIM"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "1. kuÄ?no nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "2. kuÄ?no nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "3. kuÄ?no nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "1. poslovno nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "2. poslovno nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "3. poslovno nadenuto ime za GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "1. kuÄ?ni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "2. kuÄ?ni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "3. kuÄ?ni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "1. poslovni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "2. poslovni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "3. poslovni Jabber nalog"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "1. kuÄ?no nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "2. kuÄ?no nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "3. kuÄ?no nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "1. poslovno nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "2. poslovno nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "3. poslovno nadenuto ime za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "1. kuÄ?no nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "2. kuÄ?no nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "3. kuÄ?no nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "1. poslovno nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "2. poslovno nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "3. poslovno nadenuto ime za MSN"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "1. kuÄ?ni ICQ nalog"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "2. kuÄ?ni ICQ nalog"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "3. kuÄ?ni ICQ nalog"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "1. poslovni ICQ nalog"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "2. poslovni ICQ nalog"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "3. poslovni ICQ nalog"
 
 #. 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"
 
 #. 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"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "Lista nadenutih imena za AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "Lista GroupWise ib-a"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "Lista Jabber naloga"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Lista nadenutih imena za Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "Lista nadenutih imena za MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "Lista ICQ naloga"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../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"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "Lista 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:715
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "GodiÅ¡njica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 sertifikat"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Gadu-Gadu kuÄ?ni Ib 1"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Gadu-Gadu kuÄ?ni Ib 2"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Gadu-Gadu kuÄ?ni Ib 3"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Gadu-Gadu poslovni Ib 1"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Gadu-Gadu poslovni Ib 2"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Gadu-Gadu poslovni Ib 3"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "Gadu-Gadu Ib lista"
 
 #. 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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "1. ime za Skype na poslu"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "2. ime za Skype na poslu"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "3. ime za Skype na poslu"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Lista nadenutih imena za Skype"
 
-#: ../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:1515
+#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "Prazna adresa"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "Neispravan izvor"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+#| msgid "Cannot open message"
+msgid "Cannot open book"
+msgstr "Nije moguÄ?e otvoriti knjigu"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "Nije moguÄ?e ukloniti knjigu"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact"
+msgstr "Nije moguÄ?e dobiti kontakt"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "Prazan upit"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+#| msgid "Cannot authenticate to server: %s"
+msgid "Cannot authenticate user"
+msgstr "Nije moguÄ?e autentifikovati korisnika"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+#| msgid "Cannot add encryption certificate"
+msgid "Cannot add contact"
+msgstr "Nije moguÄ?e dodati kontakt"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+#| msgid "Cannot create encoder context"
+msgid "Cannot modify contact"
+msgstr "Nije moguÄ?e izmeniti kontakt"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+#| msgid "Cannot create encoder context"
+msgid "Cannot remove contacts"
+msgstr "Nije moguÄ?e ukloniti kontakt"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "Neispravan upit"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get changes"
+msgstr "Nije moguÄ?e dobiti izmene"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+#| msgid "Could not cancel operation"
+msgid "Cannot complete operation"
+msgstr "Nije moguÄ?e zavrÅ¡iti operaciju"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "RoÄ?endan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "RoÄ?endan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "GodiÅ¡njica: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Nije moguÄ?e Ä?uvanje podataka iz kalendara: loÅ¡a adresa."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "Nije moguÄ?e saÄ?uvati podatke kalendara"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 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
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "Nije moguÄ?e napraviti datoteku za ostavu"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
 msgid "Could not create thread for populating cache"
 msgstr "Nije moguÄ?e napraviti niz za popunjavanje ostave"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "Potreban odgovor: za "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "Potreban odgovor: kada je zgodno"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:280
 #, c-format
 msgid "Loading %s items"
 msgstr "UÄ?itavanje %s predmeta"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:944
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
 msgid "Invalid server URI"
 msgstr "Neispravna adresa servera"
 
-#: ../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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "Neuspela autentifikacija"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "Preusmereno na neispravnu adresu"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "LoÅ¡ oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "Nije moguÄ?e dobijanje podataka o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblaÄ?no"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblaÄ?na noÄ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "Vreme: oblaÄ?no"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "Vreme: mestimiÄ?no oblaÄ?no"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Vreme: sunÄ?ano"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noÄ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "Vreme: sunÄ?ano"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:688
+#: ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:690
+#: ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:692
+#: ../calendar/libecal/e-cal-util.c:719
 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:713
 msgid "Undefined"
 msgstr "Nedefinisano"
 
-#: ../calendar/libecal/e-cal.c:1677
+#: ../calendar/libecal/e-cal.c:1173
 #: ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1039,245 +983,391 @@ 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:1187
 #, 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
+#: ../calendar/libecal/e-cal.c:3996
 msgid "Invalid argument"
 msgstr "Neispravan argument"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:3998
 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:4000
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 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:4002
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 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:4004
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../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:4006
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4008
 msgid "URI not loaded"
 msgstr "Adresa nije uÄ?itana"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4010
 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
+#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 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:4014
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../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:4016
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ? postoji"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4018
 msgid "Protocol not supported"
 msgstr "Protokol nije podrÅ¾an"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4020
 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:4022
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "Nije moguÄ?e otkazati 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:4026
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Obavezna autentifikacija"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:4028
 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
+#: ../calendar/libecal/e-cal.c:4030
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:523
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
+#: ../camel/providers/imap/camel-imap-store.c:741
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Nepoznata greÅ¡ka"
 
-#: ../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:4032
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 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â??"
 
-#: ../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)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "NepodrÅ¾ano polje"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "NepodrÅ¾an metod"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "NempodrÅ¾an metod autentifikacije"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS nije dostupan"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "Rad van mreÅ¾e nije dostupan"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "PremaÅ¡ena veliÄ?ina pretrage"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "Isteklo vreme za pretragu"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Neispravan upit"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "Upit odbijen"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "Neispravna verzija servera"
 
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar address"
+msgstr "Nije moguÄ?e dobaviti adrese kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+#| msgid "Cannot save calendar data: Malformed URI."
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "Nije moguÄ?e dobaviti adresu za alarm kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "Nije moguÄ?e dobaviti ldap atribut kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+#| msgid "Cannot create CMS Recipient information"
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "Nije moguÄ?e dobaviti podatke o rasporedu kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar"
+msgstr "Nije moguÄ?e otvoriti kalendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar"
+msgstr "Nije moguÄ?e osveÅ¾iti kalendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar"
+msgstr "Nije moguÄ?e ukloniti kalendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object"
+msgstr "Nije moguÄ?e napraviti objekat kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object"
+msgstr "Nije moguÄ?e izmeniti objekat kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object"
+msgstr "Nije moguÄ?e ukloniti objekat kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects"
+msgstr "Nije moguÄ?e primiti objekte kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot discard calendar alarm"
+msgstr "Nije moguÄ?e odbaciti alarm kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects"
+msgstr "Nije moguÄ?e poslati objekte kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve default calendar object path"
+msgstr "Nije moguÄ?e dobaviti podrazumevanu putanju objekta kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:781
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path"
+msgstr "Nije moguÄ?e dobaviti putanju objekta kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list"
+msgstr "Nije moguÄ?e dobaviti spisak objekata kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment list"
+msgstr "Nije moguÄ?e dobaviti spisak priloga"
+
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not complete calendar query"
+msgstr "Nije moguÄ?e zavrÅ¡iti upit u kalendar"
+
+#: ../calendar/libedata-cal/e-data-cal.c:877
+#, c-format
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone"
+msgstr "Nije moguÄ?e dobaviti vremensku zonu kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:895
+#, c-format
+#| msgid "Could not cancel operation"
+msgid "Could not add calendar time zone"
+msgstr "Nije moguÄ?e dodati vremensku zonu kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "Nije moguÄ?e postaviti podrazumevanu vremensku zonu kalendara"
+
+#: ../calendar/libedata-cal/e-data-cal.c:933
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar changes"
+msgstr "Nije moguÄ?e dobaviti izmene na kalendaru"
+
+#: ../calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Nije moguÄ?e dobaviti spisak kalendara za slobodno/zauzeto"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+#| msgid "Invalid server URI"
+msgid "Invalid URI"
+msgstr "Neispravna adresa"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Nema pozadinskog procesa za â??%sâ?? od â??%sâ??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "Nije moguÄ?e uspostaviti pozadinski proces"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podrÅ¾ava potpisivanje"
@@ -1318,7 +1408,7 @@ msgstr "MoÅ¾da neÄ?ete moÄ?i da uvezete kljuÄ?eve sa ovim algoritmom"
 msgid "You may not export keys with this cipher"
 msgstr "MoÅ¾da neÄ?ete moÄ?i da izvezete kljuÄ?eve sa ovim algoritmom"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "Nije moguÄ?e napraviti putanju za privremeno Ä?uvanje"
 
@@ -1327,11 +1417,11 @@ msgstr "Nije moguÄ?e napraviti putanju za privremeno Ä?uvanje"
 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-db.c:416
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1342,8 +1432,8 @@ msgstr ""
 "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:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1354,131 +1444,134 @@ msgstr ""
 "%s\n"
 "Promene na ovoj fascikli neÄ?e biti usklaÄ?ene."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "Ponovno usklaÄ?ivanje sa serverom"
 
 #: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
+#: ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "UmnoÅ¾i sadrÅ¾aj fascikle lokalno za rad van mreÅ¾e"
 
 #: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "Preuzimanje novih poruka u za rad van mreÅ¾e"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, 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
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imapx/camel-imapx-store.c:620
+#: ../camel/providers/imapx/camel-imapx-store.c:650
 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
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "Nema dostupnog opisa"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794
+#: ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Neuspelo pravljenje sadrÅ¾anog procesa â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %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:1025
+#: ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "UsklaÄ?ivanje fascikli"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121
+#: ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "GreÅ¡ka pri Ä?itanju filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130
+#: ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "GreÅ¡ka u primeni filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "Nije moguÄ?e otvaranje fascikle pripreme"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "Nije moguÄ?a obrada fascikle pripreme"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primanje poruke %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "Nije moguÄ?e otvoriti poruku"
 
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1264
 #, 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:1278
+#: ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "UsklaÄ?ivanje fascikle"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282
+#: ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "ZavrÅ¡eno"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primanje poruke %d od %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, 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:137
 msgid "Failed to retrieve message"
 msgstr "Neuspelo dovlaÄ?enje poruke"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neipsravni 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:735
+#: ../camel/camel-filter-search.c:743
 #, 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:455
+#: ../camel/camel-folder-search.c:610
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1488,8 +1581,8 @@ msgstr ""
 "%s"
 
 #: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:620
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1498,54 +1591,55 @@ msgstr ""
 "GreÅ¡ka pri izvrÅ¡avanju izraza za pretragu: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:812
+#: ../camel/camel-folder-search.c:854
 #, 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:907
 #, 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:913
+#: ../camel/camel-folder-search.c:920
 #, 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:947
 #, 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:956
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:690
 #, 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:1401
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "NepodrÅ¾ana operacija: pretraga po izrazu: za %s"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1442
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "NepodrÅ¾ana operacija: prebrojavanje po izrazu: za %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1483
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "NepodrÅ¾ana operacija: pretraga po JIB: za %s"
 
 #: ../camel/camel-folder.c:1596
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "PremeÅ¡tanje poruka"
 
@@ -1553,19 +1647,19 @@ msgstr "PremeÅ¡tanje poruka"
 msgid "Copying messages"
 msgstr "UmnoÅ¾avanje poruka"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1945
 msgid "Learning junk"
 msgstr "UÄ?enje Å¡ta je Ä?ubre"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1963
 msgid "Learning non-junk"
 msgstr "UÄ?enje Å¡ta nije Ä?ubre"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
 msgstr "Filtriranje poruke(a)"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1576,16 +1670,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "Neuspelo Ä?itanje gpg userid podsetnika."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neuspelo Ä?itanje zahteva za gpg lozinkom."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1594,7 +1688,7 @@ msgstr ""
 "Potreban Vam je PIN za otkljuÄ?avanje kljuÄ?a za\n"
 "SmartCard: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1603,109 +1697,105 @@ msgstr ""
 "Potrebna Vam je lozinka za otkljuÄ?avanje kljuÄ?a\n"
 "korisnika: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "NeoÄ?ekivan zahtev od GnuPG-a za â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
+#: ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:1113
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "Odustato."
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Neuspelo otkljuÄ?avanje tajnog kljuÄ?a: unete su 3 pogreÅ¡ne lozinke."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "NeoÄ?ekivan odgovor od GnuPG-a: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Neuspelo Å¡ifrovanje: nisu oznaÄ?eni ispravni primaoci."
 
 #. 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:1262
+#: ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953
+#: ../camel/camel-gpg-context.c:1998
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Neuspelo izvrÅ¡avanje gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355
+#: ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nije moguÄ?e napraviti podatke za potpisivanje: %s"
 
-#: ../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:1402
+#: ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646
+#: ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
 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
+#: ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546
+#: ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929
+#: ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nije moguÄ?a provera potpisa poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1600
 #, 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"
 
-#: ../camel/camel-gpg-context.c:1623
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nije moguÄ?e napraviti podatke za Å¡ifrovanje: %s"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1761
 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:1814
+#: ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Nije moguÄ?e deÅ¡ifrovati poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nije moguÄ?e deÅ¡ifrovati MIME deo: greÅ¡ka u protokolu"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:1909
+#: ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "Å ifrovan sadrÅ¾aj"
 
-#: ../camel/camel-gpg-context.c:1827
+#: ../camel/camel-gpg-context.c:1930
 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
+#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1999
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1719,13 +1809,13 @@ msgstr "Nije moguÄ?e napraviti vezu ka pomoÄ?niku zakljuÄ?avanja: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Nije moguÄ?e podeliti pomoÄ?nika zakljuÄ?avanja: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203
+#: ../camel/camel-lock-client.c:226
 #, 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"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nije moguÄ?e zakljuÄ?ati â??%sâ??"
@@ -1805,56 +1895,56 @@ msgstr "GreÅ¡ka pri pisanju privremene datoteke poÅ¡te: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "GreÅ¡ka pri umnoÅ¾avanju privremene datoteke: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 msgstr "greÅ¡ka Ä?itanja"
 
-#: ../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
+#: ../camel/camel-net-utils.c:503
+#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:817
+#: ../camel/providers/pop3/camel-pop3-store.c:478
+#: ../camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "Odustato"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:523
 msgid "cannot create thread"
 msgstr "nije moguÄ?e pravljenje niza"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:682
 #, c-format
 msgid "Resolving: %s"
 msgstr "NalaÅ¾enje: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:704
 msgid "Host lookup failed"
 msgstr "Neuspelo traÅ¾enje domaÄ?ina"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Neuspelo traÅ¾enje domaÄ?ina: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:821
 msgid "Resolving address"
 msgstr "NalaÅ¾enje adrese"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:841
 msgid "Name lookup failed"
 msgstr "TraÅ¾enje imena neuspelo"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:844
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "TraÅ¾enje imena neuspelo: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "UsklaÄ?ivanje poruka u fascikli â??%sâ?? sa diskom"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159
+#: ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Nije moguÄ? unos u dnevnik za fasciklu â??%sâ??: %s"
@@ -1882,26 +1972,26 @@ msgstr "Nije moguÄ?e uÄ?itati %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nije moguÄ?e uÄ?itati %s: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379
+#: ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nema dostupnog ponuÄ?aÄ?a za protokol â??%sâ??"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 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-anonymous.c:121
 #: ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "Neuspela autentifikacija."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1910,7 +2000,7 @@ msgstr ""
 "Neispravan podatak o poreklu elektronske adrese:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2009,7 @@ msgstr ""
 "Neispravan podatak o sloÅ¾enom poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1944,108 +2034,90 @@ msgstr "DIGEST-MD5"
 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:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Upit na server suviÅ¡e dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "Upit na server neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Upit na server je sadrÅ¾ao neispravan â??Kvalitet zaÅ¡titeâ?? unos"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "Odgovor servera nije sadrÅ¾ao podatke o autorizaciji"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "Odgovor servera je sadrÅ¾ao nekompletne podatke o autorizaciji"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaÅ¾e"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem Kerberos 5 prijave."
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:168
 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:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "PonuÄ?eni parametar target_name nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:176
 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:176
+#: ../camel/camel-sasl-gssapi.c:180
 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:181
+#: ../camel/camel-sasl-gssapi.c:185
 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:185
+#: ../camel/camel-sasl-gssapi.c:189
 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:194
 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:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Neuspele provere celovitosti na input_token."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "Neuspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:203
 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:209
+#: ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358
+#: ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "LoÅ¡ odgovor na autentifikaciju od servera."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
 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
 msgid "Login"
 msgstr "Prijava"
@@ -2055,7 +2127,7 @@ msgstr "Prijava"
 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:134
 msgid "Unknown authentication state."
 msgstr "Nepoznato stanje autentifikacije."
 
@@ -2091,27 +2163,27 @@ msgstr "POP pre SMTP auth koriÅ¡Ä?enjem nepoznatog transporta"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP pre SMTP auth koriÅ¡Ä?enjem izvora koji nije pop"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspelo prevoÄ?enje regularnog izraza: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Adresa â??%sâ?? traÅ¾i deo sa korisniÄ?kim imenom"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "Adresa â??%sâ?? traÅ¾i deo sa imenom domaÄ?ina"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Adresa â??%sâ?? traÅ¾i deo sa putanjom"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2120,225 +2192,225 @@ msgstr ""
 "Nije moguÄ?e napraviti direktorijum %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:484
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Unesite %s lozinku za %s na domaÄ?inu %s."
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:832
 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:447
+#: ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Nije moguÄ?e nalaÅ¾enje sertifikata za â??%sâ??"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "Nije moguÄ?e napraviti CMS poruku"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "Nije moguÄ?e potpisivanje CMS podataka"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "Nije moguÄ?e priloÅ¾iti potpisane CMS podatke"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "Nije moguÄ?e priloÅ¾iti CMS podatke"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "Nije moguÄ?e pravljenje podataka o CMS potpisniku"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "Nije moguÄ?e nalaÅ¾enje lanca sertifikata"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "Nije moguÄ?e dodavanje vremena CMS potpisa"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Sertifikat za Å¡ifrovanje â??%sâ?? ne postoji"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Nije moguÄ?e dodavanje atributa SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Nije moguÄ?e dodavanje atributa MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "Nije moguÄ?e dodavanje sertifikata za Å¡ifrovanje"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 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
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "Nije moguÄ?e napraviti kontekst za Å¡ifrovanje."
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 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
+#: ../camel/camel-smime-context.c:627
+#: ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "Neuspelo kodiranje podataka"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "Neprovereno"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "LoÅ¡ potpis"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 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:708
 msgid "Signing certificate not found"
 msgstr "Sertifikat potpisa nije naÄ?en"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "Sertifikat potpisa nije poverljiv"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "Algoritam potpisa je nepoznat"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "Algoritam potpisa je nepodrÅ¾an"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "Neispravan potpis"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "GreÅ¡ka pri obradi"
 
 # hm, hm...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "Nema potpisanog podatka u potpisu"
 
 # hm, moÅ¾e to i bolje od â??okruÅ¾enihâ??...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 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:790
+#: ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "Nije moguÄ?e izraÄ?unati zbirke"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "Nije moguÄ?e postaviti zbirke poruka"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821
+#: ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "Neuspeo uvoz sertifikata"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Poruka ima samo sertifikat, nije moguÄ?a provera sertifikata"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Poruka ima samo sertifikat, sertifikati uvezeni i provereni"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "Nije moguÄ?e naÄ?i zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, 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:960
+#: ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "Neuspelo dekodiranje"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nije moguÄ?e naÄ?i opÅ¡ti algoritam za Å¡ifrovanje gomile"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Nije moguÄ?e dodeliti mesto kljuÄ?u za Å¡ifrovanje gomile"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "Nije moguÄ?e napraviti CMS poruku"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "Nije moguÄ?e pravljenje CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Nije moguÄ?e prilaganje CMS Enveloped data"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "Nije moguÄ?e prilaganje objekta sa CMS podacima"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "Nije moguÄ?e pravljenje CMS podatka o primaocu"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "Nije moguÄ?e dodati podatak o CMS primaocu"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "Neuspelo dodavanje podataka u enkoder"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅ¡ifrovanje: nisu naÄ?eni Å¡ifrovani podaci"
 
-#: ../camel/camel-smime-context.c:1199
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "uvoz kljuÄ?eva: neizvedeno"
 
-#: ../camel/camel-smime-context.c:1207
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "izvoz kljuÄ?eva: neizvedeno"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nije moguÄ?e dobiti fasciklu: neispravna operacija"
 
@@ -2357,150 +2429,32 @@ 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/camel-vee-store.c:377
 #: ../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/camel-vee-store.c:414
 #: ../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"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
+#: ../camel/camel-store.c:900
 #: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "SmeÄ?e"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
+#: ../camel/camel-store.c:903
 #: ../camel/camel-vtrash-folder.c:56
 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-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL je istekao"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "GreÅ¡ka u CRL"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Nema viÅ¡e memorije"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Samopotpisani sertifikat je nulte veliÄ?ine"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Samopotpisani sertifikat u lancu"
-
-#: ../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-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Nije moguÄ?e dobiti potpis lista"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Lanac sertifikata je predugaÄ?ak"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "PovuÄ?en sertifikat"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neispravan izdavaÄ? sertifikata (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "PremaÅ¡ena duÅ¾ina putanje"
-
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Neispravna svrha"
-
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Nepoverljiv sertifikat"
-
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Odbijen sertifikat"
-
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Naslov/izdavaÄ? neslaganje"
-
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID neslaganje"
-
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/izdavaÄ? serijsko neslaganje"
-
-#: ../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-openssl.c:633
-msgid "Error in application verification"
-msgstr "GreÅ¡ka pri proveri programa"
-
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2467,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:876
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:876
 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:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2558,7 +2491,7 @@ msgstr ""
 "\n"
 "Å½elite li da prihvatite?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2567,7 +2500,7 @@ msgstr ""
 "Problem sa sertifikatom: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2576,7 +2509,7 @@ msgstr ""
 "LoÅ¡ domen sertifikata: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2585,7 +2518,7 @@ msgstr ""
 "Istekao sertifikat: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2599,33 +2532,33 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Nije moguÄ?e proÄ?itati adresu â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "GreÅ¡ka pri smeÅ¡tanju â??%sâ??: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke %s u %s"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:813
+#: ../camel/camel-vee-folder.c:819
 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-store.c:113
 #: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "Nepoklopljeno"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nije moguÄ?e obrisati fasciklu: %s: nema takve fascikle"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nije moguÄ?e promeniti ime fascikli: %s: nema takve fascikle"
@@ -2638,7 +2571,7 @@ msgstr "Nije moguÄ?e umnoÅ¾iti poruke u fasciklu za smeÄ?e"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Nije moguÄ?e umnoÅ¾iti poruke u fasciklu za Ä?ubre"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2647,21 +2580,22 @@ 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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "Nema takve poruke"
 
 # 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/groupwise/camel-groupwise-folder.c:149
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2669,12 +2603,12 @@ msgstr "Nema takve poruke"
 msgid "User canceled"
 msgstr "Korisnik odustao"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../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/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2684,281 +2618,302 @@ msgstr "Korisnik odustao"
 msgid "Cannot get message %s: %s"
 msgstr "Nije moguÄ?e dobiti poruku %s: %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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
 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: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:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
 msgid "Could not get message"
 msgstr "Nije moguÄ?e dobijanje poruke"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nije moguÄ?e uÄ?itavanje pregleda za %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, c-format
+#| msgid "Checking for new messages"
+msgid "Checking for deleted messages %s"
+msgstr "Proveravanje za obrisane poruke %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
 msgid "Trash Folder Full. Please Empty."
 msgstr "Fascikla za smeÄ?e je puna. Ispraznite je."
 
-#: ../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:1564
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Prikupljanje pregleda podataka za nove poruke u %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Nije moguÄ?e pravljenje poruke: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Nije moguÄ?e dobiti 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:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Nije moguÄ?e dodati 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
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
+#: ../camel/providers/imap4/camel-imap4-journal.c:327
 #, 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-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "Proveravanje za novom poÅ¡tom"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "Pro_veri za nove poruke u svim fasciklama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 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:63
 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/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Proveri da nema Ä?ubreta samo u fascikli SAN_DUÄ?E"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 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:72
 msgid "SOAP Settings"
 msgstr "SOAP podeÅ¡avanja"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 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:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Za pristupanje Novell Groupwise serverima"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../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/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 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-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
 msgstr "DomaÄ?in ili korisnik u adresi nisu dostupni"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imapx/camel-imapx-server.c:2302
 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:312
 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:533
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:331
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve fascikle %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Nije moguÄ?e pravljenje GroupWise fascikli u reÅ¾imu van mreÅ¾e."
 
-#: ../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:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/imapx/camel-imapx-store.c:687
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavna fascikla ne moÅ¾e sadrÅ¾ati fascikle u sebi"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Nije moguÄ?e preimenovati GroupWise 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:1349
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise server %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise servis za %s na %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise dostava poÅ¡te preko %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 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:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, 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/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Proveravanje za novom poÅ¡tom"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "Connection to Server"
 msgstr "Povezivanje na server"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 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/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Command:"
 msgstr "Komanda:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Fascikle"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "Prik_aÅ¾i samo prijavljene fascikle"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "O_verride server-supplied folder namespace"
 msgstr "P_remosti oblik imena fascikle koje daje server"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "Oblik imena"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Za pristupanje Hula serverima"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../camel/providers/hula/camel-hula-provider.c:95
 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/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 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:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 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:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "Operacija otkazana"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, 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:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2967,131 +2922,139 @@ msgstr ""
 "Upozorenje od IMAP servera %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NeoÄ?ekivan odgovor od IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Neuspela IMAP komanda: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 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:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor IMAP servera nije sadrÅ¾ao %s podatak"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NeoÄ?ekivan U redu odgovor od IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "Uvek proveri za nove poruke u ovoj fascikli"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nije moguÄ?e napraviti 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:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2997
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Pretraga za izmenjenim porukama u %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, 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
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "Nema odziva nakon naredbe APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Nepoznata greÅ¡ka se javila tokom naredbe APPEND!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nije moguÄ?e dovlaÄ?enje poruke: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imapx/camel-imapx-server.c:3943
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Nije moguÄ?e dobiti poruku sa IB %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:3944
 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:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 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:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Nepotpun odgovor servera: podaci nisu dati za poruku %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Nepotpun odgovor servera: JIB nije dat za poruku %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "Nije moguÄ?e pronaÄ?i telo poruke u FETCH odgovoru."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
 #, 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: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:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Neuspelo privremeno Ä?uvanje poruke %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Neuspelo privremeno Ä?uvanje %s: %s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
 msgid "Namespace:"
 msgstr "Oblik imena:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 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:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 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:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatski uskladi ud_aljenu poÅ¡tu sa lokalnom"
 
@@ -3100,124 +3063,121 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:92
 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/imapx/camel-imapx-provider.c:108
 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
+#: ../camel/providers/imap/camel-imap-store.c:435
+#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:203
 #, 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:566
+#: ../camel/providers/imap/camel-imap-store.c:581
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Nije moguÄ?e povezivanje 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:567
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL nije dostupan"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:2164
 msgid "Connection cancelled"
 msgstr "Povezivanje otkazano"
 
-#: ../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:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2209
+#: ../camel/providers/imapx/camel-imapx-server.c:2231
 #, 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"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2210
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podrÅ¾ano"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2232
 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:715
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 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:863
 #, 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/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/imapx/camel-imapx-store.c:383
+#: ../camel/providers/imapx/camel-imapx-store.c:856
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../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
+#: ../camel/providers/local/camel-spool-store.c:461
 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"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Å abloni"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, 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"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1313
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrÅ¡ke za tip prijave %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-server.c:2328
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3228,380 +3188,385 @@ msgstr ""
 "%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
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imapx/camel-imapx-store.c:672
 #, 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/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../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
+#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imapx/camel-imapx-store.c:680
 #, 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
+#: ../camel/providers/imap/camel-imap-store.c:3107
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "Veza sa serverom je neoÄ?ekivano iskljuÄ?ena"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
 #, 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
+#: ../camel/providers/imap4/camel-imap4-command.c:681
 #, 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:215
 #, 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:440
 #, 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:446
 #, 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:1414
 #, 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 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
+#: ../camel/providers/imap4/camel-imap4-engine.c:1546
+#: ../camel/providers/imap4/camel-imap4-engine.c:1584
+#: ../camel/providers/imap4/camel-imap4-engine.c:1628
+#: ../camel/providers/imap4/camel-imap4-engine.c:1683
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:88
 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
 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/imap4/camel-imap4-folder.c:427
 #, c-format
 msgid "Cannot access folder '%s': %s"
 msgstr "Nije moguÄ?e pristupiti fascikli â??%sâ??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imap4/camel-imap4-folder.c:484
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:490
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:630
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:635
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:891
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:896
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1063
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1182
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1186
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, 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
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "Proveri da nema _Ä?ubreta meÄ?u novim porukama"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:57
 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAPv4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
 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
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
 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
+#: ../camel/providers/imap4/camel-imap4-store.c:259
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "Povezivanje otkazano"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap4/camel-imap4-store.c:296
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:276
 msgid "TLS negotiations failed"
 msgstr "TLS pregovori nisu uspeli"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imap4/camel-imap4-store.c:411
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:534
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:697
+#: ../camel/providers/imap4/camel-imap4-store.c:964
 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
+#: ../camel/providers/imap4/camel-imap4-store.c:736
 #, 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"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
 #, 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"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
 msgid "Bad command"
 msgstr "LoÅ¡a komanda"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
 #, c-format
 msgid "Cannot create folder '%s': Invalid mailbox name"
 msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
 msgid "Cannot create folder '%s': Bad command"
 msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: loÅ¡a naredba"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
 #, 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
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Nije moguÄ?e brisanje IMAP fascikli u reÅ¾imu van mreÅ¾e."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
 #, c-format
 msgid "Cannot delete folder '%s': Invalid mailbox name"
 msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
 msgid "Cannot delete folder '%s': Bad command"
 msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: loÅ¡a naredba"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Special folder"
 msgstr "Nije moguÄ?e preimenovati fasciklu â??%sâ?? u â??%sâ??: specijalna fascikla"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 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/imap4/camel-imap4-store.c:1137
 #, 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"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "Nije moguÄ?e preimenovati fasciklu â??%sâ?? u â??%sâ??: loÅ¡a naredba"
 
 #. 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
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
 #, 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/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 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/imap4/camel-imap4-store.c:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
 #, 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/imap4/camel-imap4-store.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
 msgstr "Nije moguÄ?a prijava na fasciklu â??%sâ??: loÅ¡a naredba"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 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/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, 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/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, 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
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "Pretraga za izmenjenim porukama"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "IMAP server %s nije usklaÄ?en."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "Pribavljanje omota za nove poruke"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, 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
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "Nema podataka"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, 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/imapx/camel-imapx-folder.c:86
+#, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "Nije moguÄ?e uÄ?itavanje pregleda fascikle za %s"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:94
+#, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s"
+msgstr "Nije moguÄ?e napraviti ostavu za %s"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "Koristi _neaktivno ukoliko to server podrÅ¾ava"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "B_roj veza iz ostave za koriÅ¡Ä?enje"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 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"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2167
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Nije moguÄ?e povezivanje na %s (port %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Nije moguÄ?e povezivanje na POP server %s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
 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:395
 #, 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:402
 #, c-format
-msgid "mailbox:%s (%s)"
-msgstr "poÅ¡tansko sanduÄ?e:%s (%s)"
+#| 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:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3660,53 +3625,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Standardni Unix mbox spool direktorijum"
 
-#: ../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:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ostava root %s nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Ostava root %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:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nije moguÄ?e dobiti fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 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:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka poÅ¡te %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nije moguÄ?e preimenovati fasciklu %s u %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nije moguÄ?e preimenovati â??%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:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Nije moguÄ?e obrisati indeks 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:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Nije moguÄ?e obrisati meta datoteku fascikle â??%sâ??: %s"
@@ -3715,27 +3680,28 @@ msgstr "Nije moguÄ?e obrisati meta datoteku fascikle â??%sâ??: %s"
 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
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Prododata maildir poruka poniÅ¡tena"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, 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
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:225
+#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:244
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3744,27 +3710,32 @@ msgstr ""
 "Nije moguÄ?e dobiti poruku: %s iz fascikle %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "Neispravan sadrÅ¾aj poruke"
 
+#: ../camel/providers/local/camel-maildir-folder.c:418
+#| msgid "Cannot copy messages to the Junk folder"
+msgid "Cannot transfer message to destination folder"
+msgstr "Nije moguÄ?e preneti poruku u odrediÅ¡nu fasciklu"
+
 #: ../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-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Nije moguÄ?e preuzeti fasciklu â??%sâ??: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3787,76 +3758,76 @@ msgid "not a maildir directory"
 msgstr "nije maildir direktorijum"
 
 #: ../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-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Nije moguÄ?e pretraÅ¾iti fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nije moguÄ?e otvaranje putanje maildir direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Proveravanje celovitosti fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "Proveravanje za nove poruke"
 
-#: ../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-maildir-summary.c:724
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
 #: ../camel/providers/local/camel-spool-summary.c:150
 msgid "Storing folder"
 msgstr "SmeÅ¡tanje fascikle"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, 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
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, 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
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "Dodavanje poÅ¡te otkazano"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nije moguÄ?e dodavanje poruke u mbox datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Fascikla izgleda nepopravljivo oÅ¡teÄ?ena."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "Sastavljanje poruke neuspelo."
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "Nije moguÄ?e napraviti fasciklu ovog imena."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ??: nije obiÄ?na datoteka."
 
-#: ../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:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3865,130 +3836,130 @@ msgstr ""
 "Nije moguÄ?e obrisati fasciklu â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, 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:252
 #, 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:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Nije moguÄ?e obrisati pregled fascikle â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Nije moguÄ?e napraviti direktorijum â??%sâ??: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nije moguÄ?e napraviti fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "Fascikla veÄ? postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 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:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Nije moguÄ?e preimenovati â??%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:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nije moguÄ?e preimenovati â??%sâ?? u %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nije moguÄ?e otvoriti fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, 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"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nije moguÄ?e proveriti fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
 #: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nije moguÄ?e otvoriti datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nije moguÄ?e otvaranje privremenog poÅ¡tanskog sanduÄ?eta: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nije moguÄ?e zatvaranje izvorne fascikle %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Nije moguÄ?e zatvaranje privremene fascikle: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nije moguÄ?e preimenovati 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:858
+#: ../camel/providers/local/camel-mbox-summary.c:1084
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Nije moguÄ?e Ä?uvanje fascikle: %s"
 
-#: ../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:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
+#: ../camel/providers/local/camel-mbox-summary.c:1114
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 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:1047
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, 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:1190
+#: ../camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Neuspelo pisanje u privremeno poÅ¡tansko sanduÄ?e: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, 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
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "MH dodavanje poruke otkazano"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nije moguÄ?e dodati poruku u mh fasciklu: %s: %s"
@@ -4003,27 +3974,27 @@ msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ??: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nije moguÄ?e otvoriti putanju MH direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Priprema â??%sâ?? ne moÅ¾e se otvoriti: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:144
 #, 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:163
 #, 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:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4032,12 +4003,12 @@ msgstr ""
 "Nije moguÄ?e otvoriti fasciklu â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:177
 #, 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:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4046,48 +4017,48 @@ msgstr ""
 "Nije moguÄ?e napraviti fasciklu â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:190
 #, 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:207
 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:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Pripremna datoteka poÅ¡te %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Stablo fascikli za pripremu %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Fascikle za pripremu ne mogu biti preimenovane"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "Fascikle za pripremu ne mogu biti obrisane"
 
-#: ../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:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nije moguÄ?e uskladiti privremenu fasciklu %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nije moguÄ?e uskladiti 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:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4096,26 +4067,26 @@ msgstr ""
 "Nije moguÄ?e uskladiti 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:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, 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:365
 #: ../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:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
 #, 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:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne moÅ¾ete poslati NNTP poruke ako niste povezani!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne moÅ¾ete umnoÅ¾iti poruke iz NNTP fascikle!"
 
@@ -4139,22 +4110,22 @@ msgstr "Ovo je ponuÄ?aÄ? za Ä?itanje i slanje na USENET grupe vesti."
 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:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nije moguÄ?e Ä?itanje pozdrava od %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s je uzvratio kodom o greÅ¡ci %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET vesti preko %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,7 +4136,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4175,7 +4146,7 @@ msgstr ""
 "\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:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4185,62 +4156,62 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 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."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 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:982
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 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
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "Potrebna autentifikacija ali korisniÄ?ko ime nije uneto"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Nije moguÄ?a autentifikacija na server: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komanda neuspela: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Nepovezano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, 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:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: pretraÅ¾ivanje novih poruka"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "NeoÄ?ekivan odgovor xover-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "NeoÄ?ekivan odgovor head-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "Koristite odustani"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
@@ -4280,88 +4251,99 @@ msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "Ostava za poruke"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "_Ostavi poruke na serveru"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, 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:49
 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:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 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
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
 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:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
 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-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Neuspelo Ä?itanje ispravnog pozdrava POP servera %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c: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:246
+#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:281
 #, 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"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 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:263
+#, c-format
+#| msgid "Failed to connect to POP server %s in secure mode: %s"
+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"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:282
 msgid "TLS is not available in this build"
 msgstr "TLS nije dostupan u ovom izdanju"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:388
 #, 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:429
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #, 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."
 
-#: ../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:448
 #, 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"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Neuspela SASL prijava â??%sâ?? na POP server %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:462
 #, 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"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:481
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nije moguÄ?a autentifikacija na POP server %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:540
 #, 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."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4370,16 +4352,33 @@ msgstr ""
 "Nije moguÄ?e povezivanje 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:591
+#, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"Nije moguÄ?e povezivanje 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:601
 #, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 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"
+"GreÅ¡ka pri slanju lozinke%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:707
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle â??%sâ??."
@@ -4392,173 +4391,173 @@ msgstr "Sendmail"
 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:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Nije moguÄ?e Ä?itanje liste primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, 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"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nije moguÄ?e podeliti sendmail: %s: poÅ¡ta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail je zavrÅ¡io signalom %s: poÅ¡ta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nije moguÄ?e izvrÅ¡iti %s: poÅ¡ta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, 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
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 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:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Za dostavu poÅ¡te povezivanjem na prosleÄ?ivaÄ? poÅ¡te u mreÅ¾i koriÅ¡Ä?enjem SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "GreÅ¡ka u sintaksi, komanda nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 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:171
 msgid "Command not implemented"
 msgstr "Komanda nije podrÅ¾ana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "Parametar komande nije podrÅ¾an"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 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:177
 msgid "Help message"
 msgstr "Poruka o pomoÄ?i"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
 msgstr "Servis spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 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:183
 msgid "Service not available, closing transmission channel"
 msgstr "Servis nije dostupan, zatvaranje kanala prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "TraÅ¾ena radnja za poÅ¡tu u redu, zavrÅ¡eno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 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:189
 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:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "TraÅ¾ena radnja nije preduzeta: nedostupno poÅ¡tansko sanduÄ?e"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 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:195
 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:197
 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:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Odustato od traÅ¾ene radnje za poÅ¡tu: premaÅ¡en dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 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:203
 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:205
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 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:211
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizam autentifikacije je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neophodno Å¡ifrovanje za traÅ¾eni mehanizam autentifikacije"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "Neuspela privremena autentifikacija"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Neuspela STARTTLS komanda: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "Neuspela STARTTLS komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4569,93 +4568,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava poÅ¡te preko %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "Nije moguÄ?e slanje poruke: servis nije povezan."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nije moguÄ?e slanje poruke: jedan ili viÅ¡e neispravnih primalaca"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Neuspela HELO komanda: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "Neuspela HELO komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "SMTP autentifikacija"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Neuspela AUTH komanda: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "Neuspela AUTH komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "LoÅ¡ odgovor na autentifikaciju od servera.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "Neuspela MAIL FROM komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
 #, 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Neuspela DATA komanda: %s: poÅ¡ta nije poslata"
@@ -4663,108 +4662,108 @@ 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "DATA command failed"
 msgstr "Neuspela DATA komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Neuspela RSET komanda: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "Neuspela RSET komanda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Neuspela QUIT komanda: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "Neuspela QUIT komanda"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "Nadmetanje"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "Ciljevi/zadaci"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "Ä?estitke"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "VaÅ¾ni kontakti"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "MeÄ?unarodno"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "VaÅ¾na muÅ¡terija"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "LiÄ?no"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 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:63
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "DobavljaÄ?i"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "Vreme i izdaci"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "Ä?ekanje"
 
@@ -4772,8 +4771,8 @@ 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:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4780,8 @@ 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:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4789,8 @@ 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:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4798,83 @@ 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:1889
 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:1765
+#: ../libedataserver/e-time-utils.c:1884
 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:1768
 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
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
 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:1838
-#: ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4883,26 +4882,26 @@ msgstr "%H:%M:%S"
 #. 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
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
 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:1847
-#: ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
 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:1850
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4914,52 +4913,57 @@ msgstr "Anonimno pristupa LDAP serveru"
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela autentifikacija.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "Ikona kategorije"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "_Bez slike"
+
+#: ../libedataserverui/e-categories-dialog.c:372
 #, 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:526
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Ikona kategorije"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "Osobine kategorije"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "_Ikona kategorije"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "I_me kategorije"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+#| msgid "Item(s) belong to these _categories:"
+msgid "Item(s) _belong to these categories:"
+msgstr "Predmet(i) _pripada(ju) ovim kategorijama:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_UreÄ?ivanje"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "kategorije"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Izrada kategorije â??%sâ??"
@@ -4972,111 +4976,110 @@ msgstr "Podaci o bojama"
 msgid "The color to render"
 msgstr "Boja za obradu"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>Ko_ntakti</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>PrikaÅ¾i kontakte</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "A_dresar:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "_Adresar"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "Katego_rija:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_PretraÅ¾i:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Prostri %s unutar"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "U_mnoÅ¾i %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "I_seci %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "_Ukloni %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:240
 #, 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:1094
+#: ../libedataserverui/e-passwords.c:1099
 msgid "You have the Caps Lock key on."
 msgstr "Morate da ukljuÄ?ite velika slova."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1227
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1228
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -5085,488 +5088,40 @@ msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 msgid "Select destination"
 msgstr "Izaberite odrediÅ¡te"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_OdrediÅ¡te"
 
-#: ../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"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Unesite lozinku"
-
-#. 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"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "UreÄ?ivaÄ? za objavljivanje"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "UreÄ?ivaÄ?"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Autor za objavljivanje"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Autor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Autor koji ne ureÄ?uje"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Recenzent"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Saradnik"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "NiÅ¡ta"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "PrilagoÄ?eno"
-
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "OpÅ¡ta greÅ¡ka"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Fascikla istog imena veÄ? postoji"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Naveden tip fascikle nije ispravan"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O greÅ¡ka"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Nema dovoljno prostora za pravljenje fascikle"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Fascikla nije prazna"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Navedena fascikla nije pronaÄ?ena"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije primenjena u ovoj ostavi"
-
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Operacija nije podrÅ¾ana"
-
-#: ../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"
-
-#: ../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"
-
-#: ../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"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Nije moguÄ?e napraviti fasciklu toga imena"
-
-#: ../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."
-
-#. 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"
-
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "LiÄ?ne fascikle"
-
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Omiljene javne fascikle"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Sve javne fascikle"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Globalna lista adresa"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Obrisani predmeti"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "BeleÅ¡ke"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Odlazna"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslati predmeti"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ZaduÅ¾enja"
-
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "Neispravno povezivanje"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "Neispravan odgovor servera"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "Nema odgovora servera"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "LoÅ¡ parametar"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "PodrÅ¡ka datoteke adresara za Evoluciju"
-
-#: ../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"
-
-#: ../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"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servis za prijavu Servera podataka Evolucije"
-
-#. 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 "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"
-#~ "This probably means that your server requires you\n"
-#~ "to specify the Windows domain name as part of your\n"
-#~ "username (eg, \"DOMAIN\\user\").\n"
-#~ "\n"
-#~ "Or you might have just typed your password wrong.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nije moguÄ?a prijava na server.\n"
-#~ "\n"
-#~ "Ovo verovatno znaÄ?i da je serveru potrebno da\n"
-#~ "navedete ime Windows domena kao deo korisniÄ?kog\n"
-#~ "imena (npr. â??DOMEN\\korisnik\").\n"
-#~ "Ili ste moÅ¾da samo pogreÅ¡no ukucali lozinku.\n"
-#~ "\n"
-#~ msgid "Mailbox for %s is not on this server."
-#~ msgstr "Mailbox za %s nije na ovom serveru."
-#~ msgid ""
-#~ "The server '%s' is running Exchange 5.5 and is\n"
-#~ "therefore not compatible with Ximian Connector"
-#~ msgstr ""
-#~ "Server '%s' koristi Exchange 5.5 i stoga\n"
-#~ "nije kompatibilan sa Ximian Connector-om"
-#~ msgid ""
-#~ "Could not find Exchange Web Storage System at %s.\n"
-#~ "If OWA is running on a different path, you must specify that in the\n"
-#~ "account configuration dialog."
-#~ msgstr ""
-#~ "Nije moguÄ?e pronaÄ?i Exchange Web Storage System na %s.\n"
-#~ "Ukoliko OWA radi na drugoj putanji, morate je navesti u\n"
-#~ "podeÅ¡avanju naloga."
-#~ msgid "No mailbox for user %s on %s.\n"
-#~ msgstr "Nema mailbox-a za korisnika %s na %s.\n"
-#~ msgid "Could not connect to server %s: %s"
-#~ msgstr "Nije moguÄ?e povezivanje na server %s: %s"
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nije moguÄ?e povezivanje na domaÄ?ina"
-#~ msgid "Network error"
-#~ msgstr "GreÅ¡ka na mreÅ¾i"
-#~ msgid "Folder Name"
-#~ msgstr "Ime fascikle"
-#~ msgid "Folder Size"
-#~ msgstr "VeliÄ?ina fascikle"
-#~ msgid "Groupwise server %s"
-#~ msgstr "GroupWise server %s"
-#~ msgid "e_book_open: cancelled"
-#~ msgstr "e_book_open: otkazan"
-#~ msgid "e_book_load_uri: no factories available for uri `%s'"
-#~ msgstr "e_book_load_uri: nema dostupnih tvornica za adresu â??%sâ??"
-#~ msgid "File As"
-#~ msgstr "Zavedi kao"
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisam mogao da primenim GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Nisam mogao da primenim GPG %s: %s\n"
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Adresar i kalendar"
-#~ msgid "Post Office Agent:"
-#~ msgstr "Agent za poÅ¡tu:"
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Koristi bezbednu vezu (SSL)"
-#~ msgid "Checklist"
-#~ msgstr "Spisak za overu"
-#~ msgid "Server rejected username"
-#~ msgstr "Server je odbio korisnika"
-#~ msgid "Failed to send username to server"
-#~ msgstr "NeuspeÅ¡no slanje korisniÄ?kog imena serveru"
-#~ msgid "Server rejected username/password"
-#~ msgstr "Server je odbio korisnika/lozinku"
-#~ msgid "Could not get group list from server."
-#~ msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Ne mogu da uÄ?itam datoteku sa spiskom grupa za %s: %s"
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Ne mogu da saÄ?uvam datoteku sa spiskom grupa za %s: %s"
-#~ msgid "Evolution Addressbook file and LDAP backend"
-#~ msgstr "Datoteka adresara i LDAP podrÅ¡ka za Evoluciju"
-#~ msgid "uid? expects 1 argument"
-#~ msgstr "uid? oÄ?ekuje 1 argument"
-#~ msgid "uid? expects argument 1 to be a string"
-#~ msgstr "uid? oÄ?ekuje 1 argument da bude niska"
-#~ msgid "e_book_add_contact called on book before e_book_load_uri"
-#~ msgstr "pozvan je e_book_add_contact na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::addContact call"
-#~ msgstr "Corba izuzetak poziva Book::addContact"
-#~ msgid "e_book_commit_contact called on book before e_book_load_uri"
-#~ msgstr "pozvan je e_book_commit_contact na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::modifyContact call"
-#~ msgstr "Corba izuzetak poziva Book::modifyContact"
-#~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_fields na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getSupportedFields call"
-#~ msgstr "Corba izuzetak poziva Book::getSupportedFields"
-#~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
-#~ msgstr "e_book_get_supported_auth_methods na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getSupportedAuthMethods call"
-#~ msgstr "Corba izuzetak poziva Book::getSupportedAuthMethods"
-#~ msgid "e_book_authenticate_user on book before e_book_load_uri"
-#~ msgstr "e_book_authenticate_user na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::authenticateUser call"
-#~ msgstr "Corba izuzetak poziva Book::authenticateUser"
-#~ msgid "e_book_get_contact on book before e_book_load_uri"
-#~ msgstr "e_book_get_contact na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getContact call"
-#~ msgstr "Corba izuzetak poziva Book::getContact"
-#~ msgid "e_book_remove_contact on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contact na imeniku pre e_book_load_uri"
-#~ msgid "e_book_remove_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_remove_contacts na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::removeContacts call"
-#~ msgstr "Corba izuzetak poziva Book::removeContacts"
-#~ msgid "e_book_get_book_view on book before e_book_load_uri"
-#~ msgstr "e_book_get_book_view na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getBookView call"
-#~ msgstr "Corba izuzetak poziva Book::getBookView"
-#~ msgid "e_book_get_contacts on book before e_book_load_uri"
-#~ msgstr "e_book_get_contacts na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getContactList call"
-#~ msgstr "Corba izuzetak poziva Book::getContactList"
-#~ msgid "e_book_get_changes on book before e_book_load_uri"
-#~ msgstr "e_book_get_changes na imeniku pre e_book_load_uri"
-#~ msgid "Corba exception making Book::getChanges call"
-#~ msgstr "Corba izuzetak poziva Book::getChanges"
-#~ msgid "Corba exception making Book::cancelOperation call"
-#~ msgstr "Corba izuzetak poziva Book::cancelOperation"
-#~ 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"
+#~ 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: could not cancel"
+#~ msgstr "%s: nije bilo moguÄ?e otkazati"
 
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â??%sâ?? na knjizi posle â??%sâ??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]