[evolution-data-server/gnome-2-32] Updated Serbian translation

[Miloš Popović <mpopovic src gnome org>]

commit 744ccdc307e2420df8d3168889340b6c80f16b51
Author: Ð?иÑ?оÑ?лав Ð?иколиÑ? <miroslavnikolic rocketmail com>
Date:   Sun Jun 12 21:20:41 2011 +0200

    Updated Serbian translation

 po/sr.po       | 6304 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po | 6240 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 6740 insertions(+), 5804 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 452b7e6..4c7e1ff 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,225 +1,129 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution-data-server package.
-#
 # Maintainer: Ð?анило Шеган <dsegan gmx net>
 # Reviewed on 2005-08-20 by: Ð?гоÑ? Ð?еÑ?Ñ?оÑ?овиÑ? <igor prevod org>
-#
+# Ð?иÑ?оÑ?лав Ð?иколиÑ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: Ð?оÑ?ан РакиÑ? <grakic devbase net>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-06-07 12:29+0000\n"
+"PO-Revision-Date: 2011-06-03 09:39+0200\n"
+"Last-Translator: Ð?иÑ?оÑ?лав Ð?иколиÑ? <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Serbian (sr)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "УÑ?иÑ?аваÑ?е Ñ?е Ñ? Ñ?окÑ?..."
+msgstr "УÑ?иÑ?авам..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c: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:4505
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "Ð?Ñ?еÑ?Ñ?аживаÑ?е Ñ?е Ñ? Ñ?окÑ?..."
+msgstr "Ð?Ñ?еÑ?Ñ?ажÑ?Ñ?ем..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4664
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Ð?Ñ?еÑ?зимаÑ?е конÑ?акаÑ?а (%d)... "
+msgstr "Ð?Ñ?еÑ?зимам конÑ?акÑ?е (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "Ð?Ñ?вежаваÑ?е пÑ?еÑ?зеÑ?иÑ? конÑ?акаÑ?а (%d)... "
+msgstr "Ð?Ñ?вежавам пÑ?еÑ?зеÑ?е конÑ?акÑ?е (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Ð?иÑ?ам повезан"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:763
 msgid "Using Distinguished Name (DN)"
-msgstr "Ð?оÑ?иÑ?Ñ?еÑ?е иÑ?Ñ?акнÑ?Ñ?ог имена (DN)"
+msgstr "Ð?оÑ?иÑ?Ñ?им иÑ?Ñ?акнÑ?Ñ?о име (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:766
 msgid "Using Email Address"
 msgstr "Ð?оÑ?иÑ?Ñ?еÑ?е елекÑ?Ñ?онÑ?ке адÑ?еÑ?е"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1032
 msgid "Reconnecting to LDAP server..."
-msgstr "Ð?оновно повезиваÑ?е на LDAP Ñ?еÑ?веÑ?..."
+msgstr "Ð?оново Ñ?е повезÑ?Ñ?ем на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?..."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1157
+msgid "Invalid DN syntax"
+msgstr "Ð?еиÑ?пÑ?авна Ð?Ð? Ñ?инÑ?акÑ?а"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1674
 msgid "Adding contact to LDAP server..."
-msgstr "Ð?одаваÑ?е конÑ?акÑ?а на LDAP Ñ?еÑ?веÑ?..."
+msgstr "Ð?одаÑ?ем конÑ?акÑ? на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1806
 msgid "Removing contact from LDAP server..."
-msgstr "УклаÑ?аÑ?е конÑ?акÑ?а Ñ?а LDAP Ñ?еÑ?веÑ?а..."
+msgstr "УклаÑ?ам конÑ?акÑ? Ñ?а Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2242
 msgid "Modifying contact from LDAP server..."
-msgstr "Ð?еÑ?аÑ?е конÑ?акÑ?а Ñ?а LDAP Ñ?еÑ?веÑ?а..."
+msgstr "Ð?еÑ?ам конÑ?акÑ? Ñ?а Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4355
 msgid "Receiving LDAP search results..."
-msgstr "Ð?Ñ?имаÑ?е Ñ?езÑ?лÑ?аÑ?а пÑ?еÑ?Ñ?аге Ñ?а LDAP Ñ?еÑ?веÑ?а..."
+msgstr "Ð?Ñ?имам Ñ?езÑ?лÑ?аÑ?е пÑ?еÑ?Ñ?аге Ñ?а Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4527
 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
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: неиÑ?пÑ?аван извоÑ?."
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?Ñ?ваÑ?аÑ?е Ñ?еÑ?Ñ?Ñ?Ñ?а â??%sâ?? Ñ?а ХТТÐ? Ñ?Ñ?аÑ?ем: %d"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/libebook/e-book.c:3000
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: нема доÑ?Ñ?Ñ?пне пÑ?оизводÑ?е за адÑ?еÑ?Ñ? â??%s'"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+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:3298 ../calendar/libecal/e-cal.c:1046
+msgid "On This Computer"
+msgstr "Ð?а овом Ñ?аÑ?Ñ?наÑ?Ñ?"
 
-#: ../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:3315 ../calendar/libecal/e-cal.c:1066
+#: ../libedataserver/e-categories.c:62
+msgid "Personal"
+msgstr "Ð?иÑ?но"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: нема извоÑ?а за Ñ?иб â??%sâ?? Ñ?меÑ?Ñ?еног Ñ? gconf."
+#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libedata-book/e-data-book.c:181
+msgid "Address book does not exist"
+msgstr "Ð?дÑ?еÑ?аÑ? не поÑ?Ñ?оÑ?и"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Ð?единÑ?Ñ?вени Ð?Ð?"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "СмеÑ?Ñ?и под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Ð?дÑ?еÑ?а кÑ?иге"
 
@@ -227,810 +131,1009 @@ msgstr "Ð?дÑ?еÑ?а кÑ?иге"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Ð?Ñ?но име"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Ð?аÑ?о име"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Ð?Ñ?езиме"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Ð?адимак"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
+msgstr "1° елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
+msgstr "2° елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
+msgstr "3° елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
+msgstr "4° елекÑ?Ñ?онÑ?ка адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Ð?оÑ?иÑ?алаÑ?"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Ð?знака кÑ?Ñ?не адÑ?еÑ?е"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Ð?знака адÑ?еÑ?е на поÑ?лÑ?"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Ð?знака дÑ?Ñ?ге адÑ?еÑ?е"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ТелеÑ?он помоÑ?ника"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "ТелеÑ?он на поÑ?лÑ?"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. Ñ?елеÑ?он на поÑ?лÑ?"
+msgstr "2° Ñ?елеÑ?он на поÑ?лÑ?"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Ð?оÑ?ловни Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
-msgstr "TелеÑ?он за позиваÑ?е"
+msgstr "ТелеÑ?он за позиваÑ?е"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "ТелеÑ?он Ñ? колима"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "ТелеÑ?он пÑ?едÑ?зеÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Ð?Ñ?Ñ?ни Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. кÑ?Ñ?ни Ñ?елеÑ?он"
+msgstr "2° кÑ?Ñ?ни Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Ð?Ñ?Ñ?ни Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
-msgstr "ISDN"
+msgstr "Ð?СÐ?Ð?"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Ð?обилни Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Ð?Ñ?Ñ?ги Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Ð?Ñ?Ñ?ги Ñ?акÑ?"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Ð?еÑ?Ñ?еÑ?"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Ð?лавни Ñ?елеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "ТелекÑ?"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Ð?Ñ?ганизаÑ?иÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Ð?Ñ?ганизаÑ?иона Ñ?единиÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Ð?анÑ?елаÑ?иÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "ТиÑ?Ñ?ла"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Улога"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Ð Ñ?ководилаÑ?"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Ð?омоÑ?ник"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "Ð?иÑ?на Ñ?Ñ?Ñ?аниÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Ð?дÑ?еÑ?а веб дневника"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:691
 msgid "Categories"
 msgstr "Ð?аÑ?егоÑ?иÑ?е"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Ð?дÑ?еÑ?а календаÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Ð?дÑ?еÑ?а за Ñ?лободно/заÑ?зеÑ?о"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
-msgstr "ICS календаÑ?"
+msgstr "Ð?ЦС календаÑ?"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Ð?дÑ?еÑ?а видео конÑ?еÑ?енÑ?иÑ?е"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ð?ме Ñ?Ñ?пÑ?Ñ?жника"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Ð?апомена"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. кÑ?Ñ?но наденÑ?Ñ?о име за AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. наденÑ?Ñ?о име за AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. наденÑ?Ñ?о име за AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1° кÑ?Ñ?ни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. поÑ?ловно наденÑ?Ñ?о име за AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2° кÑ?Ñ?ни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. поÑ?ловно наденÑ?Ñ?о име за AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3° кÑ?Ñ?ни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. поÑ?ловно наденÑ?Ñ?о име за AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1° поÑ?ловни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. кÑ?Ñ?но наденÑ?Ñ?о име за GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2° поÑ?ловни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. кÑ?Ñ?но наденÑ?Ñ?о име за GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3° поÑ?ловни Ð?Ð?Ð? надимак"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. кÑ?Ñ?но наденÑ?Ñ?о име за GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1° кÑ?Ñ?ни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. поÑ?ловно наденÑ?Ñ?о име за GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2° кÑ?Ñ?ни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. поÑ?ловно наденÑ?Ñ?о име за GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3° кÑ?Ñ?ни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. поÑ?ловно наденÑ?Ñ?о име за GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1° поÑ?ловни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. кÑ?Ñ?ни Jabber налог"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2° поÑ?ловни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. кÑ?Ñ?ни Jabber налог"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3° поÑ?ловни Ð?Ñ?оÑ?пÐ?аÑ?з надимак"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. кÑ?Ñ?ни Jabber налог"
+msgid "Jabber Home ID 1"
+msgstr "1° кÑ?Ñ?ни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. поÑ?ловни Jabber налог"
+msgid "Jabber Home ID 2"
+msgstr "2° кÑ?Ñ?ни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. поÑ?ловни Jabber налог"
+msgid "Jabber Home ID 3"
+msgstr "3° кÑ?Ñ?ни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. поÑ?ловни Jabber налог"
+msgid "Jabber Work ID 1"
+msgstr "1° поÑ?ловни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. кÑ?Ñ?но наденÑ?Ñ?о име за Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2° поÑ?ловни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. кÑ?Ñ?но наденÑ?Ñ?о име за Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3° поÑ?ловни Ð?абеÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. кÑ?Ñ?но наденÑ?Ñ?о име за Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1° кÑ?Ñ?ни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. поÑ?ловно наденÑ?Ñ?о име за Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2° кÑ?Ñ?ни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. поÑ?ловно наденÑ?Ñ?о име за Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3° кÑ?Ñ?ни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. поÑ?ловно наденÑ?Ñ?о име за Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1° поÑ?ловни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. кÑ?Ñ?но наденÑ?Ñ?о име за MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2° поÑ?ловни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. кÑ?Ñ?но наденÑ?Ñ?о име за MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3° поÑ?ловни Ð?аÑ?Ñ?! надимак"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. кÑ?Ñ?но наденÑ?Ñ?о име за MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1° кÑ?Ñ?ни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. поÑ?ловно наденÑ?Ñ?о име за MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2° кÑ?Ñ?ни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. поÑ?ловно наденÑ?Ñ?о име за MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3° кÑ?Ñ?ни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. поÑ?ловно наденÑ?Ñ?о име за MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1° поÑ?ловни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. кÑ?Ñ?ни ICQ налог"
+msgid "MSN Work Screen Name 2"
+msgstr "2° поÑ?ловни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. кÑ?Ñ?ни ICQ налог"
+msgid "MSN Work Screen Name 3"
+msgstr "3° поÑ?ловни Ð?СÐ? надимак"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. кÑ?Ñ?ни ICQ налог"
+msgid "ICQ Home ID 1"
+msgstr "1° кÑ?Ñ?ни Ð?ЦÐ?Ñ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. поÑ?ловни ICQ налог"
+msgid "ICQ Home ID 2"
+msgstr "2° кÑ?Ñ?ни Ð?ЦÐ?Ñ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. поÑ?ловни ICQ налог"
+msgid "ICQ Home ID 3"
+msgstr "3° кÑ?Ñ?ни Ð?ЦÐ?Ñ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. поÑ?ловни ICQ налог"
+msgid "ICQ Work ID 1"
+msgstr "1° поÑ?ловни Ð?ЦÐ?Ñ? Ð?Ð?"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2° поÑ?ловни Ð?ЦÐ?Ñ? Ð?Ð?"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3° поÑ?ловни Ð?ЦÐ?Ñ? Ð?Ð?"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Ð?оÑ?ледÑ?а Ñ?евизиÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ð?ме или оÑ?г."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Разне адÑ?еÑ?е"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Ð?Ñ?Ñ?на адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Ð?дÑ?еÑ?а на поÑ?лÑ?"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Ð?Ñ?Ñ?га адÑ?еÑ?а"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "Ð?иÑ?Ñ?а каÑ?егоÑ?иÑ?а"
+msgstr "СпиÑ?ак каÑ?егоÑ?иÑ?а"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Слика"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Ð?ого"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ð?ме"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "Ð?иÑ?Ñ?а елекÑ?Ñ?онÑ?киÑ? адÑ?еÑ?а"
+msgstr "СпиÑ?ак е-адÑ?еÑ?а"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "Ð?иÑ?Ñ?а наденÑ?Ñ?иÑ? имена за AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "Ð?иÑ?Ñ?а GroupWise иб-а"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Ð?иÑ?Ñ?а Jabber налога"
+msgid "AIM Screen Name List"
+msgstr "СпиÑ?ак Ð?Ð?Ð? надимака"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Ð?иÑ?Ñ?а наденÑ?Ñ?иÑ? имена за Yahoo!"
+msgid "GroupWise ID List"
+msgstr "СпиÑ?ак Ð?Ñ?оÑ?пÐ?аÑ?з налога"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "Ð?иÑ?Ñ?а наденÑ?Ñ?иÑ? имена за MSN"
+msgid "Jabber ID List"
+msgstr "СпиÑ?ак Ð?абеÑ? налога"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "Ð?иÑ?Ñ?а ICQ налога"
+msgid "Yahoo! Screen Name List"
+msgstr "СпиÑ?ак Ð?аÑ?Ñ?! надимака"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "СпиÑ?ак Ð?СÐ? надимака"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "Wants HTML Mail"
-msgstr "Ð?ели HTML поÑ?Ñ?Ñ?"
+msgid "ICQ ID List"
+msgstr "СпиÑ?ак Ð?ЦÐ?Ñ? налога"
 
 #: ../addressbook/libebook/e-contact.c:256
+msgid "Wants HTML Mail"
+msgstr "Ð?ели ХТÐ?Ð? поÑ?Ñ?Ñ?"
+
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "Ð?иÑ?Ñ?а"
+msgstr "СпиÑ?ак"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "Ð?иÑ?Ñ?а пÑ?иказаниÑ? адÑ?еÑ?а"
+msgstr "СпиÑ?ак пÑ?иказаниÑ? адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "РоÑ?ендан"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../libedataserver/e-categories.c:47
 msgid "Anniversary"
 msgstr "Ð?одиÑ?Ñ?иÑ?а"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 Ñ?еÑ?Ñ?иÑ?икаÑ?"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu кÑ?Ñ?ни Ð?б 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu кÑ?Ñ?ни Ð?б 2"
+msgid "X.509 Certificate"
+msgstr "X.509 Ñ?веÑ?еÑ?е"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu кÑ?Ñ?ни Ð?б 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1° кÑ?Ñ?ни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu поÑ?ловни Ð?б 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2° кÑ?Ñ?ни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu поÑ?ловни Ð?б 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3° кÑ?Ñ?ни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu поÑ?ловни Ð?б 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1° поÑ?ловни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Ð?б лиÑ?Ñ?а"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2° поÑ?ловни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3° поÑ?ловни Ð?адÑ?-Ð?адÑ? Ð?Ð?"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "СпиÑ?ак Ð?адÑ?-Ð?адÑ? налога"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Ð?еогÑ?аÑ?Ñ?ки подаÑ?и"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "ТелеÑ?он"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. име за Skype код кÑ?Ñ?е"
+msgstr "1° кÑ?Ñ?но СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. име за Skype код кÑ?Ñ?е"
+msgstr "2° кÑ?Ñ?но СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. име за Skype код кÑ?Ñ?е"
+msgstr "3° кÑ?Ñ?но СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. име за Skype на поÑ?лÑ?"
+msgstr "1° поÑ?ловно СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. име за Skype на поÑ?лÑ?"
+msgstr "2° поÑ?ловно СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. име за Skype на поÑ?лÑ?"
+msgstr "3° поÑ?ловно СкаÑ?п име"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Ð?иÑ?Ñ?а наденÑ?Ñ?иÑ? имена за Skype"
+msgstr "СпиÑ?ак СкаÑ?п имена"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
-msgstr "SIP адÑ?еÑ?а"
+msgstr "СÐ?Ð? адÑ?еÑ?а"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "Ð?иÑ?Ñ?а без имена"
-
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "РоÑ?ендан"
+msgstr "Ð?еименовани Ñ?пиÑ?ак"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
 #, c-format
-msgid "Birthday: %s"
-msgstr "РоÑ?ендан: %s"
+msgid "Empty URI"
+msgstr "Ð?Ñ?азна адÑ?еÑ?а"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:367
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
 #, c-format
-msgid "Anniversary: %s"
-msgstr "Ð?одиÑ?Ñ?иÑ?а: %s"
+msgid "Invalid source"
+msgstr "Ð?еиÑ?пÑ?аван извоÑ?"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?ваÑ?е подаÑ?ака из календаÑ?а: лоÑ?а адÑ?еÑ?а."
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Success"
+msgstr "УÑ?пеÑ?но"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?аÑ?Ñ?ваÑ?и подаÑ?ке календаÑ?а"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "Ð?иÑ?е могÑ?Ñ?е да напÑ?авиÑ?и низ за пÑ?ибавÑ?аÑ?е делÑ?и"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и даÑ?оÑ?екÑ? за оÑ?Ñ?авÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Repository offline"
+msgstr "СкладиÑ?Ñ?е ниÑ?е на мÑ?ежи"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и низ за попÑ?Ñ?аваÑ?е оÑ?Ñ?аве"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libecal/e-cal.c:4174 ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Permission denied"
+msgstr "Ð?абÑ?аÑ?ен пÑ?иÑ?Ñ?Ñ?п"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
-msgid "Reply Requested: by "
-msgstr "Ð?оÑ?Ñ?ебан одговоÑ?: за "
+#: ../addressbook/libedata-book/e-data-book.c:174
+msgid "Contact not found"
+msgstr "Ð?онÑ?акÑ? ниÑ?е пÑ?онаÑ?ен"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
-msgid "Reply Requested: When convenient"
-msgstr "Ð?оÑ?Ñ?ебан одговоÑ?: када Ñ?е згодно"
+#: ../addressbook/libedata-book/e-data-book.c:175
+msgid "Contact ID already exists"
+msgstr "Ð?Ð? конÑ?акÑ?а веÑ? поÑ?Ñ?оÑ?и"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "УÑ?иÑ?аваÑ?е %s пÑ?едмеÑ?а"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Failed"
+msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "Ð?алендаÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Authentication Required"
+msgstr "Ð?оÑ?Ñ?ебна Ñ?е аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "Ð?еиÑ?пÑ?авна адÑ?еÑ?а Ñ?еÑ?веÑ?а"
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "Unsupported field"
+msgstr "Ð?еподÑ?жано поÑ?е"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Unsupported authentication method"
+msgstr "Ð?еподÑ?жан наÑ?ин аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
-msgid "Redirected to Invalid URI"
-msgstr "Ð?Ñ?еÑ?Ñ?меÑ?ено на неиÑ?пÑ?авнÑ? адÑ?еÑ?Ñ?"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "TLS not available"
+msgstr "ТÐ?С ниÑ?е доÑ?Ñ?Ñ?пан"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
-msgid "Bad file format."
-msgstr "Ð?оÑ? облик даÑ?оÑ?еке."
+#: ../addressbook/libedata-book/e-data-book.c:182
+msgid "Book removed"
+msgstr "Ð?Ñ?ига Ñ?е Ñ?клоÑ?ена"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
-msgid "Not a calendar."
-msgstr "Ð?иÑ?е календаÑ?."
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Not available in offline mode"
+msgstr "Ð?иÑ?е доÑ?Ñ?Ñ?пно Ñ? Ñ?ежимÑ? ван мÑ?еже"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
-msgid "Could not retrieve weather data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?аÑ?е подаÑ?ака о вÑ?еменÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search size limit exceeded"
+msgstr "Ð?Ñ?емаÑ?ена велиÑ?ина пÑ?еÑ?Ñ?аге"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
-msgid "Weather: Fog"
-msgstr "Ð?Ñ?еме: магла"
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search time limit exceeded"
+msgstr "Ð?Ñ?Ñ?екло вÑ?еме за пÑ?еÑ?Ñ?агÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Ð?Ñ?еме: облаÑ?но"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid query"
+msgstr "Ð?еиÑ?пÑ?аван Ñ?пиÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy Night"
-msgstr "Ð?Ñ?еме: облаÑ?на ноÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Query refused"
+msgstr "УпиÑ? Ñ?е одбиÑ?ен"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Overcast"
-msgstr "Ð?Ñ?еме: меÑ?Ñ?имиÑ?но облаÑ?но"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Could not cancel"
+msgstr "Ð?е могÑ? да оÑ?кажем"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Showers"
-msgstr "Ð?Ñ?еме: пÑ?Ñ?Ñ?ак"
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid server version"
+msgstr "Ð?еиÑ?пÑ?авна веÑ?зиÑ?а Ñ?еÑ?веÑ?а"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Snow"
-msgstr "Ð?Ñ?еме: Ñ?нег"
+#: ../addressbook/libedata-book/e-data-book.c:191
+msgid "No space"
+msgstr "Ð?ема пÑ?оÑ?Ñ?оÑ?а"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Ð?Ñ?еме: Ñ?Ñ?нÑ?ано"
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libecal/e-cal.c:4158 ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid argument"
+msgstr "Ð?еиÑ?пÑ?аван аÑ?гÑ?менÑ?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Clear Night"
-msgstr "Ð?Ñ?еме: ведÑ?а ноÑ?"
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libecal/e-cal.c:4196 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Ð?иÑ?е подÑ?жан"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Thunderstorms"
-msgstr "Ð?Ñ?еме: гÑ?мÑ?авине"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Ð?Ñ?Ñ?га гÑ?еÑ?ка"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
-msgid "Forecast"
-msgstr "Ð?Ñ?огноза"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:322
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им кÑ?игÑ?: %s"
 
-#: ../calendar/libecal/e-cal-component.c:1322
-msgid "Untitled appointment"
-msgstr "Ð?еименовани заказани Ñ?аÑ?Ñ?анак"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:344
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ð?е могÑ? да Ñ?клоним кÑ?игÑ?: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
-msgid "1st"
-msgstr "1."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:361
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем конÑ?акÑ?: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
-msgid "2nd"
-msgstr "2."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:395
+#, c-format
+msgid "Empty query: %s"
+msgstr "Ð?Ñ?азан Ñ?пиÑ?: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
-msgid "3rd"
-msgstr "3."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем Ñ?пиÑ?ак конÑ?акÑ?а: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
-msgid "4th"
-msgstr "4."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ð?е могÑ? да поÑ?вÑ?дим иденÑ?иÑ?еÑ? коÑ?иÑ?ника: %s "
 
-#: ../calendar/libecal/e-cal-recur.c:4045
-msgid "5th"
-msgstr "5."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:463
+#: ../addressbook/libedata-book/e-data-book.c:482
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ð?е могÑ? да додам конÑ?акÑ?: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
-msgid "6th"
-msgstr "6."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:500
+#: ../addressbook/libedata-book/e-data-book.c:519
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ð?е могÑ? да изменим конÑ?акÑ?: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
-msgid "7th"
-msgstr "7."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:558
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ð?е могÑ? да Ñ?клоним конÑ?акÑ?е: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем подÑ?жана поÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем обавезна поÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем подÑ?жане наÑ?ине поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:662
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Ð?еиÑ?пÑ?аван Ñ?пиÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:698
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ð?е могÑ? да добиÑ?ем измене: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:738
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пела опеÑ?аÑ?иÑ?а оÑ?казиваÑ?а: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "Ð?Ñ?аÑ?ен Ñ?е неоÑ?екивани код â??%dâ?? ХТТÐ? Ñ?Ñ?аÑ?а"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Ð?алендаÑ? не подÑ?жава Слободно / Ð?аÑ?зеÑ?о"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../libedataserver/e-categories.c:48
+msgid "Birthday"
+msgstr "РоÑ?ендан"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#, c-format
+msgid "Birthday: %s"
+msgstr "РоÑ?ендан: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#, c-format
+msgid "Anniversary: %s"
+msgstr "Ð?одиÑ?Ñ?иÑ?а: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "Ð?е могÑ? да Ñ?аÑ?Ñ?вам подаÑ?ак из календаÑ?а: лоÑ?а адÑ?еÑ?а."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "Ð?е могÑ? да Ñ?аÑ?Ñ?вам подаÑ?ке календаÑ?а"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+msgid "Reply Requested: by "
+msgstr "Ð?оÑ?Ñ?ебан Ñ?е одговоÑ?: за "
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+msgid "Reply Requested: When convenient"
+msgstr "Ð?оÑ?Ñ?ебан Ñ?е одговоÑ?: када Ñ?е згодно"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#, c-format
+msgid "Loading %s items"
+msgstr "УÑ?иÑ?авам â??%sâ?? Ñ?Ñ?авке"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
+msgid "Calendar"
+msgstr "Ð?алендаÑ?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+msgid "Invalid server URI"
+msgstr "Ð?еиÑ?пÑ?авна адÑ?еÑ?а Ñ?еÑ?веÑ?а"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:782
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ð?е могÑ? да напÑ?авим даÑ?оÑ?екÑ? за оÑ?Ñ?авÑ?"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+msgid "Could not create thread for populating cache"
+msgstr "Ð?е могÑ? да напÑ?авим низ за попÑ?Ñ?аваÑ?е оÑ?Ñ?аве"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
+msgid "Redirected to Invalid URI"
+msgstr "Ð?Ñ?еÑ?Ñ?меÑ?ено на неиÑ?пÑ?авнÑ? адÑ?еÑ?Ñ?"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:455
+msgid "Bad file format."
+msgstr "Ð?оÑ? облик даÑ?оÑ?еке."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:462
+msgid "Not a calendar."
+msgstr "Ð?иÑ?е календаÑ?."
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "Ð?е могÑ? да добиÑ?ем подаÑ?ке о вÑ?еменÑ?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Fog"
+msgstr "Ð?Ñ?еме: магла"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy Night"
+msgstr "Ð?Ñ?еме: облаÑ?на ноÑ?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "Ð?Ñ?еме: облаÑ?но"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Overcast"
+msgstr "Ð?Ñ?еме: меÑ?Ñ?имиÑ?но облаÑ?но"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Showers"
+msgstr "Ð?Ñ?еме: пÑ?Ñ?Ñ?ак"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+msgid "Weather: Snow"
+msgstr "Ð?Ñ?еме: Ñ?нег"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Clear Night"
+msgstr "Ð?Ñ?еме: ведÑ?а ноÑ?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "Ð?Ñ?еме: Ñ?Ñ?нÑ?ано"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+msgid "Weather: Thunderstorms"
+msgstr "Ð?Ñ?еме: гÑ?мÑ?авине"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+msgid "Forecast"
+msgstr "Ð?Ñ?огноза"
+
+#: ../calendar/libecal/e-cal-component.c:1306
+msgid "Untitled appointment"
+msgstr "Ð?еименовани заказани Ñ?аÑ?Ñ?анак"
+
+#: ../calendar/libecal/e-cal-recur.c:3979
+msgid "1st"
+msgstr "1°"
+
+#: ../calendar/libecal/e-cal-recur.c:3980
+msgid "2nd"
+msgstr "2°"
+
+#: ../calendar/libecal/e-cal-recur.c:3981
+msgid "3rd"
+msgstr "3°"
+
+#: ../calendar/libecal/e-cal-recur.c:3982
+msgid "4th"
+msgstr "4°"
+
+#: ../calendar/libecal/e-cal-recur.c:3983
+msgid "5th"
+msgstr "5°"
+
+#: ../calendar/libecal/e-cal-recur.c:3984
+msgid "6th"
+msgstr "6°"
+
+#: ../calendar/libecal/e-cal-recur.c:3985
+msgid "7th"
+msgstr "7°"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
-msgstr "8."
+msgstr "8°"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
-msgstr "9."
+msgstr "9°"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
-msgstr "10."
+msgstr "10°"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
-msgstr "11."
+msgstr "11°"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
-msgstr "12."
+msgstr "12°"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
-msgstr "13."
+msgstr "13°"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
-msgstr "14."
+msgstr "14°"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
-msgstr "15."
+msgstr "15°"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
-msgstr "16."
+msgstr "16°"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
-msgstr "17."
+msgstr "17°"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
-msgstr "18."
+msgstr "18°"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
-msgstr "19."
+msgstr "19°"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
-msgstr "20."
+msgstr "20°"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
-msgstr "21."
+msgstr "21°"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
-msgstr "22."
+msgstr "22°"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
-msgstr "23."
+msgstr "23°"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
-msgstr "24."
+msgstr "24°"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
-msgstr "25."
+msgstr "25°"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
-msgstr "26."
+msgstr "26°"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
-msgstr "27."
+msgstr "27°"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
-msgstr "28."
+msgstr "28°"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
-msgstr "29."
+msgstr "29°"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
-msgstr "30."
+msgstr "30°"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
-msgstr "31."
+msgstr "31°"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Ð?иÑ?око"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Ð?оÑ?мално"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Ð?иÑ?ко"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Ð?едеÑ?иниÑ?ано"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1291 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за %s (коÑ?иÑ?ник %s)"
@@ -1039,427 +1142,576 @@ 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:1305
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "УнеÑ?иÑ?е лозинкÑ? за %s како би мÑ?ежни поÑ?Ñ?едник био омогÑ?Ñ?ен за %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Ð?еиÑ?пÑ?аван аÑ?гÑ?менÑ?"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4160
 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:4162
 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:4164
 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:4166 ../calendar/libedata-cal/e-data-cal.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:4168 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Ð?еиÑ?пÑ?аван обÑ?екаÑ?"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4170
 msgid "URI not loaded"
 msgstr "Ð?дÑ?еÑ?а ниÑ?е Ñ?Ñ?иÑ?ана"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4172
 msgid "URI already loaded"
 msgstr "Ð?дÑ?еÑ?а Ñ?е веÑ? Ñ?Ñ?иÑ?ана"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Ð?абÑ?аÑ?ен пÑ?иÑ?Ñ?Ñ?п"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4176 ../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:4178 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "Ð?Ð? обÑ?екÑ?а веÑ? поÑ?Ñ?оÑ?и"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4180
 msgid "Protocol not supported"
 msgstr "Ð?Ñ?оÑ?окол ниÑ?е подÑ?жан"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4182
 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:4184
 msgid "Could not cancel operation"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?казаÑ?и опеÑ?аÑ?иÑ?Ñ?"
+msgstr "Ð?е могÑ? да оÑ?кажем опеÑ?аÑ?иÑ?Ñ?"
+
+#: ../calendar/libecal/e-cal.c:4186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "Ð?оÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а ниÑ?е Ñ?Ñ?пело"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4188
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
-msgstr "Ð?бавезна аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "Ð?оÑ?ло Ñ?е до CORBA изÑ?зеÑ?ка"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
+msgstr "Ð?оÑ?Ñ?ебно Ñ?е поÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а"
+
+#: ../calendar/libecal/e-cal.c:4190
+msgid "A D-Bus exception has occurred"
+msgstr "Ð?оÑ?ло Ñ?е до Ð?-баÑ? изÑ?зеÑ?ка"
+
+#: ../calendar/libecal/e-cal.c:4192
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
+#: ../camel/providers/smtp/camel-smtp-transport.c:535
+#: ../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:4194
 msgid "No error"
 msgstr "Ð?ема гÑ?еÑ?ке"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â??%sâ?? не оÑ?екÑ?Ñ?е аÑ?гÑ?менÑ?е"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е Ñ?едан аÑ?гÑ?менÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да пÑ?ви аÑ?гÑ?менÑ? бÑ?де ниÑ?ка"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да пÑ?ви аÑ?гÑ?менÑ? бÑ?де ниÑ?ка Ð?СÐ? 8601 даÑ?Ñ?ма/вÑ?емена"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е два аÑ?гÑ?менÑ?а"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да пÑ?ви аÑ?гÑ?менÑ? бÑ?де time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да дÑ?Ñ?ги аÑ?гÑ?менÑ? бÑ?де Ñ?ео бÑ?оÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да дÑ?Ñ?ги аÑ?гÑ?менÑ? бÑ?де time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да дÑ?Ñ?ги аÑ?гÑ?менÑ? бÑ?де ниÑ?ка"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да пÑ?ви аÑ?гÑ?менÑ? бÑ?де â??anyâ??, â??summaryâ??, â??descriptionâ??, â??locationâ??, â??attendeeâ??, â??organizerâ??, или â??classificationâ??"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"â??%sâ?? оÑ?екÑ?Ñ?е да пÑ?ви аÑ?гÑ?менÑ? бÑ?де â??anyâ??, â??summaryâ??, â??descriptionâ??, "
+"â??locationâ??, â??attendeeâ??, â??organizerâ??, или â??classificationâ??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â??%sâ?? оÑ?екÑ?Ñ?е баÑ? Ñ?едан аÑ?гÑ?менÑ?"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "â??%sâ?? оÑ?екÑ?Ñ?е да Ñ?ви аÑ?гÑ?менÑ?и бÑ?дÑ? ниÑ?ке или Ñ?едан и Ñ?амо Ñ?едан аÑ?гÑ?менÑ? да бÑ?де логиÑ?ки неÑ?аÑ?ан (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"â??%sâ?? оÑ?екÑ?Ñ?е да Ñ?ви аÑ?гÑ?менÑ?и бÑ?дÑ? ниÑ?ке или Ñ?едан и Ñ?амо Ñ?едан аÑ?гÑ?менÑ? да "
+"бÑ?де логиÑ?ки неÑ?аÑ?ан (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Invalid range"
 msgstr "Ð?еиÑ?пÑ?аван опÑ?ег"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Ð?еподÑ?жано поÑ?е"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported method"
 msgstr "Ð?еподÑ?жан меÑ?од"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Ð?емподÑ?жан меÑ?од аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Calendar does not exist"
+msgstr "Ð?алендаÑ? не поÑ?Ñ?оÑ?и"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ниÑ?е доÑ?Ñ?Ñ?пан"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unknown user"
+msgstr "Ð?епознаÑ? коÑ?иÑ?ник"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Рад ван мÑ?еже ниÑ?е доÑ?Ñ?Ñ?пан"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем адÑ?еÑ?Ñ? календаÑ?а: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Ð?Ñ?емаÑ?ена велиÑ?ина пÑ?еÑ?Ñ?аге"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:628
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем адÑ?еÑ?Ñ? е-поÑ?Ñ?е алаÑ?ма календаÑ?а: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Ð?Ñ?Ñ?екло вÑ?еме за пÑ?еÑ?Ñ?агÑ?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:648
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ð?Ð?Ð?Ð? оÑ?обинÑ? календаÑ?а: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Ð?еиÑ?пÑ?аван Ñ?пиÑ?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем инÑ?оÑ?маÑ?иÑ?е заказиваÑ?а календаÑ?а: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "УпиÑ? одбиÑ?ен"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:687
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им календаÑ?: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Ð?еиÑ?пÑ?авна веÑ?зиÑ?а Ñ?еÑ?веÑ?а"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "Ð?е могÑ? да оÑ?вежим календаÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:727
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "Ð?е могÑ? да Ñ?клоним календаÑ?: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:748
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "Ð?е могÑ? да напÑ?авим обÑ?екаÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:772
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "Ð?е могÑ? да изменим обÑ?екаÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:798
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "Ð?е могÑ? да Ñ?клоним обÑ?екаÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ð?е могÑ? да пÑ?имим обÑ?екÑ?е календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:838
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ð?е могÑ? да одбаÑ?им алаÑ?м календаÑ?а: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем обÑ?екÑ?е календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:884
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем оÑ?новнÑ? пÑ?Ñ?аÑ?Ñ? обÑ?екÑ?а календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:904
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем пÑ?Ñ?аÑ?Ñ? обÑ?екÑ?а календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:924
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?пиÑ?ак обÑ?екÑ?а календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:952
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?пиÑ?ак пÑ?илога: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:978
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "Ð?е могÑ? да довÑ?Ñ?им Ñ?пиÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:998
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем вÑ?еменÑ?кÑ? зонÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "Ð?е могÑ? да додам вÑ?еменÑ?кÑ? зонÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1037
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ð?е могÑ? да подеÑ?им оÑ?новнÑ? вÑ?еменÑ?кÑ? зонÑ? календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1060
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем измене календаÑ?а: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1091
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?пиÑ?ак Ñ?лободног/заÑ?зеÑ?ог календаÑ?а: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#, c-format
+msgid "Invalid URI"
+msgstr "Ð?еиÑ?пÑ?авна адÑ?еÑ?а"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:389
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Ð?ема погона позадинÑ?а за â??%sâ?? од â??%sâ??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:439
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Ð?е могÑ? да покÑ?енем позадинÑ?а"
+
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "УпоÑ?Ñ?ебÑ?ени алгоÑ?иÑ?ам не подÑ?жава поÑ?пиÑ?иваÑ?е"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Ð?оÑ?пиÑ?иваÑ?е поÑ?Ñ?ке"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "УпоÑ?Ñ?ебÑ?ени алгоÑ?иÑ?ам не подÑ?жава пÑ?овеÑ?Ñ?"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "Ð?Ñ?овеÑ?аваÑ?е поÑ?Ñ?ке"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "УпоÑ?Ñ?ебÑ?ени алгоÑ?иÑ?ам не подÑ?жава Ñ?иÑ?Ñ?оваÑ?е"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "ШиÑ?Ñ?оваÑ?е поÑ?Ñ?ке"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "УпоÑ?Ñ?ебÑ?ени алгоÑ?иÑ?ам не подÑ?жава деÑ?иÑ?Ñ?оваÑ?е"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "Ð?еÑ?иÑ?Ñ?оваÑ?е поÑ?Ñ?ке"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Ð?ожда неÑ?еÑ?е моÑ?и да Ñ?везеÑ?е кÑ?Ñ?Ñ?еве Ñ?а овим алгоÑ?иÑ?мом"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Ð?ожда неÑ?еÑ?е моÑ?и да извезеÑ?е кÑ?Ñ?Ñ?еве Ñ?а овим алгоÑ?иÑ?мом"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и пÑ?Ñ?аÑ?Ñ? за пÑ?ивÑ?емено Ñ?Ñ?ваÑ?е"
+msgstr "Ð?е могÑ? да напÑ?авиÑ?и пÑ?Ñ?аÑ?Ñ? за пÑ?ивÑ?емено Ñ?Ñ?ваÑ?е"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:499
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?клониÑ?и Ñ?ноÑ? из оÑ?Ñ?аве: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног Ñ?ока"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "Ð?едовоÑ?но мемоÑ?иÑ?е"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е Ñ?пиÑ?аÑ?и Ñ?ноÑ? Ñ? лог: %s\n"
+"Ð?е могÑ? да запиÑ?ем Ñ?ноÑ? дневника: %s\n"
 "Ð?аÑ?е опеÑ?аÑ?иÑ?е на овом Ñ?еÑ?веÑ?Ñ? неÑ?е биÑ?и извÑ?Ñ?ене када\n"
 "Ñ?е бÑ?деÑ?е поново повезали на мÑ?ежÑ?."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и â??%sâ??:\n"
+"Ð?е могÑ? да оÑ?воÑ?им â??%sâ??:\n"
 "%s\n"
 "Ð?Ñ?омене на овоÑ? Ñ?аÑ?Ñ?икли неÑ?е биÑ?и Ñ?Ñ?клаÑ?ене."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
-msgstr "Ð?оновно Ñ?Ñ?клаÑ?иваÑ?е Ñ?а Ñ?еÑ?веÑ?ом"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Умножи Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле локално за Ñ?ад ван мÑ?еже"
+msgstr "Ð?Ñ?Ñ?им поновно Ñ?Ñ?клаÑ?иваÑ?е Ñ?а Ñ?еÑ?веÑ?ом"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
-msgstr "Ð?Ñ?еÑ?зимаÑ?е новиÑ? поÑ?Ñ?ка Ñ? за Ñ?ад ван мÑ?еже"
+msgstr "Ð?Ñ?еÑ?зимам нове поÑ?Ñ?ке за Ñ?ад ван мÑ?еже"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:392
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Ð?Ñ?ипÑ?емаÑ?е Ñ?аÑ?Ñ?икле â??%sâ?? за Ñ?ад ван мÑ?еже"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "Ð?Ñ?ипÑ?емам Ñ?аÑ?Ñ?иклÑ? â??%sâ?? за Ñ?ад ван мÑ?еже"
+
+#: ../camel/camel-disco-folder.c:458 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "Умножи Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле локално за Ñ?ад ван мÑ?еже"
+
+#: ../camel/camel-disco-store.c:398
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-folder.c:164
+#: ../camel/providers/imapx/camel-imapx-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-folder.c:224
+#: ../camel/providers/imapx/camel-imapx-folder.c:282
+#: ../camel/providers/imapx/camel-imapx-folder.c:325
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:388
+#: ../camel/providers/imapx/camel-imapx-store.c:193
+#: ../camel/providers/imapx/camel-imapx-store.c:720
+#: ../camel/providers/imapx/camel-imapx-store.c:783
+#: ../camel/providers/imapx/camel-imapx-store.c:842
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Ð?оÑ?аÑ?е да бÑ?деÑ?е на мÑ?ежи да би завÑ?Ñ?или овÑ? опеÑ?аÑ?иÑ?Ñ?"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Ð?ема доÑ?Ñ?Ñ?пног опиÑ?а"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
+#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4757
+#: ../camel/providers/imapx/camel-imapx-server.c:4774
+#: ../camel/providers/imapx/camel-imapx-store.c:241
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:626
+#: ../camel/providers/pop3/camel-pop3-folder.c:691
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Ð?Ñ?казано"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Ð?Ñ?казано"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Ð?еÑ?Ñ?пело пÑ?авÑ?еÑ?е Ñ?адÑ?жаног пÑ?оÑ?еÑ?а â??%sâ??: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да напÑ?авим Ñ?адÑ?жани пÑ?оÑ?еÑ? â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Ð?еиÑ?пÑ?аван низ поÑ?Ñ?ка пÑ?имÑ?ен од %s: %s"
+msgstr "Ð?еиÑ?пÑ?аван низ поÑ?Ñ?ка пÑ?имÑ?ен од â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
-msgstr "УÑ?клаÑ?иваÑ?е Ñ?аÑ?Ñ?икли"
+msgstr "УÑ?клаÑ?Ñ?Ñ?ем Ñ?аÑ?Ñ?икле"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?иÑ?аÑ?Ñ? Ñ?илÑ?еÑ?а: %s: %s"
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом Ñ?иÑ?аÑ?а Ñ?илÑ?еÑ?а: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Ð?Ñ?еÑ?ка Ñ? пÑ?имени Ñ?илÑ?еÑ?а: %s: %s"
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом пÑ?имене Ñ?илÑ?еÑ?а: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е Ñ?аÑ?Ñ?икле пÑ?ипÑ?еме"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им Ñ?аÑ?Ñ?иклÑ? пÑ?ипÑ?еме"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?а обÑ?ада Ñ?аÑ?Ñ?икле пÑ?ипÑ?еме"
+msgstr "Ð?е могÑ? да обÑ?адим Ñ?аÑ?Ñ?иклÑ? пÑ?ипÑ?еме"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Ð?Ñ?имаÑ?е поÑ?Ñ?ке %d (%d%%)"
+msgstr "Ð?Ñ?имам поÑ?Ñ?кÑ? %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и поÑ?Ñ?кÑ?"
-
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, 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:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
-msgstr "УÑ?клаÑ?иваÑ?е Ñ?аÑ?Ñ?икле"
+msgstr "УÑ?клаÑ?Ñ?Ñ?ем Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "Ð?авÑ?Ñ?ено"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Ð?Ñ?имаÑ?е поÑ?Ñ?ке %d од %d"
+msgstr "Ð?Ñ?имам поÑ?Ñ?кÑ? %d од %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Ð?Ñ?еÑ?ка код поÑ?Ñ?ке %d од %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "Ð?еÑ?Ñ?пело довлаÑ?еÑ?е поÑ?Ñ?ке"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да довÑ?Ñ?ем поÑ?Ñ?кÑ?"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1719,406 @@ msgstr "Ð?еиÑ?пÑ?авни аÑ?гÑ?менÑ?и за (Ñ?иÑ?Ñ?емÑ?ка-озн
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "Ð?еипÑ?Ñ?авни аÑ?гÑ?менÑ?и за (коÑ?иÑ?ниÑ?ка-ознака)"
+msgstr "Ð?еиÑ?пÑ?авни аÑ?гÑ?менÑ?и за (коÑ?иÑ?ниÑ?ка-ознака)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ð?Ñ?еÑ?ка Ñ? пÑ?имени Ñ?илÑ?еÑ?а за пÑ?еÑ?Ñ?агÑ?: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е изÑ?аза за пÑ?еÑ?Ñ?агÑ?: %s:\n"
+"Ð?е могÑ? да анализиÑ?ам изÑ?аз пÑ?еÑ?Ñ?аге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Ð?Ñ?еÑ?ка пÑ?и извÑ?Ñ?аваÑ?Ñ? изÑ?аза за пÑ?еÑ?Ñ?агÑ?: %s:\n"
+"Ð?Ñ?еÑ?ка пÑ?иликом извÑ?Ñ?аваÑ?а изÑ?аза пÑ?еÑ?Ñ?аге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) заÑ?Ñ?ева Ñ?амо Ñ?едан логиÑ?ки Ñ?езÑ?лÑ?аÑ?"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:938
 #, 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:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) заÑ?Ñ?ева ниÑ?кÑ? Ñ?а Ñ?ипом поклапаÑ?а"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) оÑ?екÑ?Ñ?е низ као Ñ?езÑ?лÑ?аÑ?"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) заÑ?Ñ?ева Ñ?кÑ?п Ñ?аÑ?Ñ?икли"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?икÑ?Ñ?Ñ?еÑ?е поÑ?Ñ?ке: за %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?еÑ?Ñ?ага по изÑ?азÑ?: за %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "УÑ?им новÑ? Ñ?пам поÑ?Ñ?кÑ? Ñ? â??%sâ??"
+msgstr[1] "УÑ?им нове Ñ?пам поÑ?Ñ?ке Ñ? â??%sâ??"
+msgstr[2] "УÑ?им нове Ñ?пам поÑ?Ñ?ке Ñ? â??%sâ??"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:147
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?ебÑ?оÑ?аваÑ?е по изÑ?азÑ?: за %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "УÑ?им новÑ? Ñ?ам поÑ?Ñ?кÑ? Ñ? %s"
+msgstr[1] "УÑ?им нове Ñ?ам поÑ?Ñ?ке Ñ? %s"
+msgstr[2] "УÑ?им нове Ñ?ам поÑ?Ñ?ке Ñ? %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?еÑ?Ñ?ага по Ð?Ð?Ð?: за %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "ФилÑ?Ñ?иÑ?ам новÑ? поÑ?Ñ?кÑ? Ñ? â??%sâ??"
+msgstr[1] "ФилÑ?Ñ?иÑ?ам нове поÑ?Ñ?ке Ñ? â??%sâ??"
+msgstr[2] "ФилÑ?Ñ?иÑ?ам нове поÑ?Ñ?ке Ñ? â??%sâ??"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
-msgstr "Ð?Ñ?емеÑ?Ñ?аÑ?е поÑ?Ñ?ка"
+msgstr "Ð?Ñ?емеÑ?Ñ?ам поÑ?Ñ?ке"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
-msgstr "УмножаваÑ?е поÑ?Ñ?ка"
-
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "УÑ?еÑ?е Ñ?Ñ?а Ñ?е Ñ?Ñ?бÑ?е"
+msgstr "Умножавам поÑ?Ñ?ке"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "УÑ?еÑ?е Ñ?Ñ?а ниÑ?е Ñ?Ñ?бÑ?е"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да извÑ?Ñ?им гпг: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "ФилÑ?Ñ?иÑ?аÑ?е поÑ?Ñ?ке(а)"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Ð?епознаÑ?о"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Ð?авио Ñ?е неоÑ?екиван Ñ?Ñ?аÑ?Ñ?Ñ? GnuPG поÑ?Ñ?ке:\n"
+"Ð?оÑ?ло Ñ?е до неоÑ?екиване поÑ?Ñ?ке Ð?нÑ?Ð?Ð? Ñ?Ñ?аÑ?а:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е gpg userid подÑ?еÑ?ника."
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да анализиÑ?ам подÑ?еÑ?ник гпг иб коÑ?иÑ?ника."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е заÑ?Ñ?ева за gpg лозинком."
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да анализиÑ?ам заÑ?Ñ?ев за гпг лозинком."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"Ð?оÑ?Ñ?ебан Ð?ам Ñ?е Ð?Ð?Ð? за оÑ?кÑ?Ñ?Ñ?аваÑ?е кÑ?Ñ?Ñ?а за\n"
-"SmartCard: â??%sâ??"
+"Ð?оÑ?Ñ?ебан вам Ñ?е Ð?Ð?Ð? да оÑ?кÑ?Ñ?Ñ?аÑ?е кÑ?Ñ?Ñ?\n"
+"Ð?амеÑ?не каÑ?Ñ?иÑ?е: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Ð?оÑ?Ñ?ебна Ð?ам Ñ?е лозинка за оÑ?кÑ?Ñ?Ñ?аваÑ?е кÑ?Ñ?Ñ?а\n"
+"Ð?оÑ?Ñ?ебна вам Ñ?е лозинка да оÑ?кÑ?Ñ?Ñ?аÑ?е кÑ?Ñ?Ñ?\n"
 "коÑ?иÑ?ника: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Ð?еоÑ?екиван заÑ?Ñ?ев од GnuPG-а за â??%sâ??"
+msgstr "Ð?еоÑ?екиван заÑ?Ñ?ев Ð?нÑ?Ð?Ð?-а за â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "Ð?дÑ?Ñ?Ñ?аÑ?о."
-
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Ð?еÑ?Ñ?пело оÑ?кÑ?Ñ?Ñ?аваÑ?е Ñ?аÑ?ног кÑ?Ñ?Ñ?а: Ñ?неÑ?е Ñ?Ñ? 3 погÑ?еÑ?не лозинке."
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да оÑ?кÑ?Ñ?Ñ?ам Ñ?аÑ?ни кÑ?Ñ?Ñ?: Ñ?неÑ?е Ñ?Ñ? 3 погÑ?еÑ?не лозинке."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "Ð?еоÑ?екиван одговоÑ? од GnuPG-а: %s"
+msgstr "Ð?еоÑ?екиван одговоÑ? Ð?нÑ?Ð?Ð?-а: %s"
 
-#: ../camel/camel-gpg-context.c:947
-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:1048
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Ð?еÑ?Ñ?пело извÑ?Ñ?аваÑ?е gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?иÑ?Ñ?Ñ?Ñ?ем: ниÑ?Ñ? ознаÑ?ени иÑ?пÑ?авни пÑ?имаоÑ?и."
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и подаÑ?ке за поÑ?пиÑ?иваÑ?е: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Ð?е могÑ? да напÑ?авим подаÑ?ке за поÑ?пиÑ?иваÑ?е:"
 
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
-msgstr "Ð?еÑ?Ñ?пело извÑ?Ñ?аваÑ?е gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "Ð?во Ñ?е део поÑ?Ñ?ке Ñ?а дигиÑ?алним поÑ?пиÑ?ом"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?овеÑ?а поÑ?пиÑ?а поÑ?Ñ?ке: неиÑ?пÑ?аван облик поÑ?Ñ?ке"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да извÑ?Ñ?им гпг."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?овеÑ?а поÑ?пиÑ?а поÑ?Ñ?ке: ниÑ?е могÑ?Ñ?е напÑ?авиÑ?и пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ?: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ð?е могÑ? да пÑ?овеÑ?им поÑ?пиÑ? поÑ?Ñ?ке: неиÑ?пÑ?аван облик поÑ?Ñ?ке"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и подаÑ?ке за Ñ?иÑ?Ñ?оваÑ?е: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Ð?е могÑ? да пÑ?овеÑ?им поÑ?пиÑ? поÑ?Ñ?ке:"
+
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Ð?е могÑ? да напÑ?авим подаÑ?ке за Ñ?иÑ?Ñ?оваÑ?е:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1866
 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:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?и поÑ?Ñ?кÑ?: неиÑ?пÑ?аван облик поÑ?Ñ?ке"
+msgstr "Ð?е могÑ? да деÑ?иÑ?Ñ?Ñ?Ñ?ем поÑ?Ñ?кÑ?: неиÑ?пÑ?аван облик поÑ?Ñ?ке"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?и MIME део: гÑ?еÑ?ка Ñ? пÑ?оÑ?околÑ?"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да деÑ?иÑ?Ñ?Ñ?Ñ?ем Ð?Ð?Ð?Ð? део: гÑ?еÑ?ка Ñ? пÑ?оÑ?околÑ?"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "ШиÑ?Ñ?ован Ñ?адÑ?жаÑ?"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?оÑ?иÑ?аÑ?и Ñ?адÑ?жаÑ? поÑ?Ñ?ке"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Ð?епознаÑ?о"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и везÑ? ка помоÑ?никÑ? закÑ?Ñ?Ñ?аваÑ?а: %s"
+msgstr "Ð?е могÑ? да напÑ?авим везÑ? ка помоÑ?никÑ? закÑ?Ñ?Ñ?аваÑ?а: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е поделиÑ?и помоÑ?ника закÑ?Ñ?Ñ?аваÑ?а: %s"
+msgstr "Ð?е могÑ? да поделим помоÑ?ника закÑ?Ñ?Ñ?аваÑ?а: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ð?иÑ?е могÑ?Ñ?е закÑ?Ñ?Ñ?аÑ?и â??%sâ??: гÑ?еÑ?ка Ñ? пÑ?оÑ?околÑ? Ñ?а помоÑ?ником закÑ?Ñ?Ñ?аваÑ?а"
+msgstr "Ð?е могÑ? да закÑ?Ñ?Ñ?ам â??%sâ??: гÑ?еÑ?ка Ñ? пÑ?оÑ?околÑ? Ñ?а помоÑ?ником закÑ?Ñ?Ñ?аваÑ?а"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Ð?иÑ?е могÑ?Ñ?е закÑ?Ñ?Ñ?аÑ?и â??%sâ??"
+msgstr "Ð?е могÑ? да закÑ?Ñ?Ñ?ам â??%sâ??"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и закÑ?Ñ?Ñ?анÑ? даÑ?оÑ?екÑ? за %s: %s"
+msgstr "Ð?е могÑ? да напÑ?авим закÑ?Ñ?Ñ?анÑ? даÑ?оÑ?екÑ? за â??%sâ??: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Ð?Ñ?Ñ?екло вÑ?еме пÑ?и покÑ?Ñ?аÑ?Ñ? пÑ?ибавÑ?аÑ?а закÑ?Ñ?Ñ?ане даÑ?оÑ?еке на %s. Ð?окÑ?Ñ?аÑ?Ñ?е каÑ?ниÑ?е."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Ð?Ñ?Ñ?екло Ñ?е вÑ?еме пÑ?иликом покÑ?Ñ?аÑ?а да пÑ?ибавим закÑ?Ñ?Ñ?анÑ? даÑ?оÑ?екÑ? на â??%sâ??. "
+"Ð?окÑ?Ñ?аÑ?Ñ?е каÑ?ниÑ?е."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Ð?еÑ?Ñ?пело закÑ?Ñ?Ñ?аваÑ?е коÑ?иÑ?Ñ?еÑ?ем fcntl(2): %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да закÑ?Ñ?Ñ?ам коÑ?иÑ?Ñ?еÑ?и â??fcntl(2)â??: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Ð?еÑ?Ñ?пело закÑ?Ñ?Ñ?аваÑ?е коÑ?иÑ?Ñ?еÑ?ем flock(2): %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да закÑ?Ñ?Ñ?ам коÑ?иÑ?Ñ?еÑ?и â??flock(2)â??: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?овеÑ?а даÑ?оÑ?еке поÑ?Ñ?е %s: %s"
+msgstr "Ð?е могÑ? да пÑ?овеÑ?им даÑ?оÑ?екÑ? поÑ?Ñ?е â??%sâ??: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и даÑ?оÑ?екÑ? поÑ?Ñ?е %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им даÑ?оÑ?екÑ? поÑ?Ñ?е â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? поÑ?Ñ?е %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? поÑ?Ñ?е â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Ð?еÑ?Ñ?пело Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е Ñ? пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? %s: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?меÑ?Ñ?им поÑ?Ñ?Ñ? Ñ? пÑ?ивÑ?еменÑ? даÑ?оÑ?екÑ? â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и везÑ?: %s"
+msgstr "Ð?е могÑ? да напÑ?авим везÑ?: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е поделиÑ?и: %s"
+msgstr "Ð?е могÑ? да поделим: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Ð?Ñ?огÑ?ам за пÑ?емеÑ?Ñ?аÑ?е поÑ?Ñ?е Ñ?е оÑ?казао: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Ð?епознаÑ?а гÑ?еÑ?ка)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?иÑ?аÑ?Ñ? даÑ?оÑ?еке поÑ?Ñ?е: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и пиÑ?аÑ?Ñ? пÑ?ивÑ?емене даÑ?оÑ?еке поÑ?Ñ?е: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?множаваÑ?Ñ? пÑ?ивÑ?емене даÑ?оÑ?еке: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "гÑ?еÑ?ка Ñ?иÑ?аÑ?а"
-
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Ð?дÑ?Ñ?Ñ?аÑ?о"
-
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "ниÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е низа"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног Ñ?адÑ?жаÑ?а"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-multipart-signed.c:293
 #, c-format
-msgid "Resolving: %s"
-msgstr "Ð?алажеÑ?е: %s"
+msgid "No signature available"
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног поÑ?пиÑ?а"
 
-#: ../camel/camel-net-utils.c:693
-msgid "Host lookup failed"
-msgstr "Ð?еÑ?Ñ?пело Ñ?Ñ?ажеÑ?е домаÑ?ина"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "гÑ?еÑ?ка Ñ?иÑ?аÑ?а"
 
 #: ../camel/camel-net-utils.c:695
 #, c-format
+msgid "Resolving: %s"
+msgstr "Ð?алазим: %s"
+
+#: ../camel/camel-net-utils.c:717
+msgid "Host lookup failed"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?Ñ?ажеÑ?е домаÑ?ина"
+
+#: ../camel/camel-net-utils.c:721
+#, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Ð?еÑ?Ñ?пело Ñ?Ñ?ажеÑ?е домаÑ?ина: %s: %s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?Ñ?ажеÑ?е домаÑ?ина: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:844
 msgid "Resolving address"
-msgstr "Ð?алажеÑ?е адÑ?еÑ?е"
+msgstr "Ð?алазим адÑ?еÑ?Ñ?"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:864
 msgid "Name lookup failed"
-msgstr "ТÑ?ажеÑ?е имена неÑ?Ñ?пело"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?Ñ?ажеÑ?е имена"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "ТÑ?ажеÑ?е имена неÑ?Ñ?пело: %s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело Ñ?Ñ?ажеÑ?е имена: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "УÑ?клаÑ?иваÑ?е поÑ?Ñ?ка Ñ? Ñ?аÑ?Ñ?икли â??%sâ?? Ñ?а диÑ?ком"
+msgstr "УÑ?клаÑ?Ñ?Ñ?ем поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??%sâ?? на диÑ?к"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ? Ñ?ноÑ? Ñ? дневник за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да запиÑ?ем ван мÑ?ежни Ñ?ноÑ? Ñ? дневник за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "Ð?онÑ?Ñ?аÑ? елекÑ?Ñ?онÑ?ке поÑ?Ñ?е Ñ?а виÑ?Ñ?Ñ?елном Ñ?аÑ?Ñ?иклом"
+msgstr "Ð?оÑ?Ñ?авÑ?аÑ? виÑ?Ñ?Ñ?елне Ñ?аÑ?Ñ?икле е-поÑ?Ñ?е"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Ð?а Ñ?иÑ?аÑ?е поÑ?Ñ?е као Ñ?пиÑ?а дÑ?Ñ?гог Ñ?кÑ?па Ñ?аÑ?Ñ?икли"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и %s: оваÑ? Ñ?иÑ?Ñ?ем не подÑ?жава Ñ?Ñ?иÑ?аваÑ?е модÑ?ла."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам â??%sâ??: оваÑ? Ñ?иÑ?Ñ?ем не подÑ?жава Ñ?Ñ?иÑ?аваÑ?е модÑ?ла."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и %s: %s"
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам â??%sâ??: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аÑ?и %s: нема кода за покÑ?еÑ?аÑ?е Ñ? модÑ?лÑ?."
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам â??%sâ??: нема кода за покÑ?еÑ?аÑ?е Ñ? модÑ?лÑ?."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Ð?ема доÑ?Ñ?Ñ?пног понÑ?Ñ?аÑ?а за пÑ?оÑ?окол â??%sâ??"
+msgstr "Ð?ема доÑ?Ñ?Ñ?пног доÑ?Ñ?авÑ?аÑ?а за пÑ?оÑ?окол â??%sâ??"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Ð?нонимно"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем анонимне пÑ?иÑ?аве."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
-msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а."
+msgstr "Ð?оÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а ниÑ?е Ñ?Ñ?пело."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Ð?еиÑ?пÑ?аван подаÑ?ак о поÑ?еклÑ? елекÑ?Ñ?онÑ?ке адÑ?еÑ?е:\n"
+"Ð?еиÑ?пÑ?аван подаÑ?ак о поÑ?еклÑ? адÑ?еÑ?е е-поÑ?Ñ?е:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2127,7 @@ msgstr ""
 "Ð?еиÑ?пÑ?аван подаÑ?ак о Ñ?ложеном поÑ?еклÑ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2136,522 @@ msgstr ""
 "Ð?еиÑ?пÑ?аван подаÑ?ак о поÑ?еклÑ?:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+msgstr "ЦРÐ?Ð?-Ð?Ð?5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ñ?игÑ?Ñ?ноÑ?не CRAM-MD5 лозинке, ако Ñ?е Ñ?еÑ?веÑ? подÑ?жава."
+#: ../camel/camel-sasl-cram-md5.c:47
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ñ?игÑ?Ñ?ноÑ?не ЦРÐ?Ð?-Ð?Ð?5 лозинке, ако "
+"Ñ?е Ñ?еÑ?веÑ? подÑ?жава."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
+msgstr "Ð?Ð?Ð?Ð?СТ-Ð?Ð?5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ñ?игÑ?Ñ?ноÑ?не DIGEST-MD5 лозинке, ако Ñ?е Ñ?еÑ?веÑ? подÑ?жава."
+#: ../camel/camel-sasl-digest-md5.c:60
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ñ?игÑ?Ñ?ноÑ?не Ð?Ð?Ð?Ð?СТ-Ð?Ð?5 лозинке, "
+"ако Ñ?е Ñ?еÑ?веÑ? подÑ?жава."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:820
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "УпиÑ? на Ñ?еÑ?веÑ? Ñ?Ñ?виÑ?е дÑ?г (>2048 окÑ?еÑ?а)"
+msgstr "УпиÑ? Ñ?еÑ?веÑ?а Ñ?е Ñ?Ñ?виÑ?е дÑ?г (>2048 окÑ?еÑ?а)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "УпиÑ? на Ñ?еÑ?веÑ? неиÑ?пÑ?аван\n"
+msgstr "УпиÑ? Ñ?еÑ?веÑ?а Ñ?е неиÑ?пÑ?аван\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:839
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "УпиÑ? на Ñ?еÑ?веÑ? Ñ?е Ñ?адÑ?жао неиÑ?пÑ?аван â??Ð?валиÑ?еÑ? заÑ?Ñ?иÑ?еâ?? Ñ?ноÑ?"
+msgstr "УпиÑ? Ñ?еÑ?веÑ?а Ñ?е Ñ?адÑ?жао неиÑ?пÑ?аван Ñ?ноÑ? â??Ð?валиÑ?еÑ? заÑ?Ñ?иÑ?еâ??"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а ниÑ?е Ñ?адÑ?жао подаÑ?ке о аÑ?Ñ?оÑ?изаÑ?иÑ?и"
+msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а ниÑ?е Ñ?адÑ?жао подаÑ?ке о овлаÑ?Ñ?еÑ?Ñ?"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а Ñ?е Ñ?адÑ?жао некомплеÑ?не подаÑ?ке о аÑ?Ñ?оÑ?изаÑ?иÑ?и"
+msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а Ñ?е Ñ?адÑ?жао некомплеÑ?не подаÑ?ке о овлаÑ?Ñ?еÑ?Ñ?"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а Ñ?е не Ñ?лаже"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:90
 msgid "GSSAPI"
-msgstr "GSSAPI"
+msgstr "Ð?ССÐ?Ð?Ð?"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:92
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Kerberos 5 пÑ?иÑ?аве."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ð?еÑ?беÑ?оÑ? 5 поÑ?вÑ?Ñ?иваÑ?а "
+"иденÑ?иÑ?еÑ?а."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Ð?забÑ?ани меÑ?анизам понÑ?Ñ?ени меÑ?од не подÑ?жава, или га пÑ?имеÑ?ен меÑ?од ниÑ?е пÑ?епознао."
+#: ../camel/camel-sasl-gssapi.c:133
+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:138
 msgid "The provided target_name parameter was ill-formed."
-msgstr "Ð?онÑ?Ñ?ени паÑ?амеÑ?аÑ? target_name ниÑ?е пÑ?авилно обликован."
+msgstr "Ð?онÑ?Ñ?ени паÑ?амеÑ?аÑ? Ñ?иÑ?ног имена (target_name) ниÑ?е пÑ?авилно обликован."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Ð?онÑ?Ñ?ени паÑ?амеÑ?аÑ? target_name Ñ?е Ñ?адÑ?жао неиÑ?пÑ?аван или неподÑ?жан Ñ?ип имена."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Ð?онÑ?Ñ?ени паÑ?амеÑ?аÑ? Ñ?иÑ?ног имена (target_name) Ñ?е Ñ?адÑ?жао неиÑ?пÑ?аван или "
+"неподÑ?жан Ñ?ип имена."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token Ñ?адÑ?жи Ñ?азлиÑ?иÑ?а везиваÑ?а за канале од ониÑ? одÑ?еÑ?ениÑ? пÑ?еко паÑ?амеÑ?Ñ?а input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:145
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"УпиÑ? Ñ?ноÑ?а (input_token) Ñ?адÑ?жи Ñ?азлиÑ?иÑ?а везиваÑ?а канала од ониÑ? одÑ?еÑ?ениÑ? "
+"пÑ?еко паÑ?амеÑ?Ñ?а везиÑ?е ланÑ?а Ñ?ноÑ?а (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token Ñ?адÑ?жи неиÑ?пÑ?авнÑ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ?, или поÑ?пиÑ? ниÑ?е могао биÑ?и пÑ?овеÑ?ен."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"УпиÑ? Ñ?ноÑ?а (input_token) Ñ?адÑ?жи неиÑ?пÑ?авнÑ? Ñ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ?, или поÑ?пиÑ? ниÑ?е могао "
+"биÑ?и пÑ?овеÑ?ен."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Ð?Ñ?Ñ?жена Ñ?веÑ?аваÑ?а ниÑ?Ñ? била иÑ?пÑ?авна за оÑ?поÑ?иÑ?аÑ?е пÑ?оÑ?еÑ?а, или Ñ?е ноÑ?аÑ? Ñ?веÑ?еÑ?а доÑ?ао без Ñ?иÑ?."
+#: ../camel/camel-sasl-gssapi.c:154
+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:159
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Ð?Ñ?Ñ?жен ноÑ?аÑ? Ñ?адÑ?жаÑ?а ниÑ?е Ñ?пÑ?Ñ?ивао на иÑ?пÑ?аван Ñ?адÑ?жаÑ?."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Ð?еÑ?Ñ?пеле пÑ?овеÑ?е Ñ?еловиÑ?оÑ?Ñ?и на input_token."
+msgstr "Ð?иÑ?Ñ? Ñ?Ñ?пеле пÑ?овеÑ?е Ñ?еловиÑ?оÑ?Ñ?и на Ñ?пиÑ?Ñ? Ñ?ноÑ?а (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The consistency checks performed on the credential failed."
-msgstr "Ð?еÑ?Ñ?пеле пÑ?овеÑ?е Ñ?еловиÑ?оÑ?Ñ?и на Ñ?веÑ?еÑ?има."
+msgstr "Ð?иÑ?Ñ? Ñ?Ñ?пеле пÑ?овеÑ?е Ñ?еловиÑ?оÑ?Ñ?и на Ñ?веÑ?еÑ?има."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:168
 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:174 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1183
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "Ð?оÑ? одговоÑ? на аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? од Ñ?еÑ?веÑ?а."
+msgstr "Ð?оÑ? одговоÑ? поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а Ñ?а Ñ?еÑ?веÑ?а."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Ð?еподÑ?жан Ñ?игÑ?Ñ?ноÑ?ни Ñ?лоÑ?."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Kerberos 4 пÑ?иÑ?аве."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е добиÑ?и Kerberos каÑ?Ñ?Ñ?:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Ð?Ñ?иÑ?ава"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем обиÑ?не лозинке."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Ð?епознаÑ?о Ñ?Ñ?аÑ?е аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е."
+msgstr "Ð?епознаÑ?о Ñ?Ñ?аÑ?е поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
+msgstr "Ð?ТÐ?Ð? / СÐ?Ð?"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Windows Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем NTLM / СигÑ?Ñ?ноÑ?не пÑ?овеÑ?е лозинке."
+#: ../camel/camel-sasl-ntlm.c:43
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ð?индоÑ?з Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Ð?ТÐ?Ð? / СигÑ?Ñ?ноÑ?не "
+"пÑ?овеÑ?е лозинке."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "Ð?Ð?Ð?ЧÐ?Ð?"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
-msgstr "POP пÑ?е SMTP"
+msgstr "Ð?Ð?Ð? пÑ?е СÐ?ТÐ?"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е одобÑ?иÑ?и POP везÑ? а заÑ?им покÑ?Ñ?аÑ?и SMTP"
+msgstr "Ð?ва опÑ?иÑ?а Ñ?е одобÑ?иÑ?и Ð?Ð?Ð? везÑ? пÑ?е покÑ?Ñ?аÑ?а СÐ?ТÐ?"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
-msgstr "POP извоÑ?на адÑ?еÑ?а"
+msgstr "Ð?Ð?Ð? извоÑ?на адÑ?еÑ?а"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP пÑ?е SMTP auth коÑ?иÑ?Ñ?еÑ?ем непознаÑ?ог Ñ?Ñ?анÑ?поÑ?Ñ?а"
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "Ð?Ð?Ð? пÑ?е СÐ?ТÐ? пÑ?овеÑ?е коÑ?иÑ?Ñ?еÑ?ем непознаÑ?ог Ñ?Ñ?анÑ?поÑ?Ñ?а"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP пÑ?е SMTP auth коÑ?иÑ?Ñ?еÑ?ем извоÑ?а коÑ?и ниÑ?е pop"
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "Ð?Ð?Ð? пÑ?е СÐ?ТÐ? пÑ?овеÑ?е коÑ?иÑ?Ñ?еÑ?ем не-Ð?Ð?Ð? извоÑ?а"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Ð?еÑ?Ñ?пело пÑ?евоÑ?еÑ?е Ñ?егÑ?лаÑ?ног изÑ?аза: %s: %s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?евоÑ?еÑ?е Ñ?егÑ?лаÑ?ног изÑ?аза: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:90
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а коÑ?иÑ?ниÑ?ким именом"
+msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а коÑ?иÑ?ниÑ?ким именом"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:94
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а именом домаÑ?ина"
+msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а именом домаÑ?ина"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:98
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а пÑ?Ñ?аÑ?ом"
+msgstr "Ð?дÑ?еÑ?а â??%sâ?? Ñ?Ñ?ажи део Ñ?а пÑ?Ñ?аÑ?ом"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и диÑ?екÑ?оÑ?иÑ?Ñ?м %s:\n"
+"Ð?е могÑ? да напÑ?авим диÑ?екÑ?оÑ?иÑ?Ñ?м â??%sâ??:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "УнеÑ?иÑ?е %s лозинкÑ? за %s на домаÑ?инÑ? %s."
+msgstr "УнеÑ?иÑ?е â??%sâ?? лозинкÑ? за â??%sâ?? на домаÑ?инÑ? â??%sâ??."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel Ñ?еÑ?иÑ?а не подÑ?жава пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ке."
-
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Ð?иÑ?е могÑ?Ñ?е налажеÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а за â??%sâ??"
+msgstr "Ð?е могÑ? да наÑ?ем Ñ?веÑ?еÑ?е за â??%sâ??"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и CMS поÑ?Ñ?кÑ?"
+msgstr "Ð?е могÑ? да напÑ?авим ЦÐ?С поÑ?Ñ?кÑ?"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?пиÑ?иваÑ?е CMS подаÑ?ака"
+msgstr "Ð?е могÑ? да напÑ?авим ЦÐ?С поÑ?пиÑ?ане подаÑ?ке"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иложиÑ?и поÑ?пиÑ?ане CMS подаÑ?ке"
+msgstr "Ð?е могÑ? да пÑ?иложим ЦÐ?С поÑ?пиÑ?ане подаÑ?ке"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иложиÑ?и CMS подаÑ?ке"
+msgstr "Ð?е могÑ? да пÑ?иложим ЦÐ?С подаÑ?ке"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е подаÑ?ака о CMS поÑ?пиÑ?никÑ?"
+msgstr "Ð?е могÑ? да напÑ?авим подаÑ?ак ЦÐ?С поÑ?пиÑ?ника"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
-msgstr "Ð?иÑ?е могÑ?Ñ?е налажеÑ?е ланÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
+msgstr "Ð?е могÑ? да наÑ?ем ланаÑ? Ñ?веÑ?еÑ?а"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е вÑ?емена CMS поÑ?пиÑ?а"
+msgstr "Ð?е могÑ? да додам вÑ?еме ЦÐ?С поÑ?пиÑ?а"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? за Ñ?иÑ?Ñ?оваÑ?е â??%sâ?? не поÑ?Ñ?оÑ?и"
+msgstr "УвеÑ?еÑ?е Ñ?иÑ?Ñ?оваÑ?а â??%sâ?? не поÑ?Ñ?оÑ?и"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е аÑ?Ñ?ибÑ?Ñ?а SMIMEEncKeyPrefs"
+msgstr "Ð?е могÑ? да додам аÑ?Ñ?ибÑ?Ñ? СÐ?Ð?Ð?Ð? поÑ?Ñ?авки кÑ?Ñ?Ñ?а Ñ?иÑ?Ñ?оваÑ?а"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е аÑ?Ñ?ибÑ?Ñ?а MS SMIMEEncKeyPrefs"
+msgstr "Ð?е могÑ? да додам аÑ?Ñ?ибÑ?Ñ? Ð?С СÐ?Ð?Ð?Ð? поÑ?Ñ?авки кÑ?Ñ?Ñ?а Ñ?иÑ?Ñ?оваÑ?а"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а за Ñ?иÑ?Ñ?оваÑ?е"
+msgstr "Ð?е могÑ? да додам Ñ?веÑ?еÑ?е Ñ?иÑ?Ñ?оваÑ?а"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е подаÑ?ка о CMS поÑ?пиÑ?никÑ?"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и конÑ?екÑ?Ñ? за Ñ?иÑ?Ñ?оваÑ?е."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "Ð?еÑ?Ñ?пело додаваÑ?е подаÑ?ака Ñ? CMS енкодеÑ?"
-
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Ð?еÑ?Ñ?пело кодиÑ?аÑ?е подаÑ?ака"
+msgstr "Ð?е могÑ? да додам подаÑ?ак ЦÐ?С поÑ?пиÑ?ника"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
-msgstr "Ð?епÑ?овеÑ?ено"
+msgstr "Ð?епÑ?овеÑ?ен"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Ð?обаÑ? поÑ?пиÑ?"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Ð?оÑ? поÑ?пиÑ?"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "СадÑ?жаÑ? Ñ?е измеÑ?ен или оÑ?Ñ?еÑ?ен пÑ?и пÑ?еноÑ?Ñ?"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? поÑ?пиÑ?а ниÑ?е наÑ?ен"
+msgstr "УвеÑ?еÑ?е поÑ?пиÑ?а ниÑ?е наÑ?ено"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? поÑ?пиÑ?а ниÑ?е повеÑ?Ñ?ив"
+msgstr "УвеÑ?еÑ?е поÑ?пиÑ?а ниÑ?е повеÑ?Ñ?иво"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Ð?лгоÑ?иÑ?ам поÑ?пиÑ?а Ñ?е непознаÑ?"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
-msgstr "Ð?лгоÑ?иÑ?ам поÑ?пиÑ?а Ñ?е неподÑ?жан"
+msgstr "Ð?лгоÑ?иÑ?ам поÑ?пиÑ?а ниÑ?е подÑ?жан"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Ð?еиÑ?пÑ?аван поÑ?пиÑ?"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Ð?Ñ?еÑ?ка пÑ?и обÑ?ади"
 
 # Ñ?м, Ñ?м...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "Ð?ема поÑ?пиÑ?аног подаÑ?ка Ñ? поÑ?пиÑ?Ñ?"
+msgstr "Ð?ема назнаÑ?еног подаÑ?ка Ñ? поÑ?пиÑ?Ñ?"
 
 # Ñ?м, може Ñ?о и боÑ?е од â??окÑ?Ñ?жениÑ?â??...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Ð?едоÑ?Ñ?аÑ?Ñ? збиÑ?ке из окÑ?Ñ?жениÑ? подаÑ?ака"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "Ð?иÑ?е могÑ?Ñ?е изÑ?аÑ?Ñ?наÑ?и збиÑ?ке"
+msgstr "Ð?е могÑ? да изÑ?аÑ?Ñ?нам збиÑ?ке"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "Ð?иÑ?е могÑ?Ñ?е поÑ?Ñ?авиÑ?и збиÑ?ке поÑ?Ñ?ка"
+msgstr "Ð?е могÑ? да поÑ?Ñ?авим збиÑ?ке поÑ?Ñ?ка"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "Ð?еÑ?Ñ?пео Ñ?воз Ñ?еÑ?Ñ?иÑ?икаÑ?а"
+msgstr "Ð?иÑ?е Ñ?Ñ?пео Ñ?воз Ñ?веÑ?еÑ?а"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Ð?оÑ?Ñ?ка има Ñ?амо Ñ?еÑ?Ñ?иÑ?икаÑ?, ниÑ?е могÑ?Ñ?а пÑ?овеÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
+msgstr "УвеÑ?еÑ?е Ñ?е Ñ?едина поÑ?Ñ?ка, не могÑ? да пÑ?овеÑ?им Ñ?веÑ?еÑ?е"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Ð?оÑ?Ñ?ка има Ñ?амо Ñ?еÑ?Ñ?иÑ?икаÑ?, Ñ?еÑ?Ñ?иÑ?икаÑ?и Ñ?везени и пÑ?овеÑ?ени"
+msgstr "УвеÑ?еÑ?е Ñ?е Ñ?едина поÑ?Ñ?ка, Ñ?веÑ?еÑ?а Ñ?Ñ? Ñ?вежена и пÑ?овеÑ?ена"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "Ð?иÑ?е могÑ?Ñ?е наÑ?и збиÑ?ке поÑ?пиÑ?а"
+msgstr "Ð?е могÑ? да наÑ?ем збиÑ?ке поÑ?пиÑ?а"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Ð?оÑ?пиÑ?ник: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "Ð?е могÑ? да напÑ?авим конÑ?екÑ?Ñ? Ñ?иÑ?Ñ?оваÑ?а."
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да додам подаÑ?ак Ñ? ЦÐ?С Ñ?иÑ?Ñ?еÑ?"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?иÑ?Ñ?Ñ?Ñ?ем подаÑ?ке"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
-msgstr "Ð?еÑ?Ñ?пело декодиÑ?аÑ?е"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да деÑ?иÑ?Ñ?Ñ?Ñ?ем"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Ð?иÑ?е могÑ?Ñ?е наÑ?и опÑ?Ñ?и алгоÑ?иÑ?ам за Ñ?иÑ?Ñ?оваÑ?е гомиле"
+msgstr "Ð?е могÑ? да наÑ?ем опÑ?Ñ?и алгоÑ?иÑ?ам за Ñ?иÑ?Ñ?оваÑ?е гÑ?Ñ?пе"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Ð?иÑ?е могÑ?Ñ?е доделиÑ?и меÑ?Ñ?о кÑ?Ñ?Ñ?Ñ? за Ñ?иÑ?Ñ?оваÑ?е гомиле"
+msgstr "Ð?е могÑ? да доделим меÑ?Ñ?о кÑ?Ñ?Ñ?Ñ? за Ñ?иÑ?Ñ?оваÑ?е гÑ?Ñ?пе"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и CMS поÑ?Ñ?кÑ?"
+msgstr "Ð?е могÑ? да напÑ?авим ЦÐ?С поÑ?Ñ?кÑ?"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е CMS Enveloped data"
+msgstr "Ð?е могÑ? да напÑ?авим ЦÐ?С обавиÑ?ене подаÑ?ке"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е CMS Enveloped data"
+msgstr "Ð?е могÑ? да пÑ?иложим ЦÐ?С обавиÑ?ене подаÑ?ке"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?илагаÑ?е обÑ?екÑ?а Ñ?а CMS подаÑ?има"
+msgstr "Ð?е могÑ? да пÑ?иложим обÑ?екаÑ? ЦÐ?С подаÑ?ака"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е CMS подаÑ?ка о пÑ?имаоÑ?Ñ?"
+msgstr "Ð?е могÑ? да напÑ?авим подаÑ?ак ЦÐ?С пÑ?имаоÑ?а"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и подаÑ?ак о CMS пÑ?имаоÑ?Ñ?"
+msgstr "Ð?е могÑ? да додам подаÑ?ак ЦÐ?С пÑ?имаоÑ?а"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
-msgstr "Ð?еÑ?Ñ?пело додаваÑ?е подаÑ?ака Ñ? енкодеÑ?"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да додам подаÑ?ке Ñ? Ñ?иÑ?Ñ?еÑ?"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME деÑ?иÑ?Ñ?оваÑ?е: ниÑ?Ñ? наÑ?ени Ñ?иÑ?Ñ?овани подаÑ?и"
-
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "Ñ?воз кÑ?Ñ?Ñ?ева: неизведено"
+msgstr "С/Ð?Ð?Ð?Ð? деÑ?иÑ?Ñ?оваÑ?е: ниÑ?Ñ? наÑ?ени Ñ?иÑ?Ñ?овани подаÑ?и"
 
-#: ../camel/camel-smime-context.c:1207
-msgid "export keys: unimplemented"
-msgstr "извоз кÑ?Ñ?Ñ?ева: неизведено"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ?: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ?: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и"
+msgstr "Ð?е могÑ? да да напÑ?авим Ñ?аÑ?Ñ?иклÑ?: %s: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и"
 
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем Ñ?аÑ?Ñ?иклÑ?: %s: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
 
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем Ñ?аÑ?Ñ?иклÑ?: %s: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:1129 ../camel/camel-store.c:1139
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "СмеÑ?е"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1132 ../camel/camel-store.c:1143
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Ð?Ñ?бÑ?е"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?аÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а издаваÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?е поÑ?пиÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?е поÑ?пиÑ?а за лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?и Ñ?авни кÑ?Ñ?Ñ? издаваÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Ð?еÑ?Ñ?пео поÑ?пиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Ð?еÑ?Ñ?пео поÑ?пиÑ? за лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?оÑ? ниÑ?е важеÑ?и"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?е иÑ?Ñ?екао"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL Ñ?оÑ? ниÑ?е важеÑ?и"
-
-#: ../camel/camel-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-raw.c:816
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Ð?омаÑ?ин поÑ?Ñ?едник не подÑ?жава СÐ?ЦÐ?С5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Ð?иÑ?е могÑ?Ñ?е локално добиÑ?и издаваÑ?ев Ñ?еÑ?Ñ?иÑ?икаÑ?"
+#: ../camel/camel-tcp-stream-raw.c:822
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ð?е могÑ? да пÑ?онаÑ?ем одговаÑ?аÑ?Ñ?Ñ?и Ñ?ип поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а: код 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?пиÑ? лиÑ?Ñ?а"
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "General SOCKS server failure"
+msgstr "Ð?еÑ?Ñ?пеÑ? опÑ?Ñ?ег СÐ?ЦÐ?С Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Ð?анаÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?е пÑ?едÑ?гаÑ?ак"
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Ð?Ñ?авила СÐ?ЦÐ?С Ñ?еÑ?веÑ?а не дозвоÑ?аваÑ?Ñ? везÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Ð?овÑ?Ñ?ен Ñ?еÑ?Ñ?иÑ?икаÑ?"
+#: ../camel/camel-tcp-stream-raw.c:836
+msgid "Network is unreachable from SOCKS server"
+msgstr "Ð?Ñ?ежа Ñ?е недоÑ?Ñ?Ñ?пан Ñ?а СÐ?ЦÐ?С Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Ð?еиÑ?пÑ?аван издаваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а (CA)"
+#: ../camel/camel-tcp-stream-raw.c:837
+msgid "Host is unreachable from SOCKS server"
+msgstr "Ð?омаÑ?ин Ñ?е недоÑ?Ñ?Ñ?пан Ñ?а СÐ?ЦÐ?С Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Ð?Ñ?емаÑ?ена дÑ?жина пÑ?Ñ?аÑ?е"
+#: ../camel/camel-tcp-stream-raw.c:838
+msgid "Connection refused"
+msgstr "Ð?еза Ñ?е одбиÑ?ена"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Ð?еиÑ?пÑ?авна Ñ?вÑ?Ñ?а"
+#: ../camel/camel-tcp-stream-raw.c:839
+msgid "Time-to-live expired"
+msgstr "Ð?Ñ?еме живоÑ?а Ñ?е иÑ?Ñ?екло"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Ð?еповеÑ?Ñ?ив Ñ?еÑ?Ñ?иÑ?икаÑ?"
+#: ../camel/camel-tcp-stream-raw.c:840
+msgid "Command not supported by SOCKS server"
+msgstr "СÐ?ЦÐ?С Ñ?еÑ?веÑ? не подÑ?жава наÑ?едбÑ?"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Ð?дбиÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ?"
+#: ../camel/camel-tcp-stream-raw.c:841
+msgid "Address type not supported by SOCKS server"
+msgstr "СÐ?ЦÐ?С Ñ?еÑ?веÑ? не подÑ?жава вÑ?Ñ?Ñ?Ñ? адÑ?еÑ?е"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Ð?аÑ?лов/издаваÑ? неÑ?лагаÑ?е"
+#: ../camel/camel-tcp-stream-raw.c:842
+msgid "Unknown error from SOCKS server"
+msgstr "Ð?епознаÑ?а гÑ?еÑ?ка Ñ?а СÐ?Ð?ЦС Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID неÑ?лагаÑ?е"
+#: ../camel/camel-tcp-stream-raw.c:872
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Ð?обиÑ? непознаÑ?Ñ? вÑ?Ñ?Ñ?Ñ? адÑ?еÑ?е Ñ?а СÐ?ЦÐ?С Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/издаваÑ? Ñ?еÑ?иÑ?Ñ?ко неÑ?лагаÑ?е"
+#: ../camel/camel-tcp-stream-raw.c:889
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Ð?епоÑ?пÑ?н одговоÑ? Ñ?а СÐ?ЦÐ?С Ñ?еÑ?веÑ?а"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "УпоÑ?Ñ?еба кÑ?Ñ?Ñ?а не подÑ?жава поÑ?пиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?ом"
+#: ../camel/camel-tcp-stream-raw.c:904
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ð?ме домаÑ?ина Ñ?е пÑ?едÑ?го (наÑ?виÑ?е 255 знакова)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?овеÑ?и пÑ?огÑ?ама"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:936 ../camel/camel-tcp-stream-raw.c:946
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Ð?еиÑ?пÑ?аван одговоÑ? Ñ?еÑ?веÑ?а поÑ?Ñ?едника"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2664,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:463
 msgid "GOOD"
 msgstr "Ð?Ð?Ð?Ð Ð?"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:463
 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:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,1498 +2682,1213 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Ð?Ñ?овеÑ?а SSL Ñ?еÑ?Ñ?иÑ?икаÑ?а за %s:\n"
+"Ð?Ñ?овеÑ?а ССÐ? Ñ?веÑ?еÑ?а за â??%sâ??:\n"
 "\n"
 "%s\n"
 "\n"
 "Ð?елиÑ?е ли да пÑ?иÑ?ваÑ?иÑ?е?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"Ð?Ñ?облем Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?ом: %s\n"
+"Ð?Ñ?облем Ñ?а Ñ?веÑ?еÑ?ем: %s\n"
 "Ð?здаваÑ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Ð?оÑ? домен Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
+"Ð?оÑ? домен Ñ?веÑ?еÑ?а: %s\n"
 "Ð?здаваÑ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Ð?Ñ?Ñ?екао Ñ?еÑ?Ñ?иÑ?икаÑ?: %s\n"
+"Ð?Ñ?Ñ?екло Ñ?веÑ?еÑ?е: %s\n"
 "Ð?здаваÑ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Ð?Ñ?Ñ?екла лиÑ?Ñ?а повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а: %s\n"
+"Ð?Ñ?Ñ?екао Ñ?е Ñ?пиÑ?ак повÑ?Ñ?ениÑ? Ñ?веÑ?еÑ?а: %s\n"
 "Ð?здаваÑ?: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?оÑ?иÑ?аÑ?и адÑ?еÑ?Ñ? â??%sâ??"
+msgstr "Ð?е могÑ? да анализиÑ?ам адÑ?еÑ?Ñ? â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1068
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?меÑ?Ñ?аÑ?Ñ? â??%sâ??: %s"
+msgid "Error storing '%s': "
+msgstr "Ð?Ñ?еÑ?ка пÑ?и Ñ?меÑ?Ñ?аÑ?Ñ? â??%sâ??: "
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1142
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Ð?ема Ñ?акве поÑ?Ñ?ке %s Ñ? %s"
+msgstr "Ð?ема Ñ?акве поÑ?Ñ?ке â??%sâ?? Ñ? â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:1158 ../camel/camel-vee-folder.c:1173
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и или пÑ?емеÑ?Ñ?иÑ?и поÑ?Ñ?ке Ñ? виÑ?Ñ?Ñ?елнÑ? Ñ?аÑ?Ñ?иклÑ?"
+msgstr "Ð?е могÑ? да Ñ?множим или пÑ?емеÑ?Ñ?им поÑ?Ñ?ке Ñ? виÑ?Ñ?Ñ?елнÑ? Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Ð?епоклопÑ?ено"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:223
 #, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: нема Ñ?акве Ñ?аÑ?Ñ?икле"
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ð?е могÑ? да пÑ?оменим име Ñ?аÑ?Ñ?икле: %s: нема Ñ?акве Ñ?аÑ?Ñ?икле"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:289
 #, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?омениÑ?и име Ñ?аÑ?Ñ?икли: %s: нема Ñ?акве Ñ?аÑ?Ñ?икле"
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем Ñ?аÑ?Ñ?иклÑ?: %s: нема Ñ?акве Ñ?аÑ?Ñ?икле"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?иклÑ? за Ñ?меÑ?е"
+msgstr "Ð?е могÑ? да Ñ?множим поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?иклÑ? за Ñ?меÑ?е"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?иклÑ? за Ñ?Ñ?бÑ?е"
+msgstr "Ð?е могÑ? да Ñ?множим поÑ?Ñ?ке Ñ? Ñ?аÑ?Ñ?иклÑ? за Ñ?Ñ?бÑ?е"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ?: %s\n"
+"Ð?е могÑ? да добавим поÑ?Ñ?кÑ?: %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:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 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/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Ð?оÑ?иÑ?ник одÑ?Ñ?Ñ?ао"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:715
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Ð?е могÑ? да набавим поÑ?Ñ?кÑ? â??%sâ??: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#, c-format
 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:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
+#, c-format
 msgid "Could not get message"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?аÑ?е поÑ?Ñ?ке"
+msgstr "Ð?е могÑ? да добавим поÑ?Ñ?кÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
+#: ../camel/providers/imap/camel-imap-folder.c:381
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?иÑ?аваÑ?е пÑ?егледа за %s"
+msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам пÑ?еглед за â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "ФаÑ?Ñ?икла за Ñ?меÑ?е Ñ?е пÑ?на. Ð?Ñ?пÑ?азниÑ?е Ñ?е."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "Ð?Ñ?Ñ?им пÑ?овеÑ?Ñ? за избÑ?иÑ?аним поÑ?Ñ?кама â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3860
+#: ../camel/providers/imap/camel-imap-folder.c:3938
+#: ../camel/providers/imapx/camel-imapx-server.c:3796
+#: ../camel/providers/imapx/camel-imapx-server.c:3924
 #, c-format
 msgid "Fetching summary information for new messages in %s"
-msgstr "Ð?Ñ?икÑ?пÑ?аÑ?е пÑ?егледа подаÑ?ака за нове поÑ?Ñ?ке Ñ? %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:2502
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да додам поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е поÑ?Ñ?ке: %s"
+msgstr "Ð?е могÑ? да напÑ?авим поÑ?Ñ?кÑ?: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле %s"
+msgstr "Ð?е могÑ? да набавим Ñ?адÑ?жаÑ? Ñ?аÑ?Ñ?икле â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?ежимÑ? ван мÑ?еже: недоÑ?Ñ?Ñ?пна оÑ?Ñ?ава"
+msgstr "Ð?е могÑ? да пÑ?иложим поÑ?Ñ?кÑ? Ñ? Ñ?ежимÑ? ван мÑ?еже: недоÑ?Ñ?Ñ?пна оÑ?Ñ?ава"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?ежимÑ? ван мÑ?еже: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Ð?е могÑ? да пÑ?иложим поÑ?Ñ?кÑ? Ñ? Ñ?ежимÑ? ван мÑ?еже: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "Ð?Ñ?овеÑ?аваÑ?е за новом поÑ?Ñ?ом"
+msgstr "Ð?Ñ?Ñ?им пÑ?овеÑ?Ñ? за новом поÑ?Ñ?ом"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "Ð?Ñ?о_веÑ?и за нове поÑ?Ñ?ке Ñ? Ñ?вим Ñ?аÑ?Ñ?иклама"
+msgstr "Ð?_оÑ?Ñ?ажи нове поÑ?Ñ?ке Ñ? Ñ?вим Ñ?аÑ?Ñ?иклама"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Ð?пÑ?иÑ?е"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Ð?Ñ?имени Ñ?илÑ?еÑ?е на нове поÑ?Ñ?ке Ñ? СандÑ?Ñ?еÑ?Ñ? на овом Ñ?еÑ?веÑ?Ñ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Ð?Ñ?овеÑ?и да нема Ñ?_Ñ?бÑ?еÑ?а меÑ?Ñ? новим поÑ?Ñ?кама"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Ð?Ñ?овеÑ?и да нема Ñ?Ñ?бÑ?еÑ?а Ñ?амо Ñ? Ñ?аÑ?Ñ?икли СÐ?Ð?_Ð?УЧÐ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?_Ñ?клади налог локално"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
-msgstr "SOAP подеÑ?аваÑ?а"
+msgstr "СÐ?Ð?Ð? подеÑ?аваÑ?а"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Ð?оÑ?Ñ? СÐ?Ð?Ð? поÑ?Ñ?едника за поÑ?Ñ?Ñ?:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Ð?овел Ð?Ñ?оÑ?пÐ?аÑ?з"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "Ð?а пÑ?иÑ?Ñ?Ñ?паÑ?е Novell Groupwise Ñ?еÑ?веÑ?има"
+msgstr "Ð?а пÑ?иÑ?Ñ?Ñ?п Ð?овел Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?еÑ?веÑ?има"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Ð?озинка"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на GroupWise Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном "
+"Ñ?екÑ?Ñ?Ñ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
-msgstr "Ð?омаÑ?ин или коÑ?иÑ?ник Ñ? адÑ?еÑ?и ниÑ?Ñ? доÑ?Ñ?Ñ?пни"
+msgstr "Ð?омаÑ?ин или коÑ?иÑ?ник ниÑ?Ñ? доÑ?Ñ?Ñ?пни Ñ? адÑ?еÑ?и"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:3035
+#, c-format
 msgid "You did not enter a password."
 msgstr "Ð?иÑ?Ñ?е Ñ?нели лозинкÑ?."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Ð?еке опÑ?иÑ?е можда неÑ?е иÑ?пÑ?авно Ñ?адиÑ?и на Ñ?Ñ?енÑ?Ñ?ноÑ? веÑ?зиÑ?и Ñ?еÑ?веÑ?а"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:421
 #, c-format
 msgid "No such folder %s"
-msgstr "Ð?ема Ñ?акве Ñ?аÑ?Ñ?икле %s"
+msgstr "Ð?ема Ñ?акве Ñ?аÑ?Ñ?икле â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е GroupWise Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+msgstr "Ð?е могÑ? да напÑ?авим Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?аÑ?Ñ?икле Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ð?е могÑ? да напÑ?авим поÑ?ебнÑ? Ñ?аÑ?Ñ?иклÑ? Ñ?иÑ?Ñ?ема"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:884
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Ð?лавна Ñ?аÑ?Ñ?икла не може Ñ?адÑ?жаÑ?и Ñ?аÑ?Ñ?икле Ñ? Ñ?еби"
+msgstr "Ð?лавна Ñ?аÑ?Ñ?икла не може да Ñ?адÑ?жи дÑ?Ñ?ге Ñ?аÑ?Ñ?икле"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и GroupWise Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise Ñ?еÑ?веÑ? %s"
+msgstr "Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?еÑ?веÑ? â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise Ñ?еÑ?виÑ? за %s на %s"
+msgstr "Ð?Ñ?оÑ?пÐ?аÑ?з Ñ?еÑ?виÑ? за â??%sâ?? на â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise доÑ?Ñ?ава поÑ?Ñ?е пÑ?еко %s"
+msgstr "Ð?Ñ?оÑ?пÐ?аÑ?з доÑ?Ñ?ава поÑ?Ñ?е пÑ?еко â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
-msgstr "СлаÑ?е поÑ?Ñ?ке"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Ð?оÑ?Ñ?игли Ñ?Ñ?е Ñ?меÑ?Ñ?аÑ?но огÑ?аниÑ?еÑ?е за оваÑ? налог. Ð?аÑ?е поÑ?Ñ?ке биÑ?е одлагане Ñ? одлазноÑ? поÑ?Ñ?и. Ð?оÑ?аÑ?иÑ?е иÑ? поново пÑ?иÑ?иÑ?ком на Ð?оÑ?аÑ?и/Ð?Ñ?ими дÑ?гме након Ñ?Ñ?о Ñ?клониÑ?е или аÑ?Ñ?ивиÑ?аÑ?е ваÑ?Ñ? поÑ?Ñ?Ñ?.\n"
+msgstr "ШаÑ?ем поÑ?Ñ?кÑ?"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Ð?Ñ?овеÑ?аваÑ?е за новом поÑ?Ñ?ом"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Ð?овезиваÑ?е на Ñ?еÑ?веÑ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?енÑ? командÑ? за повезиваÑ?е на Ñ?еÑ?веÑ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Ð?оманда:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ФаÑ?Ñ?икле"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "Ð?Ñ?ик_ажи Ñ?амо пÑ?иÑ?авÑ?ене Ñ?аÑ?Ñ?икле"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "Ð?_Ñ?емоÑ?Ñ?и облик имена Ñ?аÑ?Ñ?икле коÑ?е даÑ?е Ñ?еÑ?веÑ?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Ð?блик имена"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Ð¥Ñ?ла"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ð?е могÑ? да добавим Ñ?аÑ?Ñ?иклÑ?: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Ð?а пÑ?иÑ?Ñ?Ñ?паÑ?е Ð¥Ñ?ла Ñ?еÑ?веÑ?има"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"Ð?Ñ?емаÑ?или Ñ?Ñ?е Ñ?меÑ?Ñ?аÑ?но огÑ?аниÑ?еÑ?е за оваÑ? налог. Ð?аÑ?е поÑ?Ñ?ке биÑ?е одлагане "
+"Ñ? одлазноÑ? поÑ?Ñ?и. Ð?оÑ?аÑ?иÑ?е иÑ? поново пÑ?иÑ?иÑ?ком на дÑ?гме â??Ð?оÑ?аÑ?и/Ð?Ñ?имиâ?? након "
+"Ñ?Ñ?о Ñ?клониÑ?е или аÑ?Ñ?ивиÑ?аÑ?е ваÑ?Ñ? поÑ?Ñ?Ñ?.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ð?ва могÑ?Ñ?ноÑ?Ñ? обезбеÑ?Ñ?Ñ?е повезваÑ?е на Ð¥Ñ?ла Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "Ð?ез излазног Ñ?ока"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "Ð?ез Ñ?лазног Ñ?ока"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
-msgstr "Ð?пеÑ?аÑ?иÑ?а оÑ?казана"
+msgstr "Ð?пеÑ?аÑ?иÑ?а Ñ?е оÑ?казана"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, 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:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 msgstr ""
-"УпозоÑ?еÑ?е од IMAP Ñ?еÑ?веÑ?а %s %s:\n"
+"УпозоÑ?еÑ?е од Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Ð?еоÑ?екиван одговоÑ? од IMAP Ñ?еÑ?веÑ?а: %s"
+msgstr "Ð?еоÑ?екиван одговоÑ? Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела IMAP команда: %s"
+msgstr "Ð?еÑ?Ñ?пела Ð?Ð?Ð?Ð? наÑ?едба: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Ð?дговоÑ? Ñ?еÑ?веÑ?а Ñ?е пÑ?еÑ?ано завÑ?Ñ?ен."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Ð?дговоÑ? IMAP Ñ?еÑ?веÑ?а ниÑ?е Ñ?адÑ?жао %s подаÑ?ак"
+msgstr "Ð?дговоÑ? Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а ниÑ?е Ñ?адÑ?жао â??%sâ?? подаÑ?ак"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Ð?еоÑ?екиван У Ñ?едÑ? одговоÑ? од IMAP Ñ?еÑ?веÑ?а: %s"
+msgstr "Ð?еоÑ?екиван поÑ?вÑ?дан одговоÑ? Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?а: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:286
 msgid "Always check for new mail in this folder"
-msgstr "Увек пÑ?овеÑ?и за нове поÑ?Ñ?ке Ñ? овоÑ? Ñ?аÑ?Ñ?икли"
+msgstr "Увек пÑ?овеÑ?и нове поÑ?Ñ?ке Ñ? овоÑ? Ñ?аÑ?Ñ?икли"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:358
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и диÑ?екÑ?оÑ?иÑ?Ñ?м %s: %s"
+msgstr "Ð?е могÑ? да напÑ?авим диÑ?екÑ?оÑ?иÑ?Ñ?м â??%sâ??: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:965
+#: ../camel/providers/imapx/camel-imapx-server.c:3838
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Ð?Ñ?еÑ?Ñ?ага за измеÑ?еним поÑ?Ñ?кама Ñ? %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Ð?еоÑ?екивани Ñ?Ñ?аÑ?Ñ?Ñ? одговоÑ?а â??%sâ??â?? након наÑ?едбе APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr "Ð?ема одзива након наÑ?едбе APPEND"
+msgstr "Ð?Ñ?егледам измеÑ?ене поÑ?Ñ?ке Ñ? â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Ð?епознаÑ?а гÑ?еÑ?ка Ñ?е Ñ?авила Ñ?оком наÑ?едбе APPEND!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е довлаÑ?еÑ?е поÑ?Ñ?ке: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3277
+msgid "Unable to retrieve message: "
+msgstr "Ð?е могÑ? да довÑ?Ñ?ем поÑ?Ñ?кÑ?: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3312
+#: ../camel/providers/imapx/camel-imapx-server.c:5065
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? Ñ?а Ð?Ð? %s: %s"
+msgstr "Ð?е могÑ? да набавим поÑ?Ñ?кÑ? Ñ?а Ð?Ð? â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3313
+#: ../camel/providers/imapx/camel-imapx-server.c:5066
 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:3387
+#: ../camel/providers/imap/camel-imap-folder.c:4257
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ð?ва поÑ?Ñ?ка ниÑ?е Ñ?Ñ?енÑ?Ñ?но доÑ?Ñ?Ñ?пна"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4067
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Ð?епоÑ?пÑ?н одговоÑ? Ñ?еÑ?веÑ?а: подаÑ?и ниÑ?Ñ? даÑ?и за поÑ?Ñ?кÑ? %d"
+msgstr "Ð?епоÑ?пÑ?н одговоÑ? Ñ?еÑ?веÑ?а: ниÑ?Ñ? даÑ?и подаÑ?и за поÑ?Ñ?кÑ? â??%dâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4077
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Ð?епоÑ?пÑ?н одговоÑ? Ñ?еÑ?веÑ?а: Ð?Ð?Ð? ниÑ?е даÑ? за поÑ?Ñ?кÑ? %d"
+msgstr "Ð?епоÑ?пÑ?н одговоÑ? Ñ?еÑ?веÑ?а: Ð?Ð?Ð? ниÑ?е даÑ? за поÑ?Ñ?кÑ? â??%dâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4297
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и Ñ?ело поÑ?Ñ?ке Ñ? FETCH одговоÑ?Ñ?."
+msgstr "Ð?е могÑ? да пÑ?онаÑ?ем Ñ?ело поÑ?Ñ?ке Ñ? Ð?Ð?Ð?УЦÐ? одговоÑ?Ñ?."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и диÑ?екÑ?оÑ?иÑ?Ñ?м оÑ?Ñ?аве: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Ð?е могÑ? да оÑ?воÑ?им диÑ?екÑ?оÑ?иÑ?Ñ?м оÑ?Ñ?аве: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Ð?еÑ?Ñ?пело пÑ?ивÑ?емено Ñ?Ñ?ваÑ?е поÑ?Ñ?ке %s: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео пÑ?ивÑ?емено да Ñ?аÑ?Ñ?вам поÑ?Ñ?кÑ? â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Ð?еÑ?Ñ?пело пÑ?ивÑ?емено Ñ?Ñ?ваÑ?е %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео пÑ?ивÑ?емено да Ñ?аÑ?Ñ?вам поÑ?Ñ?кÑ? â??%sâ??: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео пÑ?ивÑ?емено да Ñ?аÑ?Ñ?вам â??%sâ??: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Ð?Ñ?Ñ?им пÑ?овеÑ?Ñ? за новом поÑ?Ñ?ом"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Ð?Ñ?о_веÑ?и за нове поÑ?Ñ?ке Ñ? пÑ?иÑ?авÑ?еним Ñ?аÑ?Ñ?иклама"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Ð?блик имена:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Ð?овезиваÑ?е на Ñ?еÑ?веÑ?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?енÑ? командÑ? за повезиваÑ?е на Ñ?еÑ?веÑ?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Ð?аÑ?едба:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "ФаÑ?Ñ?икле"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "Ð?Ñ?ик_ажи Ñ?амо пÑ?иÑ?авÑ?ене Ñ?аÑ?Ñ?икле"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "Ð?_Ñ?емоÑ?Ñ?и облик имена Ñ?аÑ?Ñ?икле коÑ?е даÑ?е Ñ?еÑ?веÑ?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Ð?блик _имена:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Ð?Ñ?и_мени Ñ?илÑ?еÑ?е на нове поÑ?Ñ?ке Ñ? СÐ?Ð?Ð?УЧÐ?ТУ овог Ñ?еÑ?веÑ?а"
+msgstr "Ð?Ñ?и_мени Ñ?илÑ?еÑ?е на нове поÑ?Ñ?ке Ñ? СÐ?Ð?Ð?УЧÐ?ТУ на овом Ñ?еÑ?веÑ?Ñ?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
-msgstr "Ð?Ñ?овеÑ?и да нема Ñ?Ñ?_бÑ?еÑ?а меÑ?Ñ? новим поÑ?Ñ?кама"
+msgstr "Ð?Ñ?овеÑ?и да нема _непожеÑ?ног Ñ?адÑ?жаÑ?а меÑ?Ñ? новим поÑ?Ñ?кама"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки Ñ?Ñ?клади Ñ?д_аÑ?енÑ? поÑ?Ñ?Ñ? Ñ?а локалном"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
-msgstr "IMAP"
+msgstr "Ð?Ð?Ð?Ð?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
-msgstr "Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на IMAP Ñ?еÑ?веÑ?е."
+msgstr "Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?е."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на IMAP Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:228
 #, c-format
 msgid "IMAP server %s"
-msgstr "IMAP Ñ?еÑ?веÑ? %s"
+msgstr "Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:230
 #, 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
+msgstr "Ð?Ð?Ð?Ð? Ñ?еÑ?виÑ? за â??%sâ?? на â??%sâ??"
+
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на %s: %s"
+msgstr "Ð?е могÑ? да Ñ?е повежем на â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
-msgstr "SSL ниÑ?е доÑ?Ñ?Ñ?пан"
+msgstr "ССÐ? ниÑ?е доÑ?Ñ?Ñ?пан"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Ð?овезиваÑ?е оÑ?казано"
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ð?е могÑ? да Ñ?е повежем на â??%sâ??: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2884
+#: ../camel/providers/imapx/camel-imapx-server.c:2922
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Ð?еÑ?Ñ?пело повезиваÑ?е на IMAP Ñ?еÑ?веÑ? %s Ñ? Ñ?игÑ?Ñ?ноÑ?ном модÑ?: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?е повежем на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ?? Ñ? безбедном Ñ?ежимÑ?: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2885
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
-msgstr "STARTTLS ниÑ?е подÑ?жано"
+msgstr "СТÐ?РТТÐ?С ниÑ?е подÑ?жано"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2923
 msgid "SSL negotiations failed"
-msgstr "SSL пÑ?еговоÑ?и ниÑ?Ñ? Ñ?Ñ?пели"
+msgstr "ССÐ? пÑ?еговоÑ?и ниÑ?Ñ? Ñ?Ñ?пели"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:600
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
-msgstr "SSL ниÑ?е доÑ?Ñ?Ñ?пан Ñ? овоÑ? веÑ?зиÑ?и"
+msgstr "ССÐ? ниÑ?е доÑ?Ñ?Ñ?пан Ñ? овоÑ? веÑ?зиÑ?и"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2719
+#, c-format
+msgid "Connection cancelled"
+msgstr "Ð?овезиваÑ?е Ñ?е оÑ?казано"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2724
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е командом â??%sâ??: %s"
+msgstr "Ð?е могÑ? да Ñ?е повежем Ñ?а наÑ?едбом â??%sâ??: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:468
+#: ../camel/providers/imapx/camel-imapx-store.c:1065
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:567
+#: ../camel/providers/local/camel-maildir-store.c:580
+#: ../camel/providers/local/camel-spool-store.c:508
 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:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2991
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP Ñ?еÑ?веÑ? %s не подÑ?жава Ñ?Ñ?ажени Ñ?ип пÑ?иÑ?аве %s"
+msgstr "Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ?? не подÑ?жава Ñ?Ñ?ажени Ñ?ип пÑ?иÑ?авÑ?иваÑ?а иденÑ?иÑ?еÑ?а â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Ð?ема подÑ?Ñ?ке за Ñ?ип пÑ?иÑ?аве %s"
+msgstr "Ð?ема подÑ?Ñ?ке за Ñ?ип поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3074
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?а аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на IMAP Ñ?еÑ?веÑ?.\n"
+"Ð?е могÑ? да поÑ?вÑ?дим иденÑ?иÑ?еÑ? на Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ð?ме Ñ?аÑ?Ñ?икле â??%sâ?? ниÑ?е иÑ?пÑ?авно Ñ?еÑ? Ñ?адÑ?жи знак â??%câ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1887
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и."
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла поÑ?Ñ?оÑ?и."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:874
 #, 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:3062
 #, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Ð?еÑ?Ñ?пело Ñ?лаÑ?е команде IMAP Ñ?еÑ?веÑ?Ñ? %s: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "Ð?еза Ñ?а Ñ?еÑ?веÑ?ом Ñ?е неоÑ?екивано иÑ?кÑ?Ñ?Ñ?ена"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ð?еоÑ?екиван одговоÑ? од IMAP4 Ñ?еÑ?веÑ?а %s: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3065
+msgid "Server unexpectedly disconnected: "
+msgstr "Ð?еза Ñ?а Ñ?еÑ?веÑ?ом Ñ?е неоÑ?екивано иÑ?кÑ?Ñ?Ñ?ена: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ð?еоÑ?екиван поздÑ?ав од IMAP Ñ?еÑ?веÑ?а: %s."
+msgid "Could not create folder summary for %s"
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?ажеÑ?ак Ñ?аÑ?Ñ?икле за â??%sâ??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?е изабÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+msgid "Could not create cache for %s: "
+msgstr "Ð?е могÑ? да напÑ?авим оÑ?Ñ?авÑ? за â??%sâ??: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е изабÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Ð?оÑ?иÑ?Ñ?и _Ð?Ñ?зо поновно Ñ?Ñ?аглаÑ?аваÑ?е ако га Ñ?еÑ?веÑ? подÑ?жава"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Ð?еÑ?Ñ?пело Ñ?лаÑ?е наÑ?едбе IMAP Ñ?еÑ?веÑ?Ñ? %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Ð?оÑ?иÑ?Ñ?и _УмиÑ?ен ако га Ñ?еÑ?веÑ? подÑ?жава"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "Ñ?еÑ?виÑ? ниÑ?е доÑ?Ñ?Ñ?пан"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Ð?аÑ?едба:"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Ð?еза Ñ?а IMAP4 Ñ?еÑ?веÑ?ом %s Ñ?е неоÑ?екивано пÑ?екинÑ?Ñ?а: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Ð?Ñ?оÑ? веза из _оÑ?Ñ?аве за коÑ?иÑ?Ñ?еÑ?е"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "Ð?могÑ?Ñ?аваÑ?е оÑ?кÑ?иваÑ?а допиÑ?не лиÑ?Ñ?е Ñ?е поÑ?Ñ?ебно неким Ñ?илÑ?еÑ?има и пÑ?авилима за вФаÑ?Ñ?икле"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Ð?блик имена:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Ð?Ñ?Ñ?иÑ?аÑ?е запамÑ?ениÑ? поÑ?Ñ?ка коÑ?е ниÑ?Ñ? пÑ?оÑ?иÑ?ане за X Ñ?екÑ?нди"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "Ð?Ð?Ð?Ð?+"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "Ð?Ñ?Ñ?иÑ?аÑ?е запамÑ?ениÑ? поÑ?Ñ?каÑ?Ñ?аÑ?иÑ?иÑ? од X Ñ?екÑ?нди"
+#: ../camel/providers/imapx/camel-imapx-server.c:1396
+msgid "Error writing to cache stream: "
+msgstr "Ð?Ñ?еÑ?ка пÑ?иликом Ñ?пиÑ?а Ñ? Ñ?ок оÑ?Ñ?аве:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imapx/camel-imapx-server.c:2054
 #, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и Ñ?аÑ?Ñ?икли â??%sâ??: %s"
+msgid "Not authenticated"
+msgstr "Ð?епоÑ?вÑ?Ñ?еног иденÑ?иÑ?еÑ?а"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imapx/camel-imapx-server.c:2810
 #, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и ознаке за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+msgid "Could not connect to %s (port %s): "
+msgstr "Ð?е могÑ? да Ñ?е повежем на â??%sâ?? (поÑ?Ñ? %s): "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и ознаке за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+#: ../camel/providers/imapx/camel-imapx-server.c:3251
+msgid "Closing tmp stream failed: "
+msgstr "Ð?аÑ?ваÑ?аÑ?е пÑ?ивÑ?еменог Ñ?ока ниÑ?е Ñ?Ñ?пело:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е иÑ?пÑ?азниÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+#: ../camel/providers/imapx/camel-imapx-server.c:5188
+#: ../camel/providers/imapx/camel-imapx-server.c:5203
+msgid "Cannot create spool file: "
+msgstr "Ð?е могÑ? да напÑ?авим даÑ?оÑ?екÑ? пÑ?ипÑ?еме: "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#: ../camel/providers/imapx/camel-imapx-store.c:437
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е иÑ?пÑ?азниÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+msgid "No such folder: %s"
+msgstr "Ð?ема Ñ?акве Ñ?аÑ?Ñ?икле: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#: ../camel/providers/imapx/camel-imapx-stream.c:68
 #, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? %s из Ñ?аÑ?Ñ?икле â??%sâ??: нема Ñ?акве поÑ?Ñ?ке"
+msgid "Source stream returned no data"
+msgstr "Ð?дговоÑ? извоÑ?ног Ñ?ока Ñ?е без подаÑ?ака"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#: ../camel/providers/imapx/camel-imapx-stream.c:77
 #, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? %s из Ñ?аÑ?Ñ?икле â??%sâ??: лоÑ?а наÑ?едба"
+msgid "Source stream unavailable"
+msgstr "Ток извоÑ?а Ñ?е недоÑ?Ñ?Ñ?пан"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е"
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+msgid "mailbox: %s (%s)"
+msgstr "поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е:%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?емеÑ?Ñ?иÑ?и поÑ?Ñ?кÑ? из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?емеÑ?Ñ?иÑ?и поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?кÑ? из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Ð?Ñ?овеÑ?и да нема _Ñ?Ñ?бÑ?еÑ?а меÑ?Ñ? новим поÑ?Ñ?кама"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Ð?Ñ?овеÑ?и да нема Ñ?Ñ?бÑ?еÑ?а Ñ?амо Ñ? Ñ?аÑ?Ñ?икли СÐ?Ð?Ð?УЧÐ?"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на IMAPv4rev1 Ñ?еÑ?веÑ?е."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на IMAPv4rev1 Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Ð?овезиваÑ?е оÑ?казано"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Ð?еÑ?Ñ?пело повезиваÑ?е на IMAP Ñ?еÑ?веÑ? %s Ñ? безбедноÑ?ном Ñ?ежимÑ?: Ñ?еÑ?веÑ? не подÑ?жава STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS пÑ?еговоÑ?и ниÑ?Ñ? Ñ?Ñ?пели"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?еÑ?веÑ? %s помоÑ?Ñ? меÑ?анизма пÑ?иÑ?аве %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?еÑ?веÑ? %s помоÑ?Ñ? %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ?а IMAP Ñ?еÑ?веÑ?а %s: непознаÑ?а гÑ?еÑ?ка"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, 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
-msgid "Bad command"
-msgstr "Ð?оÑ?а команда"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?пеÑ?иÑ?ална Ñ?аÑ?Ñ?икла"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?е бÑ?иÑ?аÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: Ñ?пеÑ?иÑ?ална Ñ?аÑ?Ñ?икла"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, 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
-#, 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
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?аÑ?Ñ?икле Ñ? Ñ?ежимÑ? ван мÑ?еже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Ð?иÑ?е могÑ?Ñ?е одÑ?авÑ?иваÑ?е Ñ?а IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Ð?иÑ?е могÑ?Ñ?а одÑ?ава Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Ð?иÑ?е могÑ?Ñ?а одÑ?ава Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??: лоÑ?а наÑ?едба"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Ð?Ñ?еÑ?Ñ?ага за измеÑ?еним поÑ?Ñ?кама"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP Ñ?еÑ?веÑ? %s ниÑ?е Ñ?Ñ?клаÑ?ен."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "Ð?Ñ?ибавÑ?аÑ?е омоÑ?а за нове поÑ?Ñ?ке"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ð?еоÑ?екивани елеменÑ? Ñ? одговоÑ?Ñ? IMAP Ñ?еÑ?веÑ?а %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "Ð?ема подаÑ?ака"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Ð?еза Ñ?а IMAP Ñ?еÑ?веÑ?ом %s Ñ?е неоÑ?екивано пÑ?екинÑ?Ñ?а: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Ð?Ñ?Ñ?ава за поÑ?Ñ?ке"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Ð?кÑ?пеÑ?именÑ?ални IMAP 4(.1) клиÑ?енÑ?\n"
-"Ð?во Ñ?е непÑ?овеÑ?ен и неподÑ?жан код, боÑ?е коÑ?иÑ?Ñ?иÑ?е обиÑ?ан imap.\n"
-"\n"
-" !!! Ð?Ð? Ð?Ð?Ð Ð?СТÐ?ТÐ? Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?У Ð?Ð?ШТУ  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, 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"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:272
 msgid "Index message body data"
 msgstr "Ð?опиÑ?и Ñ?адÑ?жаÑ?е поÑ?Ñ?ка"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
-#, 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
-#, c-format
-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:677
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ð?е могÑ? да добавим поÑ?Ñ?кÑ? â??%sâ?? из Ñ?аÑ?Ñ?икле â??%sâ??\n"
+"%s"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Ð?оÑ?иÑ?Ñ?иÑ?е пÑ?еглед Ñ?аÑ?Ñ?икле â??.foldersâ?? (exmh)"
+msgstr "_Ð?оÑ?иÑ?Ñ?и пÑ?еглед Ñ?аÑ?Ñ?икле â??.foldersâ?? (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
-msgstr "MH-обликовани диÑ?екÑ?оÑ?иÑ?Ñ?ми поÑ?Ñ?е"
+msgstr "Ð?Ð¥-обликовани диÑ?екÑ?оÑ?иÑ?Ñ?ми поÑ?Ñ?е"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "Ð?а Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ме поÑ?Ñ?е налик MH."
+msgstr "Ð?а Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ме поÑ?Ñ?е налик Ð?Ð¥."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Ð?окална доÑ?Ñ?ава"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Ð?а довлаÑ?еÑ?е (пÑ?емеÑ?Ñ?аÑ?е) локалне поÑ?Ñ?е из mbox облика Ñ? Ñ?аÑ?Ñ?икле коÑ?им Ñ?пÑ?авÑ?а Ð?волÑ?Ñ?иÑ?а."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Ð?а довлаÑ?еÑ?е (пÑ?емеÑ?Ñ?аÑ?е) локалне поÑ?Ñ?е из Ñ?Ñ?андаÑ?дне мбокÑ? Ñ?оÑ?маÑ?иÑ?ане "
+"пÑ?ипÑ?еме Ñ? Ñ?аÑ?Ñ?икле коÑ?има Ñ?пÑ?авÑ?а Ð?волÑ?Ñ?иÑ?а."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Ð?Ñ?имени Ñ?илÑ?еÑ?е на нове поÑ?Ñ?ке Ñ? СÐ?Ð?Ð?УЧÐ?ТУ"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?ми поÑ?Ñ?е Ñ? Maildir обликÑ?"
+msgstr "Ð?иÑ?екÑ?оÑ?иÑ?Ñ?ми поÑ?Ñ?е Ñ? Ð?еÑ?лдиÑ? обликÑ?"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "Ð?а Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? maildir диÑ?екÑ?оÑ?иÑ?Ñ?ме."
+msgstr "Ð?а Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? меÑ?лдиÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ме."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_СмеÑ?Ñ?и заглавÑ?а о Ñ?Ñ?аÑ?Ñ?Ñ?Ñ? Ñ? Ñ?оÑ?маÑ?Ñ? Elm/Pine/Mutt"
+msgstr "_СмеÑ?Ñ?и заглавÑ?а Ñ?Ñ?аÑ?а Ñ? Ð?лм/Ð?ине/Ð?Ñ?Ñ? Ñ?оÑ?маÑ?Ñ?"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "СÑ?андаÑ?дна Unix mbox spool даÑ?оÑ?ека"
+msgstr "СÑ?андаÑ?дна УникÑ? мбокÑ? даÑ?оÑ?ека пÑ?ипÑ?еме"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? Ñ?поÑ?не Ñ?Ñ?андаÑ?дне mbox spool даÑ?оÑ?еке.\n"
-"ТакоÑ?е Ñ?е може коÑ?иÑ?Ñ?иÑ?и за Ñ?иÑ?аÑ?е Ñ?Ñ?абла Ñ?аÑ?Ñ?икли Ñ? Elm, Pine, или Mutt Ñ?Ñ?илÑ?."
+"Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е локалне поÑ?Ñ?е Ñ? Ñ?поÑ?не Ñ?Ñ?андаÑ?дне мбокÑ? даÑ?оÑ?еке "
+"пÑ?ипÑ?еме.\n"
+"ТакоÑ?е Ñ?е може коÑ?иÑ?Ñ?иÑ?и за Ñ?иÑ?аÑ?е Ñ?Ñ?абла Ñ?аÑ?Ñ?икли Ñ? Ð?лм, Ð?ине или Ð?Ñ?Ñ? Ñ?Ñ?илÑ?."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "СÑ?андаÑ?дни Unix mbox spool диÑ?екÑ?оÑ?иÑ?Ñ?м"
+msgstr "СÑ?андаÑ?дни УникÑ? мбокÑ? диÑ?екÑ?оÑ?иÑ?Ñ?м пÑ?ипÑ?еме"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:305
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Ð?Ñ?Ñ?ава root %s ниÑ?е апÑ?олÑ?Ñ?на пÑ?Ñ?аÑ?а"
+msgstr "Ð?дминиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ка оÑ?Ñ?ава â??%sâ?? ниÑ?е апÑ?олÑ?Ñ?на пÑ?Ñ?аÑ?а"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:179
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Ð?Ñ?Ñ?ава root %s ниÑ?е Ñ?егÑ?лаÑ?ан диÑ?екÑ?оÑ?иÑ?Ñ?м"
+msgstr "Ð?дминиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ка оÑ?Ñ?ава â??%sâ?? ниÑ?е Ñ?егÑ?лаÑ?ан диÑ?екÑ?оÑ?иÑ?Ñ?м"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:190
+#: ../camel/providers/local/camel-local-store.c:200
+#: ../camel/providers/local/camel-local-store.c:318
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: %s"
+msgstr "Ð?е могÑ? да добавим Ñ?аÑ?Ñ?иклÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:214
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Ð?окалне оÑ?Ñ?аве немаÑ?Ñ? Ñ?андÑ?Ñ?е"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:271
 #, c-format
 msgid "Local mail file %s"
-msgstr "Ð?окална даÑ?оÑ?ека поÑ?Ñ?е %s"
+msgstr "Ð?окална даÑ?оÑ?ека поÑ?Ñ?е â??%sâ??"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? %s Ñ? %s: %s"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:452
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и â??%sâ??: %s"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и индекÑ? даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?икле â??%sâ??: %s"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем индекÑ?нÑ? даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?икле â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:510
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и меÑ?а даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?икле â??%sâ??: %s"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем меÑ?а даÑ?оÑ?екÑ? Ñ?аÑ?Ñ?икле â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? пÑ?егледÑ?: непознаÑ? Ñ?азлог"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Ð?Ñ?ододаÑ?а maildir поÑ?Ñ?ка пониÑ?Ñ?ена"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? maildir Ñ?аÑ?Ñ?иклÑ?: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "Ð?е могÑ? да додам поÑ?Ñ?кÑ? пÑ?егледÑ?: непознаÑ? Ñ?азлог"
+
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ?: %s из Ñ?аÑ?Ñ?икле %s\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Ð?е могÑ? да додам поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? диÑ?екÑ?оÑ?иÑ?Ñ?ма поÑ?Ñ?е: %s: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Ð?е могÑ? да добавим поÑ?Ñ?кÑ? â??%sâ?? из Ñ?аÑ?Ñ?икле â??%sâ??: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Ð?еиÑ?пÑ?аван Ñ?адÑ?жаÑ? поÑ?Ñ?ке"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Ð?е могÑ? да пÑ?ебаÑ?им поÑ?Ñ?кÑ? Ñ? одÑ?едиÑ?нÑ? Ñ?аÑ?Ñ?иклÑ?: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еÑ?зеÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еÑ?зеÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла не поÑ?Ñ?оÑ?и."
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла не поÑ?Ñ?оÑ?и."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: ниÑ?е maildir диÑ?екÑ?оÑ?иÑ?Ñ?м."
+msgstr "Ð?е могÑ? да пÑ?еÑ?змем Ñ?аÑ?Ñ?иклÑ? â??%sâ??: ниÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м поÑ?Ñ?е."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
-msgstr "ниÑ?е maildir диÑ?екÑ?оÑ?иÑ?Ñ?м"
+msgstr "ниÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м поÑ?Ñ?е"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:487
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еÑ?Ñ?ажиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%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:562
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е пÑ?Ñ?аÑ?е maildir диÑ?екÑ?оÑ?иÑ?Ñ?ма: %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?Ñ?аÑ?Ñ? диÑ?екÑ?оÑ?иÑ?Ñ?ма поÑ?Ñ?е: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:553
 msgid "Checking folder consistency"
-msgstr "Ð?Ñ?овеÑ?аваÑ?е Ñ?еловиÑ?оÑ?Ñ?и Ñ?аÑ?Ñ?икле"
+msgstr "Ð?Ñ?овеÑ?авам Ñ?еловиÑ?оÑ?Ñ? Ñ?аÑ?Ñ?икле"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:645
 msgid "Checking for new messages"
-msgstr "Ð?Ñ?овеÑ?аваÑ?е за нове поÑ?Ñ?ке"
+msgstr "Ð?Ñ?Ñ?им пÑ?овеÑ?Ñ? за новим поÑ?Ñ?кама"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:736
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
-msgstr "СмеÑ?Ñ?аÑ?е Ñ?аÑ?Ñ?икле"
+msgstr "СмеÑ?Ñ?ам Ñ?аÑ?Ñ?иклÑ?"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е закÑ?Ñ?Ñ?аÑ?и Ñ?аÑ?Ñ?иклÑ? %s: %s"
+msgstr "Ð?е могÑ? да закÑ?Ñ?Ñ?ам Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "Ð?одаваÑ?е поÑ?Ñ?е оÑ?казано"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ð?е могÑ? да оÑ?воÑ?им поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаваÑ?е поÑ?Ñ?ке Ñ? mbox даÑ?оÑ?екÑ?: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ð?е могÑ? да додам поÑ?Ñ?кÑ? Ñ? мбокÑ? даÑ?оÑ?екÑ?: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "ФаÑ?Ñ?икла изгледа непопÑ?авÑ?иво оÑ?Ñ?еÑ?ена."
+msgstr "ФаÑ?Ñ?икла изгледа да Ñ?е непопÑ?авÑ?иво оÑ?Ñ?еÑ?ена."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "СаÑ?Ñ?авÑ?аÑ?е поÑ?Ñ?ке неÑ?Ñ?пело."
-
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? овог имена."
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? овог имена."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: ниÑ?е обиÑ?на даÑ?оÑ?ека."
+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:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
+"Ð?е могÑ? да обÑ?иÑ?ем Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, 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:250
 #, 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:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и пÑ?еглед Ñ?аÑ?Ñ?икле â??%sâ??: %s"
+msgstr "Ð?е могÑ? да обÑ?иÑ?ем пÑ?еглед Ñ?аÑ?Ñ?икле â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и диÑ?екÑ?оÑ?иÑ?Ñ?м â??%sâ??: %s."
+msgstr "Ð?е могÑ? да напÑ?авим диÑ?екÑ?оÑ?иÑ?Ñ?м â??%sâ??: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: %s"
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "ФаÑ?Ñ?икла веÑ? поÑ?Ñ?оÑ?и"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "Ð?ово име Ñ?аÑ?Ñ?икле Ñ?е неиÑ?пÑ?авно."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и â??%sâ??: â??%sâ??: %s"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем â??%sâ??: â??%sâ??: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и â??%sâ?? Ñ? %s: %s"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем â??%sâ?? Ñ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им Ñ?аÑ?Ñ?иклÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Ð?обна гÑ?еÑ?ка пÑ?и Ñ?иÑ?аÑ?Ñ? поÑ?Ñ?е на меÑ?Ñ?Ñ? %ld Ñ? Ñ?аÑ?Ñ?икли %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Ð?обна гÑ?еÑ?ка пÑ?и Ñ?иÑ?аÑ?Ñ? поÑ?Ñ?е на меÑ?Ñ?Ñ? %s Ñ? Ñ?аÑ?Ñ?икли â??%sâ??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?овеÑ?иÑ?и Ñ?аÑ?Ñ?иклÑ?: %s: %s"
+msgstr "Ð?е могÑ? да пÑ?овеÑ?им Ñ?аÑ?Ñ?иклÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и даÑ?оÑ?екÑ?: %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им даÑ?оÑ?екÑ?: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?ваÑ?аÑ?е пÑ?ивÑ?еменог поÑ?Ñ?анÑ?ког Ñ?андÑ?Ñ?еÑ?а: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е заÑ?ваÑ?аÑ?е извоÑ?не Ñ?аÑ?Ñ?икле %s: %s"
+msgstr "Ð?е могÑ? да заÑ?воÑ?им извоÑ?нÑ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е заÑ?ваÑ?аÑ?е пÑ?ивÑ?емене Ñ?аÑ?Ñ?икле: %s"
+msgstr "Ð?е могÑ? да заÑ?воÑ?им пÑ?ивÑ?еменÑ? Ñ?аÑ?Ñ?иклÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ?: %s"
+msgstr "Ð?е могÑ? да пÑ?еименÑ?Ñ?ем Ñ?аÑ?Ñ?иклÑ?: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?ваÑ?е Ñ?аÑ?Ñ?икле: %s"
+msgstr "Ð?е могÑ? да Ñ?аÑ?Ñ?вам Ñ?аÑ?Ñ?иклÑ?: %s"
+
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"Ð?Ð?Ð?Ð?С даÑ?оÑ?ека Ñ?е оÑ?Ñ?еÑ?ена, попÑ?авиÑ?е Ñ?е. (Ð?Ñ?екивано Ñ?е Ð?Ð? Ñ?еда, али ниÑ?ам "
+"добио.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ð?еÑ?лагаÑ?е пÑ?егледа и Ñ?аÑ?Ñ?икле, Ñ?ак и након Ñ?Ñ?клаÑ?иваÑ?а"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, 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:1211
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "Ð?еÑ?Ñ?пело пиÑ?аÑ?е Ñ? пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да запиÑ?ем Ñ? пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "Ð?еÑ?Ñ?пело пиÑ?аÑ?е Ñ? пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s: %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да запиÑ?ем Ñ? пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH додаваÑ?е поÑ?Ñ?ке оÑ?казано"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? mh Ñ?аÑ?Ñ?иклÑ?: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Ð?е могÑ? да додам поÑ?Ñ?кÑ? Ñ? мÑ? Ñ?аÑ?Ñ?иклÑ?: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
+msgstr "Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: ниÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м."
+msgstr "Ð?е могÑ? да добавим Ñ?аÑ?Ñ?иклÑ? â??%sâ??: ниÑ?е диÑ?екÑ?оÑ?иÑ?Ñ?м."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и пÑ?Ñ?аÑ?Ñ? MH диÑ?екÑ?оÑ?иÑ?Ñ?ма: %s: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?Ñ?аÑ?Ñ? Ð?Ð¥ диÑ?екÑ?оÑ?иÑ?Ñ?ма: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Ð?Ñ?ипÑ?ема â??%sâ?? не може Ñ?е оÑ?воÑ?иÑ?и: %s"
+msgstr "Ð?е могÑ? да оÑ?воÑ?им пÑ?ипÑ?емÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:132
 #, 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:158
 #, 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:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
+"Ð?е могÑ? да оÑ?воÑ?им Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:176
 #, 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:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
+"Ð?е могÑ? да напÑ?авим Ñ?аÑ?Ñ?иклÑ? â??%sâ??:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:193
@@ -4051,110 +3896,133 @@ msgstr ""
 msgid "'%s' is not a mailbox file."
 msgstr "â??%sâ?? ниÑ?е даÑ?оÑ?ека Ñ?андÑ?Ñ?еÑ?а."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ð?Ñ?Ñ?ава не подÑ?жава СÐ?Ð?Ð?УЧÐ?"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
-msgstr "Ð?Ñ?ипÑ?емна даÑ?оÑ?ека поÑ?Ñ?е %s"
+msgstr "Ð?Ñ?ипÑ?емна даÑ?оÑ?ека поÑ?Ñ?е â??%sâ??"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "СÑ?абло Ñ?аÑ?Ñ?икли за пÑ?ипÑ?емÑ? %s"
+msgstr "СÑ?абло Ñ?аÑ?Ñ?икле за пÑ?ипÑ?емÑ? â??%sâ??"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ФаÑ?Ñ?икле за пÑ?ипÑ?емÑ? не могÑ? биÑ?и пÑ?еименоване"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 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:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и пÑ?ивÑ?еменÑ? Ñ?аÑ?Ñ?иклÑ? %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Ð?е могÑ? да Ñ?Ñ?кладим пÑ?ивÑ?еменÑ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ? %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Ð?е могÑ? да Ñ?Ñ?кладим Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ? â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ? %s: %s\n"
+"Ð?е могÑ? да Ñ?Ñ?кладим Ñ?аÑ?Ñ?иклÑ? за пÑ?ипÑ?емÑ? â??%sâ??: %s\n"
 "ФаÑ?Ñ?икла Ñ?е можда оÑ?Ñ?еÑ?ена, Ñ?множиÑ?е Ñ?аÑ?Ñ?вано Ñ? â??%sâ??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "УнÑ?Ñ?Ñ?аÑ?Ñ?а гÑ?еÑ?ка: Ð?Ð?Ð? Ñ? неиÑ?пÑ?авном обликÑ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ð?е могÑ? да добавим поÑ?Ñ?кÑ? â??%sâ??: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Ð?еÑ?Ñ?пела поÑ?иÑ?ка: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "Ð?еÑ?Ñ?пела поÑ?иÑ?ка: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Ð?е можеÑ?е поÑ?лаÑ?и NNTP поÑ?Ñ?ке ако ниÑ?Ñ?е повезани!"
+msgstr "Ð?е можеÑ?е да поÑ?аÑ?еÑ?е Ð?Ð?ТÐ? поÑ?Ñ?ке ако ниÑ?Ñ?е повезани!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Ð?е можеÑ?е Ñ?множиÑ?и поÑ?Ñ?ке из NNTP Ñ?аÑ?Ñ?икле!"
+msgstr "Ð?е можеÑ?е да Ñ?множиÑ?е поÑ?Ñ?ке из Ð?Ð?ТÐ? Ñ?аÑ?Ñ?икле!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Ð?Ñ?икажи Ñ?аÑ?Ñ?икле Ñ? кÑ?аÑ?ком запиÑ?Ñ? (нпÑ?. c.o.linux Ñ?меÑ?Ñ?о comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_Ð?Ñ?икажи Ñ?аÑ?Ñ?икле Ñ? кÑ?аÑ?ком запиÑ?Ñ? (нпÑ?. â??c.o.linuxâ?? Ñ?меÑ?Ñ?о â??comp.os.linuxâ??)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "У п_Ñ?озоÑ?Ñ?еÑ?Ñ? за пÑ?иÑ?авÑ?, пÑ?икажи Ñ?елаÑ?ивна имена Ñ?аÑ?Ñ?икли"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET веÑ?Ñ?и"
+msgstr "Ð?УÐ?Ð?Ð?Т веÑ?Ñ?и"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Ð?во Ñ?е понÑ?Ñ?аÑ? за Ñ?иÑ?аÑ?е и Ñ?лаÑ?е на USENET гÑ?Ñ?пе веÑ?Ñ?и."
+msgstr "Ð?во Ñ?е доÑ?Ñ?авÑ?аÑ? за Ñ?иÑ?аÑ?е и Ñ?лаÑ?е на Ð?УÐ?Ð?Ð?Т гÑ?Ñ?пе веÑ?Ñ?и."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е пÑ?иÑ?авиÑ?и на NNTP Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е пÑ?иÑ?авиÑ?и на Ð?Ð?ТÐ? Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е поздÑ?ава од %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Ð?е могÑ? да пÑ?оÑ?иÑ?ам поздÑ?ав Ñ?а â??%sâ??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP Ñ?еÑ?веÑ? %s Ñ?е Ñ?звÑ?аÑ?ио кодом о гÑ?еÑ?Ñ?и %d: %s"
+msgstr "Ð?Ð?ТÐ? Ñ?еÑ?веÑ? â??%sâ?? Ñ?е вÑ?аÑ?ио код гÑ?еÑ?ке â??%dâ??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET веÑ?Ñ?и пÑ?еко %s"
+msgstr "Ð?УÐ?Ð?Ð?Т веÑ?Ñ?и пÑ?еко â??%sâ??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4033,650 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"Ð?е можеÑ?е Ñ?е пÑ?иÑ?авиÑ?и на овÑ? гÑ?Ñ?пÑ? веÑ?Ñ?и:\n"
+"Ð?е можеÑ?е да Ñ?е пÑ?иÑ?авиÑ?е на овÑ? гÑ?Ñ?пÑ? веÑ?Ñ?и:\n"
 "\n"
 "Ð?ема Ñ?акве гÑ?Ñ?пе. Ð?забÑ?ана Ñ?Ñ?авка Ñ?е веÑ?оваÑ?но надÑ?еÑ?ена Ñ?аÑ?Ñ?икла."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"Ð?е можеÑ?е Ñ?е одÑ?авиÑ?и Ñ?а ове гÑ?Ñ?пе веÑ?Ñ?и:\n"
+"Ð?е можеÑ?е да Ñ?е одÑ?авиÑ?е Ñ?а ове гÑ?Ñ?пе веÑ?Ñ?и:\n"
 "\n"
 "гÑ?Ñ?па не поÑ?Ñ?оÑ?и!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Ð?е можеÑ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и: пÑ?иÑ?авиÑ?е Ñ?е Ñ?меÑ?Ñ?о Ñ?ога."
+msgstr ""
+"Ð?е можеÑ?е да напÑ?авиÑ?е Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и: пÑ?иÑ?авиÑ?е Ñ?е Ñ?меÑ?Ñ?о Ñ?ога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "Ð?е можеÑ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и."
+msgstr "Ð?е можеÑ?е да пÑ?еименÑ?Ñ?еÑ?е Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Ð?е можеÑ?е Ñ?клониÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и: одÑ?авиÑ?е Ñ?е Ñ?меÑ?Ñ?о Ñ?ога."
+msgstr ""
+"Ð?е можеÑ?е да Ñ?клониÑ?е Ñ?аÑ?Ñ?иклÑ? Ñ? оÑ?Ñ?ави веÑ?Ñ?и: одÑ?авиÑ?е Ñ?е Ñ?меÑ?Ñ?о Ñ?ога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
-msgstr "Ð?оÑ?Ñ?ебна аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а али коÑ?иÑ?ниÑ?ко име ниÑ?е Ñ?неÑ?о"
+msgstr "Ð?оÑ?Ñ?ебно Ñ?е поÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а али коÑ?иÑ?ниÑ?ко име ниÑ?е Ñ?неÑ?о"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на Ñ?еÑ?веÑ?: %s"
+msgstr "Ð?е могÑ? да поÑ?вÑ?дим иденÑ?иÑ?еÑ? на Ñ?еÑ?веÑ?Ñ?: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP команда неÑ?Ñ?пела: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+msgid "NNTP Command failed: "
+msgstr "Ð?Ð?ТÐ? наÑ?едба ниÑ?е Ñ?Ñ?пела: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "Ð?еповезано."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ð?ема Ñ?акве Ñ?аÑ?Ñ?икле: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: пÑ?еÑ?Ñ?аживаÑ?е новиÑ? поÑ?Ñ?ка"
+msgstr "%s: пÑ?еÑ?Ñ?ажÑ?Ñ?ем нове поÑ?Ñ?ке"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Ð?еоÑ?екиван одговоÑ? xover-а: %s"
+msgstr "Ð?еоÑ?екиван одговоÑ? кÑ?овеÑ?а: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ð?еоÑ?екиван одговоÑ? head-а: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е одÑ?Ñ?Ñ?ани"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Ð?еÑ?Ñ?пела опеÑ?аÑ?иÑ?а: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
-msgstr "Ð?Ñ?еÑ?зимаÑ?е POP пÑ?егледа"
+msgstr "Ð?Ñ?еÑ?зимам Ð?Ð?Ð? пÑ?еглед"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и POP пÑ?еглед: %s"
+msgstr "Ð?е могÑ? да добавим Ð?Ð?Ð? пÑ?еглед: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
-msgstr "Ð?збаÑ?иваÑ?е Ñ?Ñ?аÑ?иÑ? поÑ?Ñ?ка"
+msgstr "Ð?збаÑ?Ñ?Ñ?ем Ñ?Ñ?аÑ?е поÑ?Ñ?ке"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
-msgstr "Ð?збаÑ?иваÑ?е обÑ?иÑ?аниÑ? поÑ?Ñ?ка"
+msgstr "Ð?збаÑ?Ñ?Ñ?ем обÑ?иÑ?ане поÑ?Ñ?ке"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
+#: ../camel/providers/pop3/camel-pop3-folder.c:597
 #, c-format
 msgid "No message with UID %s"
-msgstr "Ð?ема поÑ?Ñ?ка Ñ?а Ð?Ð?Ð? %s"
+msgstr "Ð?ема поÑ?Ñ?ке Ñ?а Ð?Ð?Ð? %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:604
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "Ð?овлаÑ?еÑ?е POP поÑ?Ñ?ке %d"
+msgstr "Ð?овлаÑ?им Ð?Ð?Ð? поÑ?Ñ?кÑ? %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:708
 msgid "Unknown reason"
 msgstr "Ð?епознаÑ? Ñ?азлог"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "Ð?Ñ?Ñ?ава за поÑ?Ñ?ке"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Ð?Ñ?Ñ?ави поÑ?Ñ?ке на Ñ?еÑ?веÑ?Ñ?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, 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:45
 msgid "Disable _support for all POP3 extensions"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?и _подÑ?Ñ?кÑ? за Ñ?ва POP3 пÑ?оÑ?иÑ?еÑ?а"
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?и _подÑ?Ñ?кÑ? за Ñ?ва Ð?Ð?Ð?3 пÑ?оÑ?иÑ?еÑ?а"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
-msgstr "POP"
+msgstr "Ð?Ð?Ð?"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "Ð?а повезиваÑ?е и пÑ?еÑ?зимаÑ?е поÑ?Ñ?е Ñ?а POP Ñ?еÑ?веÑ?а."
+msgstr "Ð?а повезиваÑ?е и пÑ?еÑ?зимаÑ?е поÑ?Ñ?е Ñ?а Ð?Ð?Ð? Ñ?еÑ?веÑ?а."
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ð?Ð?Ð? Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?. "
+"Ð?во Ñ?е Ñ?едина опÑ?иÑ?а коÑ?Ñ? подÑ?жаваÑ?Ñ? многи Ð?Ð?Ð? Ñ?еÑ?веÑ?и."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на POP Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном Ñ?екÑ?Ñ?Ñ?. Ð?во Ñ?е Ñ?едина опÑ?иÑ?а коÑ?Ñ? подÑ?жаваÑ?Ñ? многи POP Ñ?еÑ?веÑ?и."
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ð?Ð?Ð? Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке пÑ?еко Ð?Ð?Ð?Ð? "
+"пÑ?оÑ?окола. Ð?во можда неÑ?е Ñ?адиÑ?и Ñ?вим коÑ?иÑ?ниÑ?има Ñ?ак и на Ñ?еÑ?веÑ?има коÑ?и "
+"Ñ?вÑ?де да Ñ?о подÑ?жаваÑ?Ñ?."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на POP Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке пÑ?еко APOP пÑ?оÑ?окола. Ð?во можда неÑ?е Ñ?адиÑ?и Ñ?вим коÑ?иÑ?ниÑ?има Ñ?ак и на Ñ?еÑ?веÑ?има коÑ?и Ñ?вÑ?де да Ñ?о подÑ?жаваÑ?Ñ?."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е иÑ?пÑ?авног поздÑ?ава POP Ñ?еÑ?веÑ?а %s"
+msgstr "Ð?еÑ?Ñ?пело Ñ?иÑ?аÑ?е иÑ?пÑ?авног поздÑ?ава Ð?Ð?Ð? Ñ?еÑ?веÑ?а â??%sâ??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s Ñ? Ñ?игÑ?Ñ?ноÑ?ном Ñ?ежимÑ? %s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ?? Ñ? безбедном Ñ?ежимÑ?: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
-msgstr "СеÑ?веÑ? не подÑ?жава STLS"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:257
-msgid "TLS is not available in this build"
-msgstr "TLS ниÑ?е доÑ?Ñ?Ñ?пан Ñ? овом издаÑ?Ñ?"
+msgstr "СеÑ?веÑ? не подÑ?жава СТÐ?С"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ?? Ñ? безбедном Ñ?ежимÑ?%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "ТÐ?С пÑ?еговоÑ?и ниÑ?Ñ? Ñ?Ñ?пели"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
+msgid "TLS is not available in this build"
+msgstr "ТÐ?С ниÑ?е доÑ?Ñ?Ñ?пан Ñ? овом издаÑ?Ñ?"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s: Ñ?Ñ?ажени меÑ?анизам аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е ниÑ?е подÑ?жан."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??: Ñ?Ñ?ажени наÑ?ин поÑ?вÑ?Ñ?иваÑ?а "
+"иденÑ?иÑ?еÑ?а ниÑ?е подÑ?жан."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:323
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Ð?еÑ?Ñ?пела SASL пÑ?иÑ?ава â??%sâ?? на POP Ñ?еÑ?веÑ? %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Ð?иÑ?е Ñ?Ñ?пела СÐ?СÐ? пÑ?иÑ?ава â??%sâ?? на Ð?Ð?Ð? Ñ?еÑ?веÑ? %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на POP Ñ?еÑ?веÑ? %s: гÑ?еÑ?ка SASL пÑ?оÑ?окола"
+msgstr "Ð?е могÑ? да Ñ?е пÑ?иÑ?авим на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??: гÑ?еÑ?ка СÐ?СÐ? пÑ?оÑ?окола"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Ð?иÑ?е могÑ?Ñ?а аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на POP Ñ?еÑ?веÑ? %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да поÑ?вÑ?дим иденÑ?иÑ?еÑ? на Ð?Ð?Ð? Ñ?еÑ?веÑ?Ñ? â??%sâ??: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s: пÑ?имÑ?ен \tInvalid APOP Ð?Ð?. Ð?огÑ?Ñ? напад заменом иденÑ?иÑ?еÑ?а. Ð?бÑ?аÑ?иÑ?е Ñ?е админÑ?."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??: пÑ?имиÑ? Ð?еиÑ?пÑ?аван Ð?Ð?Ð?Ð? Ð?Ð?. Ð?огÑ?Ñ? "
+"Ñ?е напад заменом иденÑ?иÑ?еÑ?а. Ð?бÑ?аÑ?иÑ?е Ñ?е админÑ?."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s.\n"
+"Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??.\n"
 "Ð?Ñ?еÑ?ка пÑ?и Ñ?лаÑ?Ñ? лозинке: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:484
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??.\n"
+"Ð?Ñ?еÑ?ка пÑ?и Ñ?лаÑ?Ñ? коÑ?иÑ?ниÑ?ког имена%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:497
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s.\n"
-"Ð?Ñ?еÑ?ка пÑ?и Ñ?лаÑ?Ñ? коÑ?иÑ?ниÑ?ког имена: %s"
+"Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??.\n"
+"Ð?Ñ?еÑ?ка пÑ?и Ñ?лаÑ?Ñ? лозинке%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ð?е могÑ? да Ñ?е повежем на Ð?Ð?Ð? Ñ?еÑ?веÑ? â??%sâ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+msgid "POP3 server %s"
+msgstr "Ð?Ð?Ð?3 Ñ?еÑ?веÑ? â??%sâ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "Ð?Ð?Ð?3 Ñ?еÑ?веÑ? за â??%sâ?? на â??%sâ??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:685
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ð?ема Ñ?акве Ñ?аÑ?Ñ?икле â??%sâ??."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "Ð?Ð?Ð?3 оÑ?Ñ?ава нема Ñ?иÑ?еÑ?аÑ?Ñ?иÑ?Ñ? Ñ?аÑ?Ñ?икли"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Ð?а доÑ?Ñ?авÑ? поÑ?Ñ?е пÑ?оÑ?леÑ?иваÑ?ем â??sendmailâ?? пÑ?огÑ?амÑ? на локалном Ñ?иÑ?Ñ?емÑ?."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Ð?а доÑ?Ñ?авÑ? поÑ?Ñ?е пÑ?оÑ?леÑ?иваÑ?ем â??sendmailâ?? пÑ?огÑ?амÑ? на локалном Ñ?иÑ?Ñ?емÑ?."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?иÑ?аÑ?е лиÑ?Ñ?е пÑ?ималаÑ?а"
+msgstr "Ð?е могÑ? да анализиÑ?ам Ñ?пиÑ?ак пÑ?ималаÑ?а"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и везÑ? ка sendmail-Ñ?: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
+msgstr "Ð?е могÑ? да напÑ?авим везÑ? ка Ñ?ендмеÑ?лÑ?: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Ð?иÑ?е могÑ?Ñ?е поделиÑ?и sendmail: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
+msgstr "Ð?е могÑ? да поделим Ñ?ендмеÑ?л: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail Ñ?е завÑ?Ñ?ио Ñ?игналом %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
+msgstr "Ñ?ендмеÑ?л Ñ?е завÑ?Ñ?ио Ñ?игналом â??â??%s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Ð?иÑ?е могÑ?Ñ?е извÑ?Ñ?иÑ?и %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
+msgstr "Ð?е могÑ? да извÑ?Ñ?им â??%sâ??: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail Ñ?е завÑ?Ñ?ио Ñ?а Ñ?Ñ?аÑ?Ñ?Ñ?ом %d: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
+msgstr "Ñ?ендмеÑ?л Ñ?е завÑ?Ñ?ио Ñ?а Ñ?Ñ?аÑ?Ñ?Ñ?ом â??%dâ??: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
-msgstr "sendmail"
+msgstr "Ñ?ендмеÑ?л"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
-msgstr "Ð?оÑ?Ñ?ава поÑ?Ñ?е пÑ?еко пÑ?огÑ?ама sendmail"
+msgstr "Ð?оÑ?Ñ?ава поÑ?Ñ?е пÑ?еко пÑ?огÑ?ама Ñ?ендмеÑ?л"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
-msgstr "SMTP"
+msgstr "СÐ?ТÐ?"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Ð?а доÑ?Ñ?авÑ? поÑ?Ñ?е повезиваÑ?ем на пÑ?оÑ?леÑ?иваÑ? поÑ?Ñ?е Ñ? мÑ?ежи коÑ?иÑ?Ñ?еÑ?ем SMTP."
+msgstr ""
+"Ð?а доÑ?Ñ?авÑ? поÑ?Ñ?е повезиваÑ?ем на пÑ?оÑ?леÑ?иваÑ? поÑ?Ñ?е Ñ? мÑ?ежи коÑ?иÑ?Ñ?еÑ?ем СÐ?ТÐ?."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
-msgstr "Ð?Ñ?еÑ?ка Ñ? Ñ?инÑ?акÑ?и, команда ниÑ?е пÑ?епознаÑ?а"
+msgstr "Ð?Ñ?еÑ?ка Ñ? Ñ?инÑ?акÑ?и, наÑ?едба ниÑ?е пÑ?епознаÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "Ð?Ñ?еÑ?ка Ñ? Ñ?инÑ?акÑ?и Ñ? паÑ?амеÑ?Ñ?има или аÑ?гÑ?менÑ?има"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
-msgstr "Ð?оманда ниÑ?е подÑ?жана"
+msgstr "Ð?аÑ?едба ниÑ?е подÑ?жана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
-msgstr "Ð?аÑ?амеÑ?аÑ? команде ниÑ?е подÑ?жан"
+msgstr "Ð?аÑ?амеÑ?аÑ? наÑ?едбе ниÑ?е подÑ?жан"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?иÑ?Ñ?ема, или одговоÑ? на помоÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "Ð?оÑ?Ñ?ка о помоÑ?и"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
-msgstr "СеÑ?виÑ? Ñ?пÑ?еман"
+msgstr "СеÑ?виÑ? Ñ?е Ñ?пÑ?еман"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "СеÑ?виÑ? заÑ?ваÑ?а канал пÑ?еноÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
-msgstr "СеÑ?виÑ? ниÑ?е доÑ?Ñ?Ñ?пан, заÑ?ваÑ?аÑ?е канала пÑ?еноÑ?а"
+msgstr "СеÑ?виÑ? ниÑ?е доÑ?Ñ?Ñ?пан, заÑ?ваÑ?ам канал пÑ?еноÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
-msgstr "ТÑ?ажена Ñ?адÑ?а за поÑ?Ñ?Ñ? Ñ? Ñ?едÑ?, завÑ?Ñ?ено"
+msgstr "ТÑ?ажена Ñ?адÑ?а за поÑ?Ñ?Ñ? Ñ?е Ñ? Ñ?едÑ?, завÑ?Ñ?ено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 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:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "ТÑ?ажена Ñ?адÑ?а за поÑ?Ñ?Ñ? ниÑ?е пÑ?едÑ?зеÑ?а: недоÑ?Ñ?Ñ?пно поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "ТÑ?ажена Ñ?адÑ?а ниÑ?е пÑ?едÑ?зеÑ?а: недоÑ?Ñ?Ñ?пно поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е"
+msgstr "ТÑ?ажена Ñ?адÑ?а ниÑ?е пÑ?едÑ?зеÑ?а: поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е Ñ?е недоÑ?Ñ?Ñ?пно"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "ТÑ?ажена Ñ?адÑ?а ниÑ?е пÑ?едÑ?зеÑ?а: гÑ?еÑ?ка пÑ?и обÑ?ади"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "Ð?оÑ?иÑ?ник ниÑ?е локалан; покÑ?Ñ?аÑ?Ñ?е <пÑ?Ñ?аÑ?а-пÑ?оÑ?леÑ?иваÑ?а>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "ТÑ?ажена Ñ?адÑ?а ниÑ?е пÑ?едÑ?зеÑ?а: недовоÑ?но пÑ?оÑ?Ñ?оÑ?а на Ñ?иÑ?Ñ?емÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Ð?дÑ?Ñ?Ñ?аÑ?о од Ñ?Ñ?ажене Ñ?адÑ?е за поÑ?Ñ?Ñ?: пÑ?емаÑ?ен додеÑ?ен пÑ?оÑ?Ñ?оÑ?"
+msgstr "Ð?Ñ?екинÑ?Ñ?а Ñ?е Ñ?Ñ?ажена Ñ?адÑ?а за поÑ?Ñ?Ñ?: пÑ?емаÑ?ен Ñ?е додеÑ?ен пÑ?оÑ?Ñ?оÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 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:152
 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:154
 msgid "Transaction failed"
 msgstr "Ð?еÑ?Ñ?пео пÑ?еноÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "Ð?оÑ?Ñ?ебно Ñ?е Ñ?лаÑ?е лозинке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
-msgstr "Ð?еÑ?анизам аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е Ñ?е пÑ?еÑ?лаб"
+msgstr "Ð?еÑ?анизам поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а Ñ?е пÑ?еÑ?лаб"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Ð?еопÑ?одно Ñ?иÑ?Ñ?оваÑ?е за Ñ?Ñ?ажени меÑ?анизам аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е"
+msgstr "Ð?еопÑ?одно Ñ?е Ñ?иÑ?Ñ?оваÑ?е за Ñ?Ñ?ажени меÑ?анизам поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
-msgstr "Ð?еÑ?Ñ?пела пÑ?ивÑ?емена аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
+msgstr "Ð?иÑ?е Ñ?Ñ?пело пÑ?ивÑ?емено поÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Ð?Ñ?еÑ?ка код одговоÑ?а добÑ?одоÑ?лиÑ?е"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+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:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, 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
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела STARTTLS команда: %s"
+msgstr "Ð?е могÑ? да Ñ?е повежем на СÐ?ТÐ? Ñ?еÑ?веÑ? â??%sâ?? Ñ? Ñ?игÑ?Ñ?ноÑ?ном Ñ?ежимÑ?: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Ð?еÑ?Ñ?пела STARTTLS команда"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "Ð?еÑ?Ñ?пела СТÐ?РТТÐ?С наÑ?едба: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP Ñ?еÑ?веÑ? %s не подÑ?жава Ñ?Ñ?ажени Ñ?ип аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е %s."
+msgstr "СÐ?ТÐ? Ñ?еÑ?веÑ? â??%sâ?? не подÑ?жава Ñ?Ñ?ажени Ñ?ип поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а â??%sâ??."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Ð?иÑ?е могÑ?Ñ?а аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на SMTP Ñ?еÑ?веÑ?.\n"
+"Ð?е могÑ? да поÑ?вÑ?дим иденÑ?иÑ?еÑ? на СÐ?ТÐ? Ñ?еÑ?веÑ?Ñ?.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:676
 #, c-format
 msgid "SMTP server %s"
-msgstr "SMTP Ñ?еÑ?веÑ? %s"
+msgstr "СÐ?ТÐ? Ñ?еÑ?веÑ? â??%sâ??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "SMTP доÑ?Ñ?ава поÑ?Ñ?е пÑ?еко %s"
+msgstr "СÐ?ТÐ? доÑ?Ñ?ава поÑ?Ñ?е пÑ?еко â??%sâ??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#, c-format
 msgid "Cannot send message: service not connected."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке: Ñ?еÑ?виÑ? ниÑ?е повезан."
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: Ñ?еÑ?виÑ? ниÑ?е повезан."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:705
+#, c-format
 msgid "Cannot send message: sender address not valid."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке: адÑ?еÑ?а поÑ?иÑ?аоÑ?а ниÑ?е иÑ?пÑ?авна."
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: адÑ?еÑ?а поÑ?иÑ?аоÑ?а ниÑ?е иÑ?пÑ?авна."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:709
 msgid "Sending message"
-msgstr "СлаÑ?е поÑ?Ñ?ке"
+msgstr "ШаÑ?ем поÑ?Ñ?кÑ?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#, c-format
 msgid "Cannot send message: no recipients defined."
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке: ниÑ?Ñ? одÑ?еÑ?ени пÑ?имаоÑ?и."
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: ниÑ?Ñ? одÑ?еÑ?ени пÑ?имаоÑ?и."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?лаÑ?е поÑ?Ñ?ке: Ñ?едан или виÑ?е неиÑ?пÑ?авниÑ? пÑ?ималаÑ?а"
+msgstr "Ð?е могÑ? да поÑ?аÑ?ем поÑ?Ñ?кÑ?: Ñ?едан или виÑ?е неиÑ?пÑ?авниÑ? пÑ?ималаÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:973
 msgid "SMTP Greeting"
-msgstr "SMTP поздÑ?ав"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела HELO команда: %s"
+msgstr "СÐ?ТÐ? поздÑ?ав"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "Ð?еÑ?Ñ?пела HELO команда"
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1019
+msgid "HELO command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??HELOâ??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "SMTP Authentication"
-msgstr "SMTP аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?авÑ?еÑ?Ñ? обÑ?екÑ?а SASL аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?е."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела AUTH команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Ð?еÑ?Ñ?пела AUTH команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "Ð?оÑ? одговоÑ? на аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? од Ñ?еÑ?веÑ?а.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Ð?еÑ?Ñ?пела MAIL FROM команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Ð?еÑ?Ñ?пела MAIL FROM команда"
+msgstr "СÐ?ТÐ? поÑ?вÑ?Ñ?иваÑ?е иденÑ?иÑ?еÑ?а"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 #, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Ð?еÑ?Ñ?пела RCPT TO команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> неÑ?Ñ?пело"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Ð?еÑ?Ñ?пела DATA команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Ð?еÑ?Ñ?пела DATA команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела RSET команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Ð?еÑ?Ñ?пела RSET команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Ð?еÑ?Ñ?пела QUIT команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Ð?еÑ?Ñ?пела QUIT команда"
+msgid "Error creating SASL authentication object."
+msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?авÑ?еÑ?Ñ? обÑ?екÑ?а СÐ?СÐ? поÑ?вÑ?Ñ?иваÑ?а иденÑ?иÑ?еÑ?а."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+msgid "AUTH command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??AUTHâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1226
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+msgid "MAIL FROM command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??MAIL FROMâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+msgid "RCPT TO command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??RCPT TOâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1282
+#: ../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:1328
+#: ../camel/providers/smtp/camel-smtp-transport.c:1337
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1404
+#: ../camel/providers/smtp/camel-smtp-transport.c:1420
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+msgid "DATA command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??DATAâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+msgid "RSET command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??RSETâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../camel/providers/smtp/camel-smtp-transport.c:1514
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+msgid "QUIT command failed: "
+msgstr "Ð?еÑ?Ñ?пела наÑ?едба â??QUITâ??: "
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
 msgid "Business"
 msgstr "Ð?оÑ?ао"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
 msgid "Competition"
 msgstr "Ð?адмеÑ?аÑ?е"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
 msgid "Favorites"
 msgstr "Ð?миÑ?ено"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
 msgid "Gifts"
 msgstr "Ð?оклони"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
 msgid "Goals/Objectives"
 msgstr "ЦиÑ?еви/задаÑ?и"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
 msgid "Holiday"
 msgstr "Ð?Ñ?азник"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
 msgid "Holiday Cards"
 msgstr "ЧеÑ?Ñ?иÑ?ке"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
 msgid "Hot Contacts"
 msgstr "Ð?ажни конÑ?акÑ?и"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
 msgid "Ideas"
 msgstr "Ð?деÑ?е"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
 msgid "International"
 msgstr "Ð?еÑ?Ñ?наÑ?одно"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
 msgid "Key Customer"
 msgstr "Ð?ажна мÑ?Ñ?Ñ?еÑ?иÑ?а"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
 msgid "Miscellaneous"
 msgstr "Разно"
 
-#: ../libedataserver/e-categories.c:58
-msgid "Personal"
-msgstr "Ð?иÑ?но"
-
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
 msgid "Phone Calls"
 msgstr "ТелеÑ?онÑ?ки позиви"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
 msgid "Status"
 msgstr "СÑ?аÑ?Ñ?Ñ?"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
 msgid "Strategies"
 msgstr "СÑ?Ñ?аÑ?егиÑ?е"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
 msgid "Suppliers"
 msgstr "Ð?обавÑ?аÑ?и"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
 msgid "Time & Expenses"
 msgstr "Ð?Ñ?еме и издаÑ?и"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
 msgid "VIP"
-msgstr "VIP"
+msgstr "Ð?Ð?Ð?"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
 msgid "Waiting"
 msgstr "ЧекаÑ?е"
 
@@ -4772,8 +4684,7 @@ msgstr "ЧекаÑ?е"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4692,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4700,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4708,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c: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,200 +4787,197 @@ 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"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
 msgid "Accessing LDAP Server anonymously"
-msgstr "Ð?нонимно пÑ?иÑ?Ñ?Ñ?па LDAP Ñ?еÑ?веÑ?Ñ?"
+msgstr "Ð?нонимно пÑ?иÑ?Ñ?Ñ?па Ð?Ð?Ð?Ð? Ñ?еÑ?веÑ?Ñ?"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
 msgid "Failed to authenticate.\n"
-msgstr "Ð?еÑ?Ñ?пела аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а.\n"
+msgstr "Ð?иÑ?ам Ñ?Ñ?пео да поÑ?вÑ?дим иденÑ?иÑ?еÑ?.\n"
+
+#: ../libedataserverui/e-categories-dialog.c:166
+msgid "Category Icon"
+msgstr "Ð?кониÑ?а каÑ?егоÑ?иÑ?е"
+
+#: ../libedataserverui/e-categories-dialog.c:172
+msgid "_No Image"
+msgstr "_Ð?ез Ñ?лике"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:392
 #, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "У подеÑ?аваÑ?Ñ? веÑ? поÑ?Ñ?оÑ?и каÑ?егоÑ?иÑ?а â??%sâ??. Ð?забеÑ?иÑ?е дÑ?Ñ?го име"
+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:700
 msgid "Icon"
-msgstr "Ð?кона"
+msgstr "Ð?кониÑ?а"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:705
 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 "_Ð?кона каÑ?егоÑ?иÑ?е"
+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 "Currently _used 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:298
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Ð?зÑ?ада каÑ?егоÑ?иÑ?е â??%sâ??"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Ð?одаÑ?и о боÑ?ама"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Ð?оÑ?а за обÑ?адÑ?"
-
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:335
 msgid "Select Contacts from Address Book"
 msgstr "Ð?забеÑ?иÑ?е конÑ?акÑ?е из адÑ?еÑ?аÑ?а"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:674
 msgid "_Add"
 msgstr "_Ð?одаÑ?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:678
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:906
+#: ../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:2641
 #, 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:2656
 #, c-format
 msgid "Cop_y %s"
 msgstr "У_множи %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2666
 #, c-format
 msgid "C_ut %s"
 msgstr "Ð?_Ñ?еÑ?и %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2683
 #, c-format
 msgid "_Edit %s"
 msgstr "_УÑ?еди %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:516
 #, c-format
 msgid "_Delete %s"
-msgstr "_Уклони %s"
+msgstr "_Уклони â??%sâ??"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ð?Ñ?Ñ?Ñ? пÑ?ивеÑ?ка ниÑ?е Ñ?поÑ?Ñ?ебÑ?ив: нема коÑ?иÑ?ника ниÑ?и домаÑ?ина"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1120
 msgid "You have the Caps Lock key on."
-msgstr "Ð?оÑ?аÑ?е да Ñ?кÑ?Ñ?Ñ?иÑ?е велика Ñ?лова."
+msgstr "УкÑ?Ñ?Ñ?или Ñ?Ñ?е велика Ñ?лова."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1243
 msgid "_Remember this passphrase"
 msgstr "_Ð?апамÑ?и овÑ? лозинкÑ?"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Ð?апамÑ?и овÑ? лозинкÑ? до кÑ?аÑ?а ове Ñ?еÑ?иÑ?е"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1249
 msgid "_Remember this password"
 msgstr "_Ð?апамÑ?и овÑ? лозинкÑ?"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1250
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ð?апамÑ?и овÑ? лозинкÑ? до кÑ?аÑ?а ове Ñ?еÑ?иÑ?е"
 
@@ -5085,329 +4986,837 @@ msgstr "_Ð?апамÑ?и овÑ? лозинкÑ? до кÑ?аÑ?а ове Ñ?еÑ?иÑ?
 msgid "Select destination"
 msgstr "Ð?забеÑ?иÑ?е одÑ?едиÑ?Ñ?е"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:174
 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/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "Ð?еиÑ?пÑ?авно повезиваÑ?е"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "УнеÑ?иÑ?е лозинкÑ?"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+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/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "Ð?ема одговоÑ?а Ñ?еÑ?веÑ?а"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "УÑ?еÑ?иваÑ? за обÑ?авÑ?иваÑ?е"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "Ð?оÑ? паÑ?амеÑ?аÑ?"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "УÑ?еÑ?иваÑ?"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "â??%sâ?? Ñ? кÑ?изи пÑ?е â??%sâ??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Ð?Ñ?Ñ?оÑ? за обÑ?авÑ?иваÑ?е"
+#~ msgid "book busy"
+#~ msgstr "кÑ?ига заÑ?зеÑ?а"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Ð?Ñ?Ñ?оÑ?"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA изÑ?зеÑ?ак пÑ?и позивÑ? â??%sâ??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Ð?Ñ?Ñ?оÑ? коÑ?и не Ñ?Ñ?еÑ?Ñ?Ñ?е"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: нема Ñ?Ñ?енÑ?Ñ?не опеÑ?аÑ?иÑ?е"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "РеÑ?ензенÑ?"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â??%sâ?? на кÑ?изи поÑ?ле â??%sâ??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "СаÑ?адник"
+# Ð?во Ñ?е било "коÑ?иÑ?ник пониÑ?Ñ?ен", али миÑ?лим да Ñ?е ово ипак иÑ?пÑ?авниÑ?е
+#~ msgid "%s: canceled"
+#~ msgstr "%s: оÑ?казано"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "Ð?иÑ?Ñ?а"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: нема доÑ?Ñ?Ñ?пне пÑ?оизводÑ?е за адÑ?еÑ?Ñ? â??%s'"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Ð?Ñ?илагоÑ?ено"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: ниÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е EBookListener"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Ð?пÑ?Ñ?а гÑ?еÑ?ка"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: нема Ñ?опÑ?Ñ?вени Ð?Ð?Ð? конÑ?акÑ?а Ñ?меÑ?Ñ?ен Ñ? gconf"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "ФаÑ?Ñ?икла иÑ?Ñ?ог имена веÑ? поÑ?Ñ?оÑ?и"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е да напÑ?авиÑ?и низ за пÑ?ибавÑ?аÑ?е делÑ?и"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Ð?аведен Ñ?ип Ñ?аÑ?Ñ?икле ниÑ?е иÑ?пÑ?аван"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Рад ван мÑ?еже ниÑ?е доÑ?Ñ?Ñ?пан"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O гÑ?еÑ?ка"
+#~ msgid "Cannot open message"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е оÑ?воÑ?иÑ?и поÑ?Ñ?кÑ?"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Ð?ема довоÑ?но пÑ?оÑ?Ñ?оÑ?а за пÑ?авÑ?еÑ?е Ñ?аÑ?Ñ?икле"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?икÑ?Ñ?Ñ?еÑ?е поÑ?Ñ?ке: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "ФаÑ?Ñ?икла ниÑ?е пÑ?азна"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?еÑ?Ñ?ага по изÑ?азÑ?: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Ð?аведена Ñ?аÑ?Ñ?икла ниÑ?е пÑ?онаÑ?ена"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?ебÑ?оÑ?аваÑ?е по изÑ?азÑ?: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "ФÑ?нкÑ?иÑ?а ниÑ?е пÑ?имеÑ?ена Ñ? овоÑ? оÑ?Ñ?ави"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Ð?еподÑ?жана опеÑ?аÑ?иÑ?а: пÑ?еÑ?Ñ?ага по Ð?Ð?Ð?: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Ð?пеÑ?аÑ?иÑ?а ниÑ?е подÑ?жана"
+#~ msgid "Learning junk"
+#~ msgstr "УÑ?еÑ?е Ñ?Ñ?а Ñ?е Ñ?Ñ?бÑ?е"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Ð?аведени Ñ?ип Ñ? овоÑ? оÑ?Ñ?ави ниÑ?е подÑ?жан"
+#~ msgid "Learning non-junk"
+#~ msgstr "УÑ?еÑ?е Ñ?Ñ?а ниÑ?е Ñ?Ñ?бÑ?е"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Ð?аведена Ñ?аÑ?Ñ?икла не може биÑ?и измеÑ?ена ниÑ?и Ñ?клоÑ?ена"
+#~ msgid "Canceled."
+#~ msgstr "Ð?дÑ?Ñ?Ñ?аÑ?о."
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ?ако да Ñ?е налази Ñ? Ñ?оÑ? Ñ?амоÑ?"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Ð?во Ñ?е део поÑ?Ñ?ке Ñ?а дигиÑ?алним поÑ?пиÑ?ом"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ?ога имена"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?а пÑ?овеÑ?а поÑ?пиÑ?а поÑ?Ñ?ке: ниÑ?е могÑ?Ñ?е напÑ?авиÑ?и пÑ?ивÑ?еменÑ? "
+#~ "даÑ?оÑ?екÑ?: %s"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ð?ва опеÑ?аÑ?иÑ?а не може биÑ?и изведена Ñ? Ñ?ежимÑ? ван мÑ?еже."
+#~ msgid "Unable to parse message content"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?оÑ?иÑ?аÑ?и Ñ?адÑ?жаÑ? поÑ?Ñ?ке"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "ФаÑ?Ñ?икле Ñ?иÑ?и Ñ?е влаÑ?ник %s"
+#~ msgid "cannot create thread"
+#~ msgstr "ниÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е низа"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "Ð?иÑ?не Ñ?аÑ?Ñ?икле"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Ð?миÑ?ене Ñ?авне Ñ?аÑ?Ñ?икле"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем Kerberos 4 пÑ?иÑ?аве."
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Све Ñ?авне Ñ?аÑ?Ñ?икле"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Kerberos каÑ?Ñ?Ñ?:\n"
+#~ "%s"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Ð?лобална лиÑ?Ñ?а адÑ?еÑ?а"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel Ñ?еÑ?иÑ?а не подÑ?жава пÑ?оÑ?леÑ?иваÑ?е поÑ?Ñ?ке."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Ð?бÑ?иÑ?ани пÑ?едмеÑ?и"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "Ñ?воз кÑ?Ñ?Ñ?ева: неизведено"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Ð?невник"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "извоз кÑ?Ñ?Ñ?ева: неизведено"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Ð?елеÑ?ке"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ?: неиÑ?пÑ?авна опеÑ?аÑ?иÑ?а"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Ð?длазна"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?аÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ?а издаваÑ?а"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Ð?оÑ?лаÑ?и пÑ?едмеÑ?и"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Ð?адÑ?жеÑ?а"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?е поÑ?пиÑ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Ð?еиÑ?пÑ?авно повезиваÑ?е"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?е поÑ?пиÑ?а за лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Ð?еиÑ?пÑ?аван одговоÑ? Ñ?еÑ?веÑ?а"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е деÑ?иÑ?Ñ?оваÑ?и Ñ?авни кÑ?Ñ?Ñ? издаваÑ?а"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Ð?ема одговоÑ?а Ñ?еÑ?веÑ?а"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Ð?еÑ?Ñ?пео поÑ?пиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Ð?оÑ? паÑ?амеÑ?аÑ?"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Ð?еÑ?Ñ?пео поÑ?пиÑ? за лиÑ?Ñ?Ñ? повÑ?Ñ?ениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Ð?одÑ?Ñ?ка даÑ?оÑ?еке адÑ?еÑ?аÑ?а за Ð?волÑ?Ñ?иÑ?Ñ?"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?оÑ? ниÑ?е важеÑ?и"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Ð?аÑ?оÑ?ека календаÑ?а и webcal подÑ?Ñ?ка за Ð?волÑ?Ñ?иÑ?Ñ?"
+#~ msgid "Certificate has expired"
+#~ msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?е иÑ?Ñ?екао"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "СеÑ?виÑ? за пÑ?овеÑ?Ñ? Ñ?Ñ?Ñ?еÑ?а СеÑ?веÑ?а подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL Ñ?оÑ? ниÑ?е важеÑ?и"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "СеÑ?виÑ? за пÑ?иÑ?авÑ? СеÑ?веÑ?а подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
+#~ msgid "CRL has expired"
+#~ msgstr "CRL Ñ?е иÑ?Ñ?екао"
 
-#. 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 "Error in CRL"
+#~ msgstr "Ð?Ñ?еÑ?ка Ñ? CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "Ð?ема виÑ?е мемоÑ?иÑ?е"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "СамопоÑ?пиÑ?ани Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ?е нÑ?лÑ?е велиÑ?ине"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "СамопоÑ?пиÑ?ани Ñ?еÑ?Ñ?иÑ?икаÑ? Ñ? ланÑ?Ñ?"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е локално добиÑ?и издаваÑ?ев Ñ?еÑ?Ñ?иÑ?икаÑ?"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?пиÑ? лиÑ?Ñ?а"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Ð?анаÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?е пÑ?едÑ?гаÑ?ак"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "Ð?овÑ?Ñ?ен Ñ?еÑ?Ñ?иÑ?икаÑ?"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Ð?еиÑ?пÑ?аван издаваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "Ð?Ñ?емаÑ?ена дÑ?жина пÑ?Ñ?аÑ?е"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Ð?еиÑ?пÑ?авна Ñ?вÑ?Ñ?а"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Ð?еповеÑ?Ñ?ив Ñ?еÑ?Ñ?иÑ?икаÑ?"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Ð?дбиÑ?ен Ñ?еÑ?Ñ?иÑ?икаÑ?"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Ð?аÑ?лов/издаваÑ? неÑ?лагаÑ?е"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID неÑ?лагаÑ?е"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/издаваÑ? Ñ?еÑ?иÑ?Ñ?ко неÑ?лагаÑ?е"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "УпоÑ?Ñ?еба кÑ?Ñ?Ñ?а не подÑ?жава поÑ?пиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?ом"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Ð?Ñ?еÑ?ка пÑ?и пÑ?овеÑ?и пÑ?огÑ?ама"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Ð?оÑ? Ñ?еÑ?Ñ?иÑ?икаÑ? од %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ð?елиÑ?е ли ипак да пÑ?иÑ?ваÑ?иÑ?е?"
+
+# Ð?во Ñ?е било "коÑ?иÑ?ник пониÑ?Ñ?ен", али миÑ?лим да Ñ?е ово ипак иÑ?пÑ?авниÑ?е
+#~ msgid "User canceled"
+#~ msgstr "Ð?оÑ?иÑ?ник одÑ?Ñ?Ñ?ао"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ФаÑ?Ñ?икла за Ñ?меÑ?е Ñ?е пÑ?на. Ð?Ñ?пÑ?азниÑ?е Ñ?е."
+
+#~ msgid "Hula"
+#~ msgstr "Ð¥Ñ?ла"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Ð?а пÑ?иÑ?Ñ?Ñ?паÑ?е Ð¥Ñ?ла Ñ?еÑ?веÑ?има"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Ð?ва могÑ?Ñ?ноÑ?Ñ? обезбеÑ?Ñ?Ñ?е повезваÑ?е на Ð¥Ñ?ла Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? "
+#~ "обиÑ?ном Ñ?екÑ?Ñ?Ñ?."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Ð?еоÑ?екивани Ñ?Ñ?аÑ?Ñ?Ñ? одговоÑ?а â??%sâ??â?? након наÑ?едбе APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Ð?ема одзива након наÑ?едбе APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Ð?епознаÑ?а гÑ?еÑ?ка Ñ?е Ñ?авила Ñ?оком наÑ?едбе APPEND!"
+
+#~ msgid "Drafts"
+#~ msgstr "Ð?Ñ?ипÑ?ема"
+
+#~ msgid "Sent"
+#~ msgstr "Ð?оÑ?лаÑ?о"
+
+#~ msgid "Templates"
+#~ msgstr "Шаблони"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Ð?еÑ?Ñ?пело Ñ?лаÑ?е команде IMAP Ñ?еÑ?веÑ?Ñ? %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Ð?еоÑ?екиван одговоÑ? од IMAP4 Ñ?еÑ?веÑ?а %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Ð?еоÑ?екиван поздÑ?ав од IMAP Ñ?еÑ?веÑ?а: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е изабÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е изабÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Ð?еÑ?Ñ?пело Ñ?лаÑ?е наÑ?едбе IMAP Ñ?еÑ?веÑ?Ñ? %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Ð?еза Ñ?а IMAP4 Ñ?еÑ?веÑ?ом %s Ñ?е неоÑ?екивано пÑ?екинÑ?Ñ?а: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Ð?могÑ?Ñ?аваÑ?е оÑ?кÑ?иваÑ?а допиÑ?не лиÑ?Ñ?е Ñ?е поÑ?Ñ?ебно неким Ñ?илÑ?еÑ?има и "
+#~ "пÑ?авилима за вФаÑ?Ñ?икле"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Ð?Ñ?Ñ?иÑ?аÑ?е запамÑ?ениÑ? поÑ?Ñ?ка коÑ?е ниÑ?Ñ? пÑ?оÑ?иÑ?ане за X Ñ?екÑ?нди"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Ð?Ñ?Ñ?иÑ?аÑ?е запамÑ?ениÑ? поÑ?Ñ?каÑ?Ñ?аÑ?иÑ?иÑ? од X Ñ?екÑ?нди"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?иÑ?Ñ?Ñ?пиÑ?и Ñ?аÑ?Ñ?икли â??%sâ??: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и ознаке за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?кладиÑ?и ознаке за Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е иÑ?пÑ?азниÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е иÑ?пÑ?азниÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? %s из Ñ?аÑ?Ñ?икле â??%sâ??: нема Ñ?акве поÑ?Ñ?ке"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и поÑ?Ñ?кÑ? %s из Ñ?аÑ?Ñ?икле â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: Ñ?аÑ?Ñ?икла Ñ?е Ñ?амо за Ñ?иÑ?аÑ?е"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а гÑ?еÑ?ка"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е додаÑ?и поÑ?Ñ?кÑ? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е пÑ?емеÑ?Ñ?иÑ?и поÑ?Ñ?кÑ? из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а "
+#~ "гÑ?еÑ?ка"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: непознаÑ?а "
+#~ "гÑ?еÑ?ка"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е пÑ?емеÑ?Ñ?иÑ?и поÑ?Ñ?ке из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а "
+#~ "наÑ?едба"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е Ñ?множиÑ?и поÑ?Ñ?кÑ? из Ñ?аÑ?Ñ?икле â??%sâ?? Ñ? Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Ð?Ñ?овеÑ?и да нема _Ñ?Ñ?бÑ?еÑ?а меÑ?Ñ? новим поÑ?Ñ?кама"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Ð?Ñ?овеÑ?и да нема Ñ?Ñ?бÑ?еÑ?а Ñ?амо Ñ? Ñ?аÑ?Ñ?икли СÐ?Ð?Ð?УЧÐ?"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Ð?а Ñ?иÑ?аÑ?е и Ñ?меÑ?Ñ?аÑ?е поÑ?Ñ?е на IMAPv4rev1 Ñ?еÑ?веÑ?е."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Ð?ва опÑ?иÑ?а Ñ?е повезаÑ?и на IMAPv4rev1 Ñ?еÑ?веÑ? коÑ?иÑ?Ñ?еÑ?ем лозинке Ñ? обиÑ?ном "
+#~ "Ñ?екÑ?Ñ?Ñ?."
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Ð?еÑ?Ñ?пело повезиваÑ?е на IMAP Ñ?еÑ?веÑ? %s Ñ? безбедноÑ?ном Ñ?ежимÑ?: Ñ?еÑ?веÑ? не "
+#~ "подÑ?жава STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?еÑ?веÑ? %s помоÑ?Ñ? меÑ?анизма пÑ?иÑ?аве %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?еÑ?веÑ? %s помоÑ?Ñ? %s"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?авÑ?еÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е добиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ?а IMAP Ñ?еÑ?веÑ?а %s: непознаÑ?а гÑ?еÑ?ка"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и LIST инÑ?оÑ?маÑ?иÑ?Ñ? за â??%sâ?? Ñ?а IMAP Ñ?еÑ?веÑ?а %s: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "Ð?оÑ?а команда"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е бÑ?иÑ?аÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е обÑ?иÑ?аÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: Ñ?пеÑ?иÑ?ална Ñ?аÑ?Ñ?икла"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?е IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?и Ñ?аÑ?Ñ?иклÑ? â??%sâ?? Ñ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "Ð?иÑ?е могÑ?Ñ?е добиÑ?и подаÑ?ке %s за обÑ?азаÑ? â??%sâ?? Ñ?а IMAP Ñ?еÑ?веÑ?а %s: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на IMAP Ñ?аÑ?Ñ?икле Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на Ñ?аÑ?Ñ?иклÑ? â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на Ñ?аÑ?Ñ?иклÑ? â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е одÑ?авÑ?иваÑ?е Ñ?а IMAP Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а одÑ?ава Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??: неиÑ?пÑ?авно име Ñ?андÑ?Ñ?еÑ?а"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?а одÑ?ава Ñ?а Ñ?аÑ?Ñ?икле â??%sâ??: лоÑ?а наÑ?едба"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Ð?Ñ?еÑ?Ñ?ага за измеÑ?еним поÑ?Ñ?кама"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP Ñ?еÑ?веÑ? %s ниÑ?е Ñ?Ñ?клаÑ?ен."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Ð?Ñ?ибавÑ?аÑ?е омоÑ?а за нове поÑ?Ñ?ке"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Ð?еоÑ?екивани елеменÑ? Ñ? одговоÑ?Ñ? IMAP Ñ?еÑ?веÑ?а %s: "
+
+#~ msgid "No data"
+#~ msgstr "Ð?ема подаÑ?ака"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "Ð?еза Ñ?а IMAP Ñ?еÑ?веÑ?ом %s Ñ?е неоÑ?екивано пÑ?екинÑ?Ñ?а: %s"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "Ð?кÑ?пеÑ?именÑ?ални IMAP 4(.1) клиÑ?енÑ?\n"
+#~ "Ð?во Ñ?е непÑ?овеÑ?ен и неподÑ?жан код, боÑ?е коÑ?иÑ?Ñ?иÑ?е обиÑ?ан imap.\n"
+#~ "\n"
+#~ " !!! Ð?Ð? Ð?Ð?Ð Ð?СТÐ?ТÐ? Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?У Ð?Ð?ШТУ  !!!\n"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на POP Ñ?еÑ?веÑ? %s"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Ð?Ñ?ододаÑ?а maildir поÑ?Ñ?ка пониÑ?Ñ?ена"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "Ð?еиÑ?пÑ?аван Ñ?адÑ?жаÑ? поÑ?Ñ?ке"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "Ð?одаваÑ?е поÑ?Ñ?е оÑ?казано"
+
+#~ msgid "Message construction failed."
+#~ msgstr "СаÑ?Ñ?авÑ?аÑ?е поÑ?Ñ?ке неÑ?Ñ?пело."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH додаваÑ?е поÑ?Ñ?ке оÑ?казано"
+
+#~ msgid "Use cancel"
+#~ msgstr "Ð?оÑ?иÑ?Ñ?иÑ?е одÑ?Ñ?Ñ?ани"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Ð?еÑ?Ñ?пела STARTTLS команда"
+
+#~ msgid "HELO command failed"
+#~ msgstr "Ð?еÑ?Ñ?пела HELO команда"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "Ð?еÑ?Ñ?пела AUTH команда"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Ð?оÑ? одговоÑ? на аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?Ñ? од Ñ?еÑ?веÑ?а.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Ð?еÑ?Ñ?пела MAIL FROM команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Ð?еÑ?Ñ?пела RCPT TO команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Ð?еÑ?Ñ?пела DATA команда: %s: поÑ?Ñ?а ниÑ?е поÑ?лаÑ?а"
+
+#~ msgid "RSET command failed"
+#~ msgstr "Ð?еÑ?Ñ?пела RSET команда"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "Ð?еÑ?Ñ?пела QUIT команда"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Ð?Ñ?едмеÑ?(и) пÑ?ипада(Ñ?Ñ?) овим _каÑ?егоÑ?иÑ?ама:"
+
+#~ msgid "Color Info"
+#~ msgstr "Ð?одаÑ?и о боÑ?ама"
+
+#~ msgid "The color to render"
+#~ msgstr "Ð?оÑ?а за обÑ?адÑ?"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "УнеÑ?иÑ?е лозинкÑ? за %s"
+
+#~ msgid "Enter password"
+#~ msgstr "УнеÑ?иÑ?е лозинкÑ?"
+
+#~ msgid "Owner"
+#~ msgstr "Ð?лаÑ?ник"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "УÑ?еÑ?иваÑ? за обÑ?авÑ?иваÑ?е"
+
+#~ msgid "Editor"
+#~ msgstr "УÑ?еÑ?иваÑ?"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Ð?Ñ?Ñ?оÑ? за обÑ?авÑ?иваÑ?е"
+
+#~ msgid "Author"
+#~ msgstr "Ð?Ñ?Ñ?оÑ?"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "Ð?Ñ?Ñ?оÑ? коÑ?и не Ñ?Ñ?еÑ?Ñ?Ñ?е"
+
+#~ msgid "Reviewer"
+#~ msgstr "РеÑ?ензенÑ?"
+
+#~ msgid "Contributor"
+#~ msgstr "СаÑ?адник"
+
+#~ msgid "None"
+#~ msgstr "Ð?иÑ?Ñ?а"
+
+#~ msgid "Custom"
+#~ msgstr "Ð?Ñ?илагоÑ?ено"
+
+#~ msgid "Generic error"
+#~ msgstr "Ð?пÑ?Ñ?а гÑ?еÑ?ка"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "ФаÑ?Ñ?икла иÑ?Ñ?ог имена веÑ? поÑ?Ñ?оÑ?и"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Ð?аведен Ñ?ип Ñ?аÑ?Ñ?икле ниÑ?е иÑ?пÑ?аван"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ð?ема довоÑ?но пÑ?оÑ?Ñ?оÑ?а за пÑ?авÑ?еÑ?е Ñ?аÑ?Ñ?икле"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "ФаÑ?Ñ?икла ниÑ?е пÑ?азна"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Ð?аведена Ñ?аÑ?Ñ?икла ниÑ?е пÑ?онаÑ?ена"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "ФÑ?нкÑ?иÑ?а ниÑ?е пÑ?имеÑ?ена Ñ? овоÑ? оÑ?Ñ?ави"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Ð?пеÑ?аÑ?иÑ?а ниÑ?е подÑ?жана"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Ð?аведени Ñ?ип Ñ? овоÑ? оÑ?Ñ?ави ниÑ?е подÑ?жан"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Ð?аведена Ñ?аÑ?Ñ?икла не може биÑ?и измеÑ?ена ниÑ?и Ñ?клоÑ?ена"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ?ако да Ñ?е налази Ñ? Ñ?оÑ? Ñ?амоÑ?"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ð?иÑ?е могÑ?Ñ?е напÑ?авиÑ?и Ñ?аÑ?Ñ?иклÑ? Ñ?ога имена"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ð?ва опеÑ?аÑ?иÑ?а не може биÑ?и изведена Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
+#~ msgid "%s's Folders"
+#~ msgstr "ФаÑ?Ñ?икле Ñ?иÑ?и Ñ?е влаÑ?ник %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "Ð?иÑ?не Ñ?аÑ?Ñ?икле"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Ð?миÑ?ене Ñ?авне Ñ?аÑ?Ñ?икле"
+
+#~ msgid "All Public Folders"
+#~ msgstr "Све Ñ?авне Ñ?аÑ?Ñ?икле"
+
+#~ msgid "Global Address List"
+#~ msgstr "Ð?лобална лиÑ?Ñ?а адÑ?еÑ?а"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Ð?бÑ?иÑ?ани пÑ?едмеÑ?и"
+
+#~ msgid "Journal"
+#~ msgstr "Ð?невник"
+
+#~ msgid "Notes"
+#~ msgstr "Ð?елеÑ?ке"
+
+#~ msgid "Outbox"
+#~ msgstr "Ð?длазна"
+
+#~ msgid "Sent Items"
+#~ msgstr "Ð?оÑ?лаÑ?и пÑ?едмеÑ?и"
+
+#~ msgid "Tasks"
+#~ msgstr "Ð?адÑ?жеÑ?а"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Ð?одÑ?Ñ?ка даÑ?оÑ?еке адÑ?еÑ?аÑ?а за Ð?волÑ?Ñ?иÑ?Ñ?"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Ð?аÑ?оÑ?ека календаÑ?а и webcal подÑ?Ñ?ка за Ð?волÑ?Ñ?иÑ?Ñ?"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "СеÑ?виÑ? за пÑ?овеÑ?Ñ? Ñ?Ñ?Ñ?еÑ?а СеÑ?веÑ?а подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "СеÑ?виÑ? за пÑ?иÑ?авÑ? СеÑ?веÑ?а подаÑ?ака Ð?волÑ?Ñ?иÑ?е"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "Ð?оÑ?ло Ñ?е до виÑ?еÑ?Ñ?Ñ?Ñ?киÑ? пÑ?екоÑ?аÑ?еÑ?а Ñ?егменаÑ?а; ниÑ?е могÑ?Ñ?е пÑ?иказаÑ?и "
+#~ "пÑ?озоÑ?Ñ?е за гÑ?еÑ?ке\n"
 
 #~ msgid "Fair"
 #~ msgstr "ЧиÑ?Ñ?о"
+
 #~ msgid "Snow showers"
 #~ msgstr "Ð?еÑ?ава"
+
 #~ msgid "Snow"
 #~ msgstr "Снег"
+
 #~ msgid "Partly cloudy"
 #~ msgstr "Ð?еÑ?Ñ?имиÑ?но облаÑ?но"
+
 #~ msgid "Smoke"
 #~ msgstr "Ð?им"
+
 #~ msgid "Thunderstorms"
 #~ msgstr "Ð?Ñ?мÑ?авине"
+
 #~ msgid "Cloudy"
 #~ msgstr "Ð?блаÑ?но"
+
 #~ msgid "Drizzle"
 #~ msgstr "Слаба киÑ?а"
+
 #~ msgid "Sunny"
 #~ msgstr "СÑ?нÑ?ано"
+
 #~ msgid "Dust"
 #~ msgstr "Ð?Ñ?аÑ?ина"
+
 #~ msgid "Clear"
 #~ msgstr "Ð?едÑ?о"
+
 #~ msgid "Mostly cloudy"
 #~ msgstr "Ð?Ñ?еÑ?ежно облаÑ?но"
+
 #~ msgid "Windy"
 #~ msgstr "Ð?еÑ?Ñ?овиÑ?о"
+
 #~ msgid "Rain showers"
 #~ msgstr "Ð?ака киÑ?а"
+
 #~ msgid "Foggy"
 #~ msgstr "Ð?агловиÑ?о"
+
 #~ msgid "Rain/snow mixed"
 #~ msgstr "Ð?иÑ?а и Ñ?нег"
+
 #~ msgid "Sleet"
 #~ msgstr "Ð?иÑ?а пÑ?аÑ?ена Ñ?негом"
+
 #~ msgid "Very hot/humid"
 #~ msgstr "Ð?еома Ñ?опло/влажно"
+
 #~ msgid "Blizzard"
 #~ msgstr "Ð?едена олÑ?Ñ?а"
+
 #~ msgid "Freezing rain"
 #~ msgstr "Ð?едена киÑ?а"
+
 #~ msgid "Haze"
 #~ msgstr "Ð?змаглиÑ?а"
+
 #~ msgid "Blowing snow"
 #~ msgstr "Снежни налеÑ?и"
+
 #~ msgid "Freezing drizzle"
 #~ msgstr "Ð?едена Ñ?лаба киÑ?а"
+
 #~ msgid "Very cold/wind chill"
 #~ msgstr "Ð?еома Ñ?ладно/веÑ?Ñ?овиÑ?о"
+
 #~ msgid "Rain"
 #~ msgstr "Ð?иÑ?а"
+
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "Ð?Ñ?еме: меÑ?Ñ?имиÑ?но облаÑ?но"
+
 #~ msgid "%.1f°C - %s"
 #~ msgstr "%.1f°C - %s"
+
 #~ msgid "%.1f°F - %s"
 #~ msgstr "%.1f°F - %s"
+
 #~ msgid "%.1f/%.1f°C - %s"
 #~ msgstr "%.1f/%.1f°C - %s"
+
 #~ msgid "%.1f/%.1f°F - %s"
 #~ msgstr "%.1f/%.1f°F - %s"
+
 #~ msgid "%d%% chance of precipitation\n"
 #~ msgstr "Ñ?анÑ?а од %d%% за падавине\n"
+
 #~ msgid "%.1fcm snow\n"
 #~ msgstr "%.1fcm Ñ?нег\n"
+
 #~ msgid "%.1fin snow\n"
 #~ msgstr "%.1fin Ñ?нег\n"
+
 #~ msgid "%.1f-%.1fcm snow\n"
 #~ msgstr "%.1f-%.1fcm Ñ?нег\n"
+
 #~ msgid "%.1f-%.1fin snow\n"
 #~ msgstr "%.1f-%.1fin Ñ?нег\n"
+
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "Ð?еÑ?Ñ?пело пÑ?авÑ?еÑ?е Ñ?адÑ?жаног пÑ?оÑ?еÑ?а â??%sâ??: %s"
+
 #~ msgid "Performing query on unknown header: %s"
 #~ msgstr "Ð?звÑ?Ñ?аваÑ?е пÑ?еÑ?Ñ?аге на непознаÑ?ом заглавÑ?Ñ?: %s"
+
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "Ð?екодиÑ?аÑ?е неÑ?Ñ?пело, гÑ?еÑ?ка %d"
+
 #~ msgid "Cannot find certificate for `%s'"
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е наÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ? за â??%sâ??"
+
 #~ msgid "%sPlease enter the GroupWise password for %s %s"
 #~ msgstr "%sУнеÑ?иÑ?е Groupwise лозинкÑ? за %s %s"
+
 #~ msgid "Unable to authenticate to GroupWise server. "
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?а аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?а на GroupWise Ñ?еÑ?веÑ?."
+
 #~ msgid "Folder was destroyed and recreated on server."
 #~ msgstr "ФаÑ?Ñ?икла Ñ?е Ñ?ниÑ?Ñ?ена и поново на Ñ?еÑ?веÑ?Ñ? напÑ?авÑ?ена."
+
 #~ msgid ""
 #~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
 #~ msgstr "Ð?еоÑ?екиван одговоÑ? Ñ?еÑ?веÑ?а: иÑ?Ñ?овеÑ?ни Ð?Ð?Ð? за поÑ?Ñ?ке %d и %d"
+
 #~ msgid "%sPlease enter the IMAP password for %s %s"
 #~ msgstr "%sУнеÑ?иÑ?е IMAP лозинкÑ? за %s %s"
+
 #~ msgid "%sPlease enter the IMAP password for %s on host %s"
 #~ msgstr "%sУнеÑ?иÑ?е IMAP лозинкÑ? коÑ?иÑ?ника %s на домаÑ?инÑ? %s"
+
 #~ msgid "Could not save summary: %s: %s"
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е Ñ?Ñ?ваÑ?е пÑ?егледа: %s: %s"
+
 #~ msgid "Please enter the NNTP password for %s %s"
 #~ msgstr "УнеÑ?иÑ?е NNTP лозинкÑ? за %s %s"
+
 #~ msgid "%sPlease enter the SMTP password for %s on host %s"
 #~ msgstr "%sУнеÑ?иÑ?е SMTP лозинкÑ? за %s на домаÑ?инÑ? %s"
+
 #~ msgid "Category _Color"
 #~ msgstr "_Ð?оÑ?а каÑ?егоÑ?иÑ?е"
+
 #~ msgid "Select User"
 #~ msgstr "Ð?забеÑ?иÑ?е коÑ?иÑ?ника"
+
 #~ msgid "Addressbook..."
 #~ msgstr "Ð?дÑ?еÑ?аÑ?..."
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "Ð?Ñ?еÑ?ка пÑ?и пиÑ?аÑ?Ñ? Ñ? пÑ?ивÑ?емено поÑ?Ñ?анÑ?ко Ñ?андÑ?Ñ?е: %s"
+
 #~ msgid "\t\t\t\t\t\t"
 #~ msgstr "\t\t\t\t\t\t"
+
 #~ msgid "Failed to create pipe to '%s': %s"
 #~ msgstr "Ð?еÑ?Ñ?пело пÑ?авÑ?еÑ?е везе ка â??%sâ??: %s"
+
 #~ msgid "Cannot get folder info in offline mode."
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е добиÑ?и подаÑ?ке за Ñ?аÑ?Ñ?иклÑ? Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
 #~ msgid "Cannot delete GroupWise folders in offline mode."
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е бÑ?иÑ?аÑ?е GroupWise Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
 #~ msgid "Cannot rename GroupWise folders in offline mode."
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е пÑ?еименоваÑ?е GroupWise Ñ?аÑ?Ñ?икли Ñ? Ñ?ежимÑ? ван мÑ?еже."
+
 #~ msgid "%sEnter password for %s"
 #~ msgstr "%sУнеÑ?иÑ?е лозинкÑ? за %s"
+
 #~ msgid ""
 #~ "Could not authenticate to server. (Password incorrect?)\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Ð?иÑ?е могÑ?Ñ?а пÑ?иÑ?ава на Ñ?еÑ?веÑ?. (Ð?еÑ?аÑ?на лозинка?)\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Could not authenticate to server.\n"
 #~ "\n"
@@ -5425,14 +5834,17 @@ msgstr "Ð?оÑ?ло Ñ?е до виÑ?еÑ?Ñ?Ñ?Ñ?киÑ? пÑ?екоÑ?аÑ?еÑ?а Ñ?е
 #~ "имена (нпÑ?. â??Ð?Ð?Ð?Ð?Ð?\\коÑ?иÑ?ник\").\n"
 #~ "Ð?ли Ñ?Ñ?е можда Ñ?амо погÑ?еÑ?но Ñ?кÑ?Ñ?али лозинкÑ?.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox за %s ниÑ?е на овом Ñ?еÑ?веÑ?Ñ?."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "СеÑ?веÑ? '%s' коÑ?иÑ?Ñ?и Exchange 5.5 и Ñ?Ñ?ога\n"
 #~ "ниÑ?е компаÑ?ибилан Ñ?а Ximian Connector-ом"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +5853,37 @@ msgstr "Ð?оÑ?ло Ñ?е до виÑ?еÑ?Ñ?Ñ?Ñ?киÑ? пÑ?екоÑ?аÑ?еÑ?а Ñ?е
 #~ "Ð?иÑ?е могÑ?Ñ?е пÑ?онаÑ?и Exchange Web Storage System на %s.\n"
 #~ "Уколико OWA Ñ?ади на дÑ?Ñ?гоÑ? пÑ?Ñ?аÑ?и, моÑ?аÑ?е Ñ?е навеÑ?Ñ?и Ñ?\n"
 #~ "подеÑ?аваÑ?Ñ? налога."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "Ð?ема mailbox-а за коÑ?иÑ?ника %s на %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на Ñ?еÑ?веÑ? %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Ð?иÑ?е могÑ?Ñ?е повезиваÑ?е на домаÑ?ина"
+
 #~ msgid "Network error"
 #~ msgstr "Ð?Ñ?еÑ?ка на мÑ?ежи"
+
 #~ msgid "Folder Name"
 #~ msgstr "Ð?ме Ñ?аÑ?Ñ?икле"
+
 #~ msgid "Folder Size"
 #~ msgstr "Ð?елиÑ?ина Ñ?аÑ?Ñ?икле"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise Ñ?еÑ?веÑ? %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: оÑ?казан"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: нема доÑ?Ñ?Ñ?пниÑ? Ñ?воÑ?ниÑ?а за адÑ?еÑ?Ñ? â??%sâ??"
+
 #~ msgid "File As"
 #~ msgstr "Ð?аведи као"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +5892,153 @@ msgstr "Ð?оÑ?ло Ñ?е до виÑ?еÑ?Ñ?Ñ?Ñ?киÑ? пÑ?екоÑ?аÑ?еÑ?а Ñ?е
 #~ "Ð?иÑ?ам могао да пÑ?именим GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "Ð?иÑ?ам могао да пÑ?именим GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "Ð?дÑ?еÑ?аÑ? и календаÑ?"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "Ð?генÑ? за поÑ?Ñ?Ñ?:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "Ð?оÑ?иÑ?Ñ?и безбеднÑ? везÑ? (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "СпиÑ?ак за овеÑ?Ñ?"
+
 #~ msgid "Server rejected username"
 #~ msgstr "СеÑ?веÑ? Ñ?е одбио коÑ?иÑ?ника"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "Ð?еÑ?Ñ?пеÑ?но Ñ?лаÑ?е коÑ?иÑ?ниÑ?ког имена Ñ?еÑ?веÑ?Ñ?"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "СеÑ?веÑ? Ñ?е одбио коÑ?иÑ?ника/лозинкÑ?"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "Ð?иÑ?ам могао да пÑ?еÑ?змем Ñ?пиÑ?ак гÑ?Ñ?па Ñ?а Ñ?еÑ?веÑ?а."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "Ð?е могÑ? да Ñ?Ñ?иÑ?ам даÑ?оÑ?екÑ? Ñ?а Ñ?пиÑ?ком гÑ?Ñ?па за %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Ð?е могÑ? да Ñ?аÑ?Ñ?вам даÑ?оÑ?екÑ? Ñ?а Ñ?пиÑ?ком гÑ?Ñ?па за %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "Ð?аÑ?оÑ?ека адÑ?еÑ?аÑ?а и LDAP подÑ?Ñ?ка за Ð?волÑ?Ñ?иÑ?Ñ?"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? оÑ?екÑ?Ñ?е 1 аÑ?гÑ?менÑ?"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? оÑ?екÑ?Ñ?е 1 аÑ?гÑ?менÑ? да бÑ?де ниÑ?ка"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "позван Ñ?е e_book_add_contact на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "позван Ñ?е e_book_commit_contact на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba изÑ?зеÑ?ак позива Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove на именикÑ? пÑ?е e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "вÑ?еме-Ñ?ада оÑ?екÑ?Ñ?е 0 аÑ?гÑ?менаÑ?а"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "Ñ?неÑ?и-вÑ?еме оÑ?екÑ?Ñ?е да аÑ?гÑ?менÑ? 1 бÑ?де низ"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "додаÑ?-вÑ?еме оÑ?екÑ?Ñ?е 2 аÑ?гÑ?менÑ?а"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "вÑ?еме-поÑ?еÑ?ка-дана оÑ?екÑ?Ñ?е 1 аÑ?гÑ?менÑ?"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "вÑ?еме-поÑ?еÑ?ка-дана оÑ?екÑ?Ñ?е да аÑ?гÑ?менÑ? 1 бÑ?де time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "вÑ?еме-кÑ?аÑ?а-дана оÑ?екÑ?Ñ?е 1 аÑ?гÑ?менÑ?"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "деÑ?и-Ñ?е-Ñ?-пеÑ?иодÑ?? оÑ?екÑ?Ñ?е 2 аÑ?гÑ?менÑ?а"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "деÑ?и-Ñ?е-Ñ?-пеÑ?иодÑ?? оÑ?екÑ?Ñ?е да аÑ?гÑ?менÑ? 1 бÑ?де time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "деÑ?и-Ñ?е-Ñ?-пеÑ?иодÑ?? оÑ?екÑ?Ñ?е да аÑ?гÑ?менÑ? 2 бÑ?де time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "понавÑ?а-Ñ?е? не оÑ?екÑ?Ñ?е аÑ?гÑ?менÑ?е"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "Ñ?е-гоÑ?ов? оÑ?екÑ?Ñ?е 0 аÑ?гÑ?менаÑ?а"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "гоÑ?ов-пÑ?е? оÑ?екÑ?Ñ?е 1 аÑ?гÑ?менÑ?"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "гоÑ?ов-пÑ?е? оÑ?екÑ?Ñ?е да аÑ?гÑ?менÑ? 1 бÑ?де time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1046
-msgid "On This Computer"
-msgstr "Ð?а овом Ñ?аÑ?Ñ?наÑ?Ñ?"
diff --git a/po/sr latin po b/po/sr latin po
index e7189a0..0d4a7b1 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,225 +1,129 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution-data-server package.
-#
 # Maintainer: Danilo Å egan <dsegan gmx net>
 # Reviewed on 2005-08-20 by: Igor NestoroviÄ? <igor prevod org>
-#
+# Miroslav NikoliÄ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: Goran RakiÄ? <grakic devbase net>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-06-07 12:29+0000\n"
+"PO-Revision-Date: 2011-06-03 09:39+0200\n"
+"Last-Translator: Miroslav NikoliÄ? <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: Serbian (sr)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "UÄ?itavanje je u toku..."
+msgstr "UÄ?itavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c: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:4505
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "Pretraživanje je u toku..."
+msgstr "Pretražujem..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4664
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Preuzimanje kontakata (%d)... "
+msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "Osvežavanje preuzetih kontakata (%d)... "
+msgstr "Osvežavam preuzete kontakte (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Nisam povezan"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:763
 msgid "Using Distinguished Name (DN)"
-msgstr "KoriÅ¡Ä?enje istaknutog imena (DN)"
+msgstr "Koristim istaknuto ime (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:766
 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:1032
 msgid "Reconnecting to LDAP server..."
-msgstr "Ponovno povezivanje na LDAP server..."
+msgstr "Ponovo se povezujem na LDAP server..."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1157
+msgid "Invalid DN syntax"
+msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1674
 msgid "Adding contact to LDAP server..."
-msgstr "Dodavanje kontakta na LDAP server..."
+msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1806
 msgid "Removing contact from LDAP server..."
-msgstr "Uklanjanje kontakta sa LDAP servera..."
+msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2242
 msgid "Modifying contact from LDAP server..."
-msgstr "Menjanje kontakta sa LDAP servera..."
+msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4355
 msgid "Receiving LDAP search results..."
-msgstr "Primanje rezultata pretrage sa LDAP servera..."
+msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4527
 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
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: neispravan izvor."
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr "Nije uspelo stvaranje resursa â??%sâ?? sa HTTP stanjem: %d"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/libebook/e-book.c:3000
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: nema dostupne proizvodnje za adresu â??%s'"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: nema izvora za jib â??%sâ?? smeÅ¡tenog u Gkonfu."
 
-#: ../addressbook/libebook/e-book.c:3338
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: nije moguÄ?e pravljenje EBookListener"
+#: ../addressbook/libebook/e-book.c:3298 ../calendar/libecal/e-cal.c:1046
+msgid "On This Computer"
+msgstr "Na ovom raÄ?unaru"
 
-#: ../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:3315 ../calendar/libecal/e-cal.c:1066
+#: ../libedataserver/e-categories.c:62
+msgid "Personal"
+msgstr "LiÄ?no"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: nema izvora za jib â??%sâ?? smeÅ¡tenog u gconf."
+#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libedata-book/e-data-book.c:181
+msgid "Address book does not exist"
+msgstr "Adresar ne postoji"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Jedinstveni IB"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Smesti pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Adresa knjige"
 
@@ -227,810 +131,1009 @@ msgstr "Adresa knjige"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. elektronska adresa"
+msgstr "1° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. elektronska adresa"
+msgstr "2° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. elektronska adresa"
+msgstr "3° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. elektronska adresa"
+msgstr "4° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Oznaka kuÄ?ne adrese"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Oznaka adrese na poslu"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Oznaka druge adrese"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Telefon pomoÄ?nika"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. telefon na poslu"
+msgstr "2° telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Telefon za pozivanje"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Telefon preduzeÄ?a"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "KuÄ?ni telefon"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. kuÄ?ni telefon"
+msgstr "2° kuÄ?ni telefon"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "KuÄ?ni faks"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Organizaciona jedinica"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "PomoÄ?nik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "LiÄ?na stranica"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Adresa veb dnevnika"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:691
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Adresa za slobodno/zauzeto"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Adresa video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ime supružnika"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Napomena"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. kuÄ?no nadenuto ime za AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. nadenuto ime za AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. nadenuto ime za AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1° kuÄ?ni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2° kuÄ?ni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3° kuÄ?ni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. kuÄ?no nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. kuÄ?no nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. kuÄ?no nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1° kuÄ?ni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2° kuÄ?ni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3° kuÄ?ni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. kuÄ?ni Jabber nalog"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. kuÄ?ni Jabber nalog"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. kuÄ?ni Jabber nalog"
+msgid "Jabber Home ID 1"
+msgstr "1° kuÄ?ni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. poslovni Jabber nalog"
+msgid "Jabber Home ID 2"
+msgstr "2° kuÄ?ni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. poslovni Jabber nalog"
+msgid "Jabber Home ID 3"
+msgstr "3° kuÄ?ni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. poslovni Jabber nalog"
+msgid "Jabber Work ID 1"
+msgstr "1° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. kuÄ?no nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. kuÄ?no nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. kuÄ?no nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1° kuÄ?ni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2° kuÄ?ni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3° kuÄ?ni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. kuÄ?no nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. kuÄ?no nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. kuÄ?no nadenuto ime za MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1° kuÄ?ni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2° kuÄ?ni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3° kuÄ?ni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. kuÄ?ni ICQ nalog"
+msgid "MSN Work Screen Name 2"
+msgstr "2° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. kuÄ?ni ICQ nalog"
+msgid "MSN Work Screen Name 3"
+msgstr "3° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. kuÄ?ni ICQ nalog"
+msgid "ICQ Home ID 1"
+msgstr "1° kuÄ?ni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. poslovni ICQ nalog"
+msgid "ICQ Home ID 2"
+msgstr "2° kuÄ?ni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. poslovni ICQ nalog"
+msgid "ICQ Home ID 3"
+msgstr "3° kuÄ?ni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. poslovni ICQ nalog"
+msgid "ICQ Work ID 1"
+msgstr "1° poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2° poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3° poslovni ICKu IB"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Poslednja revizija"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ime ili org."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Razne adrese"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "KuÄ?na adresa"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "Lista kategorija"
+msgstr "Spisak kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Slika"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "Lista elektronskih adresa"
+msgstr "Spisak e-adresa"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "Lista nadenutih imena za AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "Lista GroupWise ib-a"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Lista Jabber naloga"
+msgid "AIM Screen Name List"
+msgstr "Spisak AIM nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Lista nadenutih imena za Yahoo!"
+msgid "GroupWise ID List"
+msgstr "Spisak GroupVajz naloga"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "Lista nadenutih imena za MSN"
+msgid "Jabber ID List"
+msgstr "Spisak Džaber naloga"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "Lista ICQ naloga"
+msgid "Yahoo! Screen Name List"
+msgstr "Spisak Jahu! nadimaka"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "Spisak MSN nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "Spisak ICKu naloga"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Želi HTML poštu"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "Lista"
+msgstr "Spisak"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "Lista prikazanih adresa"
+msgstr "Spisak prikazanih adresa"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "RoÄ?endan"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../libedataserver/e-categories.c:47
 msgid "Anniversary"
 msgstr "Godišnjica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 sertifikat"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu kuÄ?ni Ib 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu kuÄ?ni Ib 2"
+msgid "X.509 Certificate"
+msgstr "X.509 uverenje"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu kuÄ?ni Ib 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1° kuÄ?ni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu poslovni Ib 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2° kuÄ?ni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu poslovni Ib 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3° kuÄ?ni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu poslovni Ib 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1° poslovni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Ib lista"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2° poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3° poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. ime za Skype kod kuÄ?e"
+msgstr "1° kuÄ?no Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. ime za Skype kod kuÄ?e"
+msgstr "2° kuÄ?no Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. ime za Skype kod kuÄ?e"
+msgstr "3° kuÄ?no Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. ime za Skype na poslu"
+msgstr "1° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. ime za Skype na poslu"
+msgstr "2° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. ime za Skype na poslu"
+msgstr "3° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Lista nadenutih imena za Skype"
+msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "Lista bez imena"
-
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "RoÄ?endan"
+msgstr "Neimenovani spisak"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
 #, c-format
-msgid "Birthday: %s"
-msgstr "RoÄ?endan: %s"
+msgid "Empty URI"
+msgstr "Prazna adresa"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:367
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
 #, c-format
-msgid "Anniversary: %s"
-msgstr "Godišnjica: %s"
+msgid "Invalid source"
+msgstr "Neispravan izvor"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "Nije moguÄ?e Ä?uvanje podataka iz kalendara: loÅ¡a adresa."
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Success"
+msgstr "Uspešno"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "Nije moguÄ?e saÄ?uvati podatke kalendara"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "Nije moguÄ?e da napraviti niz za pribavljanje delti"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "Nije moguÄ?e napraviti datoteku za ostavu"
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Repository offline"
+msgstr "Skladište nije na mreži"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "Nije moguÄ?e napraviti niz za popunjavanje ostave"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libecal/e-cal.c:4174 ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
-msgid "Reply Requested: by "
-msgstr "Potreban odgovor: za "
+#: ../addressbook/libedata-book/e-data-book.c:174
+msgid "Contact not found"
+msgstr "Kontakt nije pronaÄ?en"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
-msgid "Reply Requested: When convenient"
-msgstr "Potreban odgovor: kada je zgodno"
+#: ../addressbook/libedata-book/e-data-book.c:175
+msgid "Contact ID already exists"
+msgstr "IB kontakta veÄ? postoji"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "UÄ?itavanje %s predmeta"
+#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Failed"
+msgstr "Neuspela autentifikacija"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "Kalendar"
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Authentication Required"
+msgstr "Potrebna je autentifikacija"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "Neispravna adresa servera"
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "Unsupported field"
+msgstr "Nepodržano polje"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "Neuspela autentifikacija"
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Unsupported authentication method"
+msgstr "Nepodržan naÄ?in autentifikacije"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
-msgid "Redirected to Invalid URI"
-msgstr "Preusmereno na neispravnu adresu"
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "TLS not available"
+msgstr "TLS nije dostupan"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
-msgid "Bad file format."
-msgstr "Loš oblik datoteke."
+#: ../addressbook/libedata-book/e-data-book.c:182
+msgid "Book removed"
+msgstr "Knjiga je uklonjena"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
-msgid "Not a calendar."
-msgstr "Nije kalendar."
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Not available in offline mode"
+msgstr "Nije dostupno u režimu van mreže"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
-msgid "Could not retrieve weather data"
-msgstr "Nije moguÄ?e dobijanje podataka o vremenu"
+#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search size limit exceeded"
+msgstr "PremaÅ¡ena veliÄ?ina pretrage"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
-msgid "Weather: Fog"
-msgstr "Vreme: magla"
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search time limit exceeded"
+msgstr "Isteklo vreme za pretragu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblaÄ?no"
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid query"
+msgstr "Neispravan upit"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy Night"
-msgstr "Vreme: oblaÄ?na noÄ?"
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Query refused"
+msgstr "Upit je odbijen"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-msgid "Weather: Overcast"
-msgstr "Vreme: mestimiÄ?no oblaÄ?no"
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Could not cancel"
+msgstr "Ne mogu da otkažem"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-msgid "Weather: Showers"
-msgstr "Vreme: pljusak"
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid server version"
+msgstr "Neispravna verzija servera"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-msgid "Weather: Snow"
-msgstr "Vreme: sneg"
+#: ../addressbook/libedata-book/e-data-book.c:191
+msgid "No space"
+msgstr "Nema prostora"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Vreme: sunÄ?ano"
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libecal/e-cal.c:4158 ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid argument"
+msgstr "Neispravan argument"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Clear Night"
-msgstr "Vreme: vedra noÄ?"
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libecal/e-cal.c:4196 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Nije podržan"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Thunderstorms"
-msgstr "Vreme: grmljavine"
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Druga greška"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
-msgid "Forecast"
-msgstr "Prognoza"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:322
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ne mogu da otvorim knjigu: %s"
 
-#: ../calendar/libecal/e-cal-component.c:1322
-msgid "Untitled appointment"
-msgstr "Neimenovani zakazani sastanak"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:344
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ne mogu da uklonim knjigu: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
-msgid "1st"
-msgstr "1."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:361
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ne mogu da dobijem kontakt: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
-msgid "2nd"
-msgstr "2."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:395
+#, c-format
+msgid "Empty query: %s"
+msgstr "Prazan upit: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
-msgid "3rd"
-msgstr "3."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ne mogu da dobijem spisak kontakta: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
-msgid "4th"
-msgstr "4."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ne mogu da potvrdim identitet korisnika: %s "
 
-#: ../calendar/libecal/e-cal-recur.c:4045
-msgid "5th"
-msgstr "5."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:463
+#: ../addressbook/libedata-book/e-data-book.c:482
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ne mogu da dodam kontakt: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
-msgid "6th"
-msgstr "6."
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:500
+#: ../addressbook/libedata-book/e-data-book.c:519
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ne mogu da izmenim kontakt: %s"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:558
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ne mogu da uklonim kontakte: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ne mogu da dobijem podržana polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ne mogu da dobijem obavezna polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ne mogu da dobijem podržane naÄ?ine potvrÄ?ivanja identiteta: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:662
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Neispravan upit: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:698
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ne mogu da dobijem izmene: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:738
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Nije uspela operacija otkazivanja: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "VraÄ?en je neoÄ?ekivani kod â??%dâ?? HTTP stanja"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendar ne podržava Slobodno / Zauzeto"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../libedataserver/e-categories.c:48
+msgid "Birthday"
+msgstr "RoÄ?endan"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#, c-format
+msgid "Birthday: %s"
+msgstr "RoÄ?endan: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#, c-format
+msgid "Anniversary: %s"
+msgstr "Godišnjica: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "Ne mogu da saÄ?uvam podatak iz kalendara: loÅ¡a adresa."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
+msgid "Cannot save calendar data"
+msgstr "Ne mogu da saÄ?uvam podatke kalendara"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+msgid "Reply Requested: by "
+msgstr "Potreban je odgovor: za "
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+msgid "Reply Requested: When convenient"
+msgstr "Potreban je odgovor: kada je zgodno"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#, c-format
+msgid "Loading %s items"
+msgstr "UÄ?itavam â??%sâ?? stavke"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+msgid "Invalid server URI"
+msgstr "Neispravna adresa servera"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:782
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ne mogu da napravim datoteku za ostavu"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+msgid "Could not create thread for populating cache"
+msgstr "Ne mogu da napravim niz za popunjavanje ostave"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
+msgid "Redirected to Invalid URI"
+msgstr "Preusmereno na neispravnu adresu"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:455
+msgid "Bad file format."
+msgstr "Loš oblik datoteke."
+
+#: ../calendar/backends/http/e-cal-backend-http.c:462
+msgid "Not a calendar."
+msgstr "Nije kalendar."
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
+msgid "Could not retrieve weather data"
+msgstr "Ne mogu da dobijem podatke o vremenu"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+msgid "Weather: Fog"
+msgstr "Vreme: magla"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+msgid "Weather: Cloudy Night"
+msgstr "Vreme: oblaÄ?na noÄ?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "Vreme: oblaÄ?no"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+msgid "Weather: Overcast"
+msgstr "Vreme: mestimiÄ?no oblaÄ?no"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Showers"
+msgstr "Vreme: pljusak"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+msgid "Weather: Snow"
+msgstr "Vreme: sneg"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+msgid "Weather: Clear Night"
+msgstr "Vreme: vedra noÄ?"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "Vreme: sunÄ?ano"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+msgid "Weather: Thunderstorms"
+msgstr "Vreme: grmljavine"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+msgid "Forecast"
+msgstr "Prognoza"
+
+#: ../calendar/libecal/e-cal-component.c:1306
+msgid "Untitled appointment"
+msgstr "Neimenovani zakazani sastanak"
+
+#: ../calendar/libecal/e-cal-recur.c:3979
+msgid "1st"
+msgstr "1°"
+
+#: ../calendar/libecal/e-cal-recur.c:3980
+msgid "2nd"
+msgstr "2°"
+
+#: ../calendar/libecal/e-cal-recur.c:3981
+msgid "3rd"
+msgstr "3°"
+
+#: ../calendar/libecal/e-cal-recur.c:3982
+msgid "4th"
+msgstr "4°"
+
+#: ../calendar/libecal/e-cal-recur.c:3983
+msgid "5th"
+msgstr "5°"
+
+#: ../calendar/libecal/e-cal-recur.c:3984
+msgid "6th"
+msgstr "6°"
+
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
-msgstr "7."
+msgstr "7°"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
-msgstr "8."
+msgstr "8°"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
-msgstr "9."
+msgstr "9°"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
-msgstr "10."
+msgstr "10°"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
-msgstr "11."
+msgstr "11°"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
-msgstr "12."
+msgstr "12°"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
-msgstr "13."
+msgstr "13°"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
-msgstr "14."
+msgstr "14°"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
-msgstr "15."
+msgstr "15°"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
-msgstr "16."
+msgstr "16°"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
-msgstr "17."
+msgstr "17°"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
-msgstr "18."
+msgstr "18°"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
-msgstr "19."
+msgstr "19°"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
-msgstr "20."
+msgstr "20°"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
-msgstr "21."
+msgstr "21°"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
-msgstr "22."
+msgstr "22°"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
-msgstr "23."
+msgstr "23°"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
-msgstr "24."
+msgstr "24°"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
-msgstr "25."
+msgstr "25°"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
-msgstr "26."
+msgstr "26°"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
-msgstr "27."
+msgstr "27°"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
-msgstr "28."
+msgstr "28°"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
-msgstr "29."
+msgstr "29°"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
-msgstr "30."
+msgstr "30°"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
-msgstr "31."
+msgstr "31°"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Nisko"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Nedefinisano"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1291 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
@@ -1039,427 +1142,576 @@ 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:1305
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Unesite lozinku za %s kako bi mrežni posrednik bio omoguÄ?en za %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Neispravan argument"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4160
 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:4162
 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:4164
 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:4166 ../calendar/libedata-cal/e-data-cal.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:4168 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4170
 msgid "URI not loaded"
 msgstr "Adresa nije uÄ?itana"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4172
 msgid "URI already loaded"
 msgstr "Adresa je veÄ? uÄ?itana"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4176 ../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:4178 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "IB objekta veÄ? postoji"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4180
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4182
 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:4184
 msgid "Could not cancel operation"
-msgstr "Nije moguÄ?e otkazati operaciju"
+msgstr "Ne mogu da otkažem operaciju"
+
+#: ../calendar/libecal/e-cal.c:4186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "PotvrÄ?ivanje identiteta nije uspelo"
 
-#: ../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:4188
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
-msgstr "Obavezna autentifikacija"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "Došlo je do CORBA izuzetka"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
+msgstr "Potrebno je potvrÄ?ivanje identiteta"
+
+#: ../calendar/libecal/e-cal.c:4190
+msgid "A D-Bus exception has occurred"
+msgstr "Došlo je do D-bas izuzetka"
+
+#: ../calendar/libecal/e-cal.c:4192
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
+#: ../camel/providers/smtp/camel-smtp-transport.c:535
+#: ../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:4194
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "â??%sâ?? ne oÄ?ekuje argumente"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "â??%sâ?? oÄ?ekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "â??%sâ?? oÄ?ekuje da prvi argument bude niska"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "â??%sâ?? oÄ?ekuje da prvi argument bude niska ISO 8601 datuma/vremena"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "â??%sâ?? oÄ?ekuje dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "â??%sâ?? oÄ?ekuje da prvi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "â??%sâ?? oÄ?ekuje da drugi argument bude ceo broj"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "â??%sâ?? oÄ?ekuje da drugi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "â??%sâ?? oÄ?ekuje da drugi argument bude niska"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "â??%sâ?? oÄ?ekuje da prvi argument bude â??anyâ??, â??summaryâ??, â??descriptionâ??, â??locationâ??, â??attendeeâ??, â??organizerâ??, ili â??classificationâ??"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"â??%sâ?? oÄ?ekuje da prvi argument bude â??anyâ??, â??summaryâ??, â??descriptionâ??, "
+"â??locationâ??, â??attendeeâ??, â??organizerâ??, ili â??classificationâ??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "â??%sâ?? oÄ?ekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "â??%sâ?? oÄ?ekuje da svi argumenti budu niske ili jedan i samo jedan argument da bude logiÄ?ki netaÄ?an (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"â??%sâ?? oÄ?ekuje da svi argumenti budu niske ili jedan i samo jedan argument da "
+"bude logiÄ?ki netaÄ?an (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Nepodržano polje"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported method"
 msgstr "Nepodržan metod"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Nempodržan metod autentifikacije"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Calendar does not exist"
+msgstr "Kalendar ne postoji"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS nije dostupan"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unknown user"
+msgstr "Nepoznat korisnik"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Rad van mreže nije dostupan"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ne mogu da preuzmem adresu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "PremaÅ¡ena veliÄ?ina pretrage"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:628
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ne mogu da preuzmem adresu e-pošte alarma kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Isteklo vreme za pretragu"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:648
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ne mogu da preuzmem LDAP osobinu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Neispravan upit"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ne mogu da preuzmem informacije zakazivanja kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Upit odbijen"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:687
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "Ne mogu da otvorim kalendar: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Neispravna verzija servera"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "Ne mogu da osvežim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:727
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "Ne mogu da uklonim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:748
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "Ne mogu da napravim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:772
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "Ne mogu da izmenim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:798
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "Ne mogu da uklonim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ne mogu da primim objekte kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:838
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ne mogu da odbacim alarm kalendara: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "Ne mogu da pošaljem objekte kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:884
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ne mogu da preuzmem osnovnu putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:904
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ne mogu da preuzmem putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:924
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ne mogu da preuzmem spisak objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:952
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ne mogu da preuzmem spisak priloga: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:978
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "Ne mogu da dovršim upit kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:998
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ne mogu da preuzmem vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "Ne mogu da dodam vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1037
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ne mogu da podesim osnovnu vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1060
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ne mogu da preuzmem izmene kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1091
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#, c-format
+msgid "Invalid URI"
+msgstr "Neispravna adresa"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:389
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Nema pogona pozadinca za â??%sâ?? od â??%sâ??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:439
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Ne mogu da pokrenem pozadinca"
+
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava proveru"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "Proveravanje poruke"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava šifrovanje"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "Å ifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava dešifrovanje"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "Dešifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Možda neÄ?ete moÄ?i da uvezete kljuÄ?eve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Možda neÄ?ete moÄ?i da izvezete kljuÄ?eve sa ovim algoritmom"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
-msgstr "Nije moguÄ?e napraviti putanju za privremeno Ä?uvanje"
+msgstr "Ne mogu da napraviti putanju za privremeno Ä?uvanje"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:499
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nije moguÄ?e ukloniti unos iz ostave: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "Nema dostupnog toka"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Nije moguÄ?e upisati unos u log: %s\n"
+"Ne mogu da zapišem unos dnevnika: %s\n"
 "Dalje operacije na ovom serveru neÄ?e biti izvrÅ¡ene kada\n"
 "se budete ponovo povezali na mrežu."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Nije moguÄ?e otvoriti â??%sâ??:\n"
+"Ne mogu da otvorim â??%sâ??:\n"
 "%s\n"
 "Promene na ovoj fascikli neÄ?e biti usklaÄ?ene."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
-msgstr "Ponovno usklaÄ?ivanje sa serverom"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Umnoži sadržaj fascikle lokalno za rad van mreže"
+msgstr "VrÅ¡im ponovno usklaÄ?ivanje sa serverom"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
-msgstr "Preuzimanje novih poruka u za rad van mreže"
+msgstr "Preuzimam nove poruke za rad van mreže"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:392
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Pripremanje fascikle â??%sâ?? za rad van mreže"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "Pripremam fasciklu â??%sâ?? za rad van mreže"
+
+#: ../camel/camel-disco-folder.c:458 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "Umnoži sadržaj fascikle lokalno za rad van mreže"
+
+#: ../camel/camel-disco-store.c:398
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-folder.c:164
+#: ../camel/providers/imapx/camel-imapx-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-folder.c:224
+#: ../camel/providers/imapx/camel-imapx-folder.c:282
+#: ../camel/providers/imapx/camel-imapx-folder.c:325
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:388
+#: ../camel/providers/imapx/camel-imapx-store.c:193
+#: ../camel/providers/imapx/camel-imapx-store.c:720
+#: ../camel/providers/imapx/camel-imapx-store.c:783
+#: ../camel/providers/imapx/camel-imapx-store.c:842
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Morate da budete na mreži da bi završili ovu operaciju"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Nema dostupnog opisa"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
+#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4757
+#: ../camel/providers/imapx/camel-imapx-server.c:4774
+#: ../camel/providers/imapx/camel-imapx-store.c:241
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:626
+#: ../camel/providers/pop3/camel-pop3-folder.c:691
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Neuspelo pravljenje sadržanog procesa â??%sâ??: %s"
+msgstr "Nisam uspeo da napravim sadržani proces â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Neispravan niz poruka primljen od %s: %s"
+msgstr "Neispravan niz poruka primljen od â??%sâ??: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
-msgstr "UsklaÄ?ivanje fascikli"
+msgstr "UsklaÄ?ujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "GreÅ¡ka pri Ä?itanju filtera: %s: %s"
+msgstr "GreÅ¡ka prilikom Ä?itanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Greška u primeni filtera: %s: %s"
+msgstr "Greška prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Nije moguÄ?e otvaranje fascikle pripreme"
+msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Nije moguÄ?a obrada fascikle pripreme"
+msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Primanje poruke %d (%d%%)"
+msgstr "Primam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
-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:1275 ../camel/camel-filter-driver.c:1297
 #, 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:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
-msgstr "UsklaÄ?ivanje fascikle"
+msgstr "UsklaÄ?ujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "Završeno"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Primanje poruke %d od %d"
+msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "Neuspelo dovlaÄ?enje poruke"
+msgstr "Nisam uspeo da dovuÄ?em poruku"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1719,406 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "Neipsravni argumenti za (korisniÄ?ka-oznaka)"
+msgstr "Neispravni argumenti za (korisniÄ?ka-oznaka)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Nije moguÄ?e Ä?itanje izraza za pretragu: %s:\n"
+"Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Greška pri izvršavanju izraza za pretragu: %s:\n"
+"Greška prilikom izvršavanja izraza pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, 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:938
 #, 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:944 ../camel/camel-folder-search.c:951
 #, 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:978
 #, 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:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: prikljuÄ?enje poruke: za %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "UÄ?im novu spam poruku u â??%sâ??"
+msgstr[1] "UÄ?im nove spam poruke u â??%sâ??"
+msgstr[2] "UÄ?im nove spam poruke u â??%sâ??"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:147
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Nepodržana operacija: prebrojavanje po izrazu: za %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "UÄ?im novu ham poruku u %s"
+msgstr[1] "UÄ?im nove ham poruke u %s"
+msgstr[2] "UÄ?im nove ham poruke u %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Nepodržana operacija: pretraga po JIB: za %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtriram novu poruku u â??%sâ??"
+msgstr[1] "Filtriram nove poruke u â??%sâ??"
+msgstr[2] "Filtriram nove poruke u â??%sâ??"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
-msgstr "Premeštanje poruka"
+msgstr "Premeštam poruke"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
-msgstr "Umnožavanje poruka"
-
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "UÄ?enje Å¡ta je Ä?ubre"
+msgstr "Umnožavam poruke"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "UÄ?enje Å¡ta nije Ä?ubre"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Nisam uspeo da izvršim gpg: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "Filtriranje poruke(a)"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Javio se neoÄ?ekivan status GnuPG poruke:\n"
+"DoÅ¡lo je do neoÄ?ekivane poruke GnuPG stanja:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Neuspelo Ä?itanje gpg userid podsetnika."
+msgstr "Nisam uspeo da analiziram podsetnik gpg ib korisnika."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Neuspelo Ä?itanje zahteva za gpg lozinkom."
+msgstr "Nisam uspeo da analiziram zahtev za gpg lozinkom."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"Potreban Vam je PIN za otkljuÄ?avanje kljuÄ?a za\n"
-"SmartCard: â??%sâ??"
+"Potreban vam je PIN da otkljuÄ?ate kljuÄ?\n"
+"Pametne kartice: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Potrebna Vam je lozinka za otkljuÄ?avanje kljuÄ?a\n"
+"Potrebna vam je lozinka da otkljuÄ?ate kljuÄ?\n"
 "korisnika: â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "NeoÄ?ekivan zahtev od GnuPG-a za â??%sâ??"
+msgstr "NeoÄ?ekivan zahtev GnuPG-a za â??%sâ??"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "Odustato."
-
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Neuspelo otkljuÄ?avanje tajnog kljuÄ?a: unete su 3 pogreÅ¡ne lozinke."
+msgstr "Nisam uspeo da otkljuÄ?am tajni kljuÄ?: unete su 3 pogreÅ¡ne lozinke."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "NeoÄ?ekivan odgovor od GnuPG-a: %s"
+msgstr "NeoÄ?ekivan odgovor GnuPG-a: %s"
 
-#: ../camel/camel-gpg-context.c:947
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Neuspelo Å¡ifrovanje: nisu oznaÄ?eni ispravni primaoci."
-
-#. 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:1048
 #, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Neuspelo izvršavanje gpg: %s"
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nisam uspeo da Å¡ifrujem: nisu oznaÄ?eni ispravni primaoci."
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Nije moguÄ?e napraviti podatke za potpisivanje: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Ne mogu da napravim podatke za potpisivanje:"
 
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
-msgstr "Neuspelo izvršavanje gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "Ovo je deo poruke sa digitalnim potpisom"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Nije moguÄ?a provera potpisa poruke: neispravan oblik poruke"
+msgstr "Nisam uspeo da izvršim gpg."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Nije moguÄ?a provera potpisa poruke: nije moguÄ?e napraviti privremenu datoteku: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Nije moguÄ?e napraviti podatke za Å¡ifrovanje: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Ne mogu da proverim potpis poruke:"
+
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Ne mogu da napravim podatke za Å¡ifrovanje:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1866
 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:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Nije moguÄ?e deÅ¡ifrovati poruku: neispravan oblik poruke"
+msgstr "Ne mogu da dešifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Nije moguÄ?e deÅ¡ifrovati MIME deo: greÅ¡ka u protokolu"
+msgstr "Nisam uspeo da dešifrujem MIME deo: greška u protokolu"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "Nije moguÄ?e proÄ?itati sadržaj poruke"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Nije moguÄ?e napraviti vezu ka pomoÄ?niku zakljuÄ?avanja: %s"
+msgstr "Ne mogu da napravim vezu ka pomoÄ?niku zakljuÄ?avanja: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Nije moguÄ?e podeliti pomoÄ?nika zakljuÄ?avanja: %s"
+msgstr "Ne mogu da podelim pomoÄ?nika zakljuÄ?avanja: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nije moguÄ?e zakljuÄ?ati â??%sâ??: greÅ¡ka u protokolu sa pomoÄ?nikom zakljuÄ?avanja"
+msgstr "Ne mogu da zakljuÄ?am â??%sâ??: greÅ¡ka u protokolu sa pomoÄ?nikom zakljuÄ?avanja"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Nije moguÄ?e zakljuÄ?ati â??%sâ??"
+msgstr "Ne mogu da zakljuÄ?am â??%sâ??"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Nije moguÄ?e napraviti zakljuÄ?anu datoteku za %s: %s"
+msgstr "Ne mogu da napravim zakljuÄ?anu datoteku za â??%sâ??: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Isteklo vreme pri pokuÅ¡aju pribavljanja zakljuÄ?ane datoteke na %s. PokuÅ¡ajte kasnije."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Isteklo je vreme prilikom pokuÅ¡aja da pribavim zakljuÄ?anu datoteku na â??%sâ??. "
+"Pokušajte kasnije."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Neuspelo zakljuÄ?avanje koriÅ¡Ä?enjem fcntl(2): %s"
+msgstr "Nisam uspeo da zakljuÄ?am koristeÄ?i â??fcntl(2)â??: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Neuspelo zakljuÄ?avanje koriÅ¡Ä?enjem flock(2): %s"
+msgstr "Nisam uspeo da zakljuÄ?am koristeÄ?i â??flock(2)â??: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Nije moguÄ?a provera datoteke poÅ¡te %s: %s"
+msgstr "Ne mogu da proverim datoteku poÅ¡te â??%sâ??: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nije moguÄ?e otvoriti datoteku poÅ¡te %s: %s"
+msgstr "Ne mogu da otvorim datoteku poÅ¡te â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Nije moguÄ?e otvoriti privremenu datoteku poÅ¡te %s: %s"
+msgstr "Ne mogu da otvorim privremenu datoteku poÅ¡te â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Neuspelo smeštanje pošte u privremenu datoteku %s: %s"
+msgstr "Nisam uspeo da smestim poÅ¡tu u privremenu datoteku â??%sâ??: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Nije moguÄ?e napraviti vezu: %s"
+msgstr "Ne mogu da napravim vezu: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Nije moguÄ?e podeliti: %s"
+msgstr "Ne mogu da podelim: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeštanje pošte je otkazao: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Nepoznata greška)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke poÅ¡te: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Greška pri pisanju privremene datoteke pošte: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Greška pri umnožavanju privremene datoteke: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "greÅ¡ka Ä?itanja"
-
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Odustato"
-
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "nije moguÄ?e pravljenje niza"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "Nema dostupnog sadržaja"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-multipart-signed.c:293
 #, c-format
-msgid "Resolving: %s"
-msgstr "Nalaženje: %s"
+msgid "No signature available"
+msgstr "Nema dostupnog potpisa"
 
-#: ../camel/camel-net-utils.c:693
-msgid "Host lookup failed"
-msgstr "Neuspelo traženje domaÄ?ina"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "greÅ¡ka Ä?itanja"
 
 #: ../camel/camel-net-utils.c:695
 #, c-format
+msgid "Resolving: %s"
+msgstr "Nalazim: %s"
+
+#: ../camel/camel-net-utils.c:717
+msgid "Host lookup failed"
+msgstr "Nije uspelo traženje domaÄ?ina"
+
+#: ../camel/camel-net-utils.c:721
+#, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Neuspelo traženje domaÄ?ina: %s: %s"
+msgstr "Nije uspelo traženje domaÄ?ina: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:844
 msgid "Resolving address"
-msgstr "Nalaženje adrese"
+msgstr "Nalazim adresu"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:864
 msgid "Name lookup failed"
-msgstr "Traženje imena neuspelo"
+msgstr "Nije uspelo traženje imena"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "Traženje imena neuspelo: %s"
+msgstr "Nije uspelo traženje imena: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "UsklaÄ?ivanje poruka u fascikli â??%sâ?? sa diskom"
+msgstr "UsklaÄ?ujem poruke iz fascikle â??%sâ?? na disk"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Nije moguÄ? unos u dnevnik za fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da zapiÅ¡em van mrežni unos u dnevnik za fasciklu â??%sâ??: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "PonuÄ?aÄ? elektronske poÅ¡te sa virtuelnom fasciklom"
+msgstr "DostavljaÄ? virtuelne fascikle e-poÅ¡te"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za Ä?itanje poÅ¡te kao upita drugog skupa fascikli"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Nije moguÄ?e uÄ?itati %s: ovaj sistem ne podržava uÄ?itavanje modula."
+msgstr "Ne mogu da uÄ?itam â??%sâ??: ovaj sistem ne podržava uÄ?itavanje modula."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Nije moguÄ?e uÄ?itati %s: %s"
+msgstr "Ne mogu da uÄ?itam â??%sâ??: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Nije moguÄ?e uÄ?itati %s: nema koda za pokretanje u modulu."
+msgstr "Ne mogu da uÄ?itam â??%sâ??: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Nema dostupnog ponuÄ?aÄ?a za protokol â??%sâ??"
+msgstr "Nema dostupnog dostavljaÄ?a za protokol â??%sâ??"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem anonimne prijave."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
-msgstr "Neuspela autentifikacija."
+msgstr "PotvrÄ?ivanje identiteta nije uspelo."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neispravan podatak o poreklu elektronske adrese:\n"
+"Neispravan podatak o poreklu adrese e-pošte:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2127,7 @@ msgstr ""
 "Neispravan podatak o složenom poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2136,522 @@ msgstr ""
 "Neispravan podatak o poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem sigurnosne CRAM-MD5 lozinke, ako je server podržava."
+#: ../camel/camel-sasl-cram-md5.c:47
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem sigurnosne CRAM-MD5 lozinke, ako "
+"je server podržava."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem sigurnosne DIGEST-MD5 lozinke, ako je server podržava."
+#: ../camel/camel-sasl-digest-md5.c:60
+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:820
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "Upit na server suviše dug (>2048 okteta)"
+msgstr "Upit servera je suviše dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:831
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "Upit na server neispravan\n"
+msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:839
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Upit na server je sadržao neispravan â??Kvalitet zaÅ¡titeâ?? unos"
+msgstr "Upit servera je sadržao neispravan unos â??Kvalitet zaÅ¡titeâ??"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Odgovor servera nije sadržao podatke o autorizaciji"
+msgstr "Odgovor servera nije sadržao podatke o ovlaÅ¡Ä?enju"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Odgovor servera je sadržao nekompletne podatke o autorizaciji"
+msgstr "Odgovor servera je sadržao nekompletne podatke o ovlaÅ¡Ä?enju"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaže"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:90
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:92
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem Kerberos 5 prijave."
+msgstr ""
+"Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem Kerberos 5 potvrÄ?ivanja "
+"identiteta."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Izabrani mehanizam ponuÄ?eni metod ne podržava, ili ga primenjen metod nije prepoznao."
+#: ../camel/camel-sasl-gssapi.c:133
+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:138
 msgid "The provided target_name parameter was ill-formed."
-msgstr "PonuÄ?eni parametar target_name nije pravilno oblikovan."
+msgstr "PonuÄ?eni parametar ciljnog imena (target_name) nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "PonuÄ?eni parametar target_name je sadržao neispravan ili nepodržan tip imena."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"PonuÄ?eni parametar ciljnog imena (target_name) je sadržao neispravan ili "
+"nepodržan tip imena."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token sadrži razliÄ?ita vezivanja za kanale od onih odreÄ?enih preko parametra input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:145
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"Upit unosa (input_token) sadrži razliÄ?ita vezivanja kanala od onih odreÄ?enih "
+"preko parametra vezice lanca unosa (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token sadrži neispravnu strukturu, ili potpis nije mogao biti proveren."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Upit unosa (input_token) sadrži neispravnu strukturu, ili potpis nije mogao "
+"biti proveren."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Pružena uveravanja nisu bila ispravna za otpoÄ?injanje procesa, ili je nosaÄ? uverenja doÅ¡ao bez njih."
+#: ../camel/camel-sasl-gssapi.c:154
+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:159
 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:162
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Neuspele provere celovitosti na input_token."
+msgstr "Nisu uspele provere celovitosti na upitu unosa (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The consistency checks performed on the credential failed."
-msgstr "Neuspele provere celovitosti na uverenjima."
+msgstr "Nisu uspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:168
 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:174 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1183
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "Loš odgovor na autentifikaciju od servera."
+msgstr "LoÅ¡ odgovor potvrÄ?ivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Nepodržan sigurnosni sloj."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem Kerberos 4 prijave."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Nije moguÄ?e dobiti Kerberos kartu:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 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:94
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Nepoznato stanje autentifikacije."
+msgstr "Nepoznato stanje potvrÄ?ivanja identiteta."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Ova opcija Ä?e povezati na Windows server koriÅ¡Ä?enjem NTLM / Sigurnosne provere lozinke."
+#: ../camel/camel-sasl-ntlm.c:43
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ova opcija Ä?e povezati na Vindouz server koriÅ¡Ä?enjem NTML / Sigurnosne "
+"provere lozinke."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "OBIÄ?NO"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP pre SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ova opcija Ä?e odobriti POP vezu a zatim pokuÅ¡ati SMTP"
+msgstr "Ova opcija Ä?e odobriti POP vezu pre pokuÅ¡aja SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP izvorna adresa"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP pre SMTP auth koriÅ¡Ä?enjem nepoznatog transporta"
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "POP pre SMTP provere koriÅ¡Ä?enjem nepoznatog transporta"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP pre SMTP auth koriÅ¡Ä?enjem izvora koji nije pop"
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "POP pre SMTP provere koriÅ¡Ä?enjem ne-POP izvora"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Neuspelo prevoÄ?enje regularnog izraza: %s: %s"
+msgstr "Nije uspelo prevoÄ?enje regularnog izraza: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:90
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "Adresa â??%sâ?? traži deo sa korisniÄ?kim imenom"
+msgstr "Adresa â??%sâ?? traži deo sa korisniÄ?kim imenom"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:94
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "Adresa â??%sâ?? traži deo sa imenom domaÄ?ina"
+msgstr "Adresa â??%sâ?? traži deo sa imenom domaÄ?ina"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:98
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "Adresa â??%sâ?? traži deo sa putanjom"
+msgstr "Adresa â??%sâ?? traži deo sa putanjom"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Nije moguÄ?e napraviti direktorijum %s:\n"
+"Ne mogu da napravim direktorijum â??%sâ??:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Unesite %s lozinku za %s na domaÄ?inu %s."
+msgstr "Unesite â??%sâ?? lozinku za â??%sâ?? na domaÄ?inu â??%sâ??."
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel sesija ne podržava prosleÄ?ivanje poruke."
-
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Nije moguÄ?e nalaženje sertifikata za â??%sâ??"
+msgstr "Ne mogu da naÄ?em uverenje za â??%sâ??"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
-msgstr "Nije moguÄ?e napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
-msgstr "Nije moguÄ?e potpisivanje CMS podataka"
+msgstr "Ne mogu da napravim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
-msgstr "Nije moguÄ?e priložiti potpisane CMS podatke"
+msgstr "Ne mogu da priložim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
-msgstr "Nije moguÄ?e priložiti CMS podatke"
+msgstr "Ne mogu da priložim CMS podatke"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
-msgstr "Nije moguÄ?e pravljenje podataka o CMS potpisniku"
+msgstr "Ne mogu da napravim podatak CMS potpisnika"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
-msgstr "Nije moguÄ?e nalaženje lanca sertifikata"
+msgstr "Ne mogu da naÄ?em lanac uverenja"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
-msgstr "Nije moguÄ?e dodavanje vremena CMS potpisa"
+msgstr "Ne mogu da dodam vreme CMS potpisa"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "Sertifikat za Å¡ifrovanje â??%sâ?? ne postoji"
+msgstr "Uverenje Å¡ifrovanja â??%sâ?? ne postoji"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguÄ?e dodavanje atributa SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut SMIME postavki kljuÄ?a Å¡ifrovanja"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguÄ?e dodavanje atributa MS SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut MS SMIME postavki kljuÄ?a Å¡ifrovanja"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
-msgstr "Nije moguÄ?e dodavanje sertifikata za Å¡ifrovanje"
+msgstr "Ne mogu da dodam uverenje Å¡ifrovanja"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
-msgstr "Nije moguÄ?e dodavanje podatka o CMS potpisniku"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Nije moguÄ?e napraviti kontekst za Å¡ifrovanje."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "Neuspelo dodavanje podataka u CMS enkoder"
-
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Neuspelo kodiranje podataka"
+msgstr "Ne mogu da dodam podatak CMS potpisnika"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
-msgstr "Neprovereno"
+msgstr "Neproveren"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Loš potpis"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
 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:514
 msgid "Signing certificate not found"
-msgstr "Sertifikat potpisa nije naÄ?en"
+msgstr "Uverenje potpisa nije naÄ?eno"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
-msgstr "Sertifikat potpisa nije poverljiv"
+msgstr "Uverenje potpisa nije poverljivo"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Algoritam potpisa je nepoznat"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
-msgstr "Algoritam potpisa je nepodržan"
+msgstr "Algoritam potpisa nije podržan"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Neispravan potpis"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Greška pri obradi"
 
 # hm, hm...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "Nema potpisanog podatka u potpisu"
+msgstr "Nema naznaÄ?enog podatka u potpisu"
 
 # hm, može to i bolje od â??okruženihâ??...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Nedostaju zbirke iz okruženih podataka"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "Nije moguÄ?e izraÄ?unati zbirke"
+msgstr "Ne mogu da izraÄ?unam zbirke"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "Nije moguÄ?e postaviti zbirke poruka"
+msgstr "Ne mogu da postavim zbirke poruka"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "Neuspeo uvoz sertifikata"
+msgstr "Nije uspeo uvoz uverenja"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Poruka ima samo sertifikat, nije moguÄ?a provera sertifikata"
+msgstr "Uverenje je jedina poruka, ne mogu da proverim uverenje"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Poruka ima samo sertifikat, sertifikati uvezeni i provereni"
+msgstr "Uverenje je jedina poruka, uverenja su uvežena i proverena"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "Nije moguÄ?e naÄ?i zbirke potpisa"
+msgstr "Ne mogu da naÄ?em zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "Ne mogu da napravim kontekst Å¡ifrovanja."
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "Nisam uspeo da dodam podatak u CMS Å¡ifrer"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "Nisam uspeo da Å¡ifrujem podatke"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
-msgstr "Neuspelo dekodiranje"
+msgstr "Nisam uspeo da dešifrujem"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Nije moguÄ?e naÄ?i opÅ¡ti algoritam za Å¡ifrovanje gomile"
+msgstr "Ne mogu da naÄ?em opÅ¡ti algoritam za Å¡ifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Nije moguÄ?e dodeliti mesto kljuÄ?u za Å¡ifrovanje gomile"
+msgstr "Ne mogu da dodelim mesto kljuÄ?u za Å¡ifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
-msgstr "Nije moguÄ?e napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
-msgstr "Nije moguÄ?e pravljenje CMS Enveloped data"
+msgstr "Ne mogu da napravim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Nije moguÄ?e prilaganje CMS Enveloped data"
+msgstr "Ne mogu da priložim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
-msgstr "Nije moguÄ?e prilaganje objekta sa CMS podacima"
+msgstr "Ne mogu da priložim objekat CMS podataka"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
-msgstr "Nije moguÄ?e pravljenje CMS podatka o primaocu"
+msgstr "Ne mogu da napravim podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
-msgstr "Nije moguÄ?e dodati podatak o CMS primaocu"
+msgstr "Ne mogu da dodam podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
-msgstr "Neuspelo dodavanje podataka u enkoder"
+msgstr "Nisam uspeo da dodam podatke u Å¡ifrer"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME deÅ¡ifrovanje: nisu naÄ?eni Å¡ifrovani podaci"
 
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "uvoz kljuÄ?eva: neizvedeno"
-
-#: ../camel/camel-smime-context.c:1207
-msgid "export keys: unimplemented"
-msgstr "izvoz kljuÄ?eva: neizvedeno"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Nije moguÄ?e dobiti fasciklu: neispravna operacija"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: fascikla postoji"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Nije moguÄ?e napraviti fasciklu: neispravna operacija"
+msgstr "Ne mogu da napravim fasciklu â??%sâ??: fascikla postoji"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "Nije moguÄ?e napraviti fasciklu: %s: fascikla postoji"
+msgstr "Ne mogu da da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Nije moguÄ?e obrisati fasciklu: %s: neispravna operacija"
+msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nije moguÄ?e preimenovati fasciklu: %s: neispravna operacija"
+msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:1129 ../camel/camel-store.c:1139
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "SmeÄ?e"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1132 ../camel/camel-store.c:1143
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Ä?ubre"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Nije moguÄ?e dobijanje sertifikata izdavaÄ?a"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Nije moguÄ?e dobiti listu povuÄ?enih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Nije moguÄ?e deÅ¡ifrovanje potpisa sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Nije moguÄ?e deÅ¡ifrovanje potpisa za listu povuÄ?enih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Nije moguÄ?e deÅ¡ifrovati javni kljuÄ? izdavaÄ?a"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Neuspeo potpis sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Neuspeo potpis za listu povuÄ?enih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Sertifikat joÅ¡ nije važeÄ?i"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Sertifikat je istekao"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL joÅ¡ nije važeÄ?i"
-
-#: ../camel/camel-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-raw.c:816
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "DomaÄ?in posrednik ne podržava SOCKS5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Nije moguÄ?e lokalno dobiti izdavaÄ?ev sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:822
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ne mogu da pronaÄ?em odgovarajuÄ?i tip potvrÄ?ivanja identiteta: kod 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Nije moguÄ?e dobiti potpis lista"
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "General SOCKS server failure"
+msgstr "Neuspeh opšteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Lanac sertifikata je predugaÄ?ak"
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "PovuÄ?en sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:836
+msgid "Network is unreachable from SOCKS server"
+msgstr "Mreža je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neispravan izdavaÄ? sertifikata (CA)"
+#: ../camel/camel-tcp-stream-raw.c:837
+msgid "Host is unreachable from SOCKS server"
+msgstr "DomaÄ?in je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Premašena dužina putanje"
+#: ../camel/camel-tcp-stream-raw.c:838
+msgid "Connection refused"
+msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Neispravna svrha"
+#: ../camel/camel-tcp-stream-raw.c:839
+msgid "Time-to-live expired"
+msgstr "Vreme života je isteklo"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Nepoverljiv sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:840
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS server ne podržava naredbu"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Odbijen sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:841
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS server ne podržava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Naslov/izdavaÄ? neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:842
+msgid "Unknown error from SOCKS server"
+msgstr "Nepoznata greška sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:872
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/izdavaÄ? serijsko neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:889
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Upotreba kljuÄ?a ne podržava potpis sertifikatom"
+#: ../camel/camel-tcp-stream-raw.c:904
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ime domaÄ?ina je predugo (najviÅ¡e 255 znakova)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Greška pri proveri programa"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:936 ../camel/camel-tcp-stream-raw.c:946
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2664,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:463
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:463
 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:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,413 +2682,362 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Provera SSL sertifikata za %s:\n"
+"Provera SSL uverenja za â??%sâ??:\n"
 "\n"
 "%s\n"
 "\n"
 "Želite li da prihvatite?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"Problem sa sertifikatom: %s\n"
+"Problem sa uverenjem: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Loš domen sertifikata: %s\n"
+"Loš domen uverenja: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekao sertifikat: %s\n"
+"Isteklo uverenje: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekla lista povuÄ?enih sertifikata: %s\n"
+"Istekao je spisak povuÄ?enih uverenja: %s\n"
 "IzdavaÄ?: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "Nije moguÄ?e proÄ?itati adresu â??%sâ??"
+msgstr "Ne mogu da analiziram adresu â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1068
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "GreÅ¡ka pri smeÅ¡tanju â??%sâ??: %s"
+msgid "Error storing '%s': "
+msgstr "GreÅ¡ka pri smeÅ¡tanju â??%sâ??: "
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1142
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Nema takve poruke %s u %s"
+msgstr "Nema takve poruke â??%sâ?? u â??%sâ??"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:1158 ../camel/camel-vee-folder.c:1173
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Nije moguÄ?e umnožiti ili premestiti poruke u virtuelnu fasciklu"
+msgstr "Ne mogu da umnožim ili premestim poruke u virtuelnu fasciklu"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Nepoklopljeno"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:223
 #, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Nije moguÄ?e obrisati fasciklu: %s: nema takve fascikle"
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:289
 #, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Nije moguÄ?e promeniti ime fascikli: %s: nema takve fascikle"
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Nije moguÄ?e umnožiti poruke u fasciklu za smeÄ?e"
+msgstr "Ne mogu da umnožim poruke u fasciklu za smeÄ?e"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Nije moguÄ?e umnožiti poruke u fasciklu za Ä?ubre"
+msgstr "Ne mogu da umnožim poruke u fasciklu za Ä?ubre"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"Nije moguÄ?e dobiti poruku: %s\n"
+"Ne mogu da dobavim 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:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 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/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Korisnik odustao"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:715
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nije moguÄ?e dobiti poruku %s: %s"
+msgid "Cannot get message %s: "
+msgstr "Ne mogu da nabavim poruku â??%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:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#, c-format
 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:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
+#, c-format
 msgid "Could not get message"
-msgstr "Nije moguÄ?e dobijanje poruke"
+msgstr "Ne mogu da dobavim poruku"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
+#: ../camel/providers/imap/camel-imap-folder.c:381
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "Nije moguÄ?e uÄ?itavanje pregleda za %s"
+msgstr "Ne mogu da uÄ?itam pregled za â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "Fascikla za smeÄ?e je puna. Ispraznite je."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "VrÅ¡im proveru za izbrisanim porukama â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3860
+#: ../camel/providers/imap/camel-imap-folder.c:3938
+#: ../camel/providers/imapx/camel-imapx-server.c:3796
+#: ../camel/providers/imapx/camel-imapx-server.c:3924
 #, c-format
 msgid "Fetching summary information for new messages in %s"
-msgstr "Prikupljanje pregleda podataka za nove poruke u %s"
+msgstr "Prikupljam pregled podataka novih poruka 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:2502
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da dodam poruku u fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
-msgstr "Nije moguÄ?e pravljenje poruke: %s"
+msgstr "Ne mogu da napravim poruku: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "Nije moguÄ?e dobiti sadržaj fascikle %s"
+msgstr "Ne mogu da nabavim sadržaj fascikle â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Nije moguÄ?e dodati poruku u režimu van mreže: nedostupna ostava"
+msgstr "Ne mogu da priložim poruku u režimu van mreže: nedostupna ostava"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Nije moguÄ?e dodavati poruku u režimu van mreže: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Ne mogu da priložim poruku u režimu van mreže: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "Proveravanje za novom poštom"
+msgstr "Vršim proveru za novom poštom"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "Pro_veri za nove poruke u svim fasciklama"
+msgstr "P_otraži nove poruke u svim fasciklama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Primeni filtere na nove poruke u SanduÄ?etu na ovom serveru"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Proveri da nema Ä?_ubreta meÄ?u novim porukama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Proveri da nema Ä?ubreta samo u fascikli SAN_DUÄ?E"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Automatski u_skladi nalog lokalno"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP podešavanja"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Port SOAP posrednika za poštu:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Novel GroupVajz"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "Za pristupanje Novell Groupwise serverima"
+msgstr "Za pristup Novel GroupVajz serverima"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ova opcija Ä?e povezati na GroupWise server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"Ova opcija Ä?e povezati na GroupVajz server koriÅ¡Ä?enjem lozinke u obiÄ?nom "
+"tekstu."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
-msgstr "DomaÄ?in ili korisnik u adresi nisu dostupni"
+msgstr "DomaÄ?in ili korisnik nisu dostupni u adresi"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:3035
+#, c-format
 msgid "You did not enter a password."
 msgstr "Niste uneli lozinku."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Neke opcije možda neÄ?e ispravno raditi na trenutnoj verziji servera"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:421
 #, c-format
 msgid "No such folder %s"
-msgstr "Nema takve fascikle %s"
+msgstr "Nema takve fascikle â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Nije moguÄ?e pravljenje GroupWise fascikli u režimu van mreže."
+msgstr "Ne mogu da napravim GroupVajz fascikle u režimu van mreže."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ne mogu da napravim posebnu fasciklu sistema"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:884
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Glavna fascikla ne može sadržati fascikle u sebi"
+msgstr "Glavna fascikla ne može da sadrži druge fascikle"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Nije moguÄ?e preimenovati GroupWise fasciklu â??%sâ?? u â??%sâ??"
+msgstr "Ne mogu da preimenujem GroupVajz fasciklu â??%sâ?? u â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise server %s"
+msgstr "GroupVajz server â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise servis za %s na %s"
+msgstr "GroupVajz servis za â??%sâ?? na â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise dostava pošte preko %s"
+msgstr "GroupVajz dostava poÅ¡te preko â??%sâ??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
-msgstr "Slanje poruke"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Dostigli ste smeÅ¡tajno ograniÄ?enje za ovaj nalog. VaÅ¡e poruke biÄ?e odlagane u odlaznoj poÅ¡ti. PoÅ¡aljite ih ponovo pritiskom na PoÅ¡alji/Primi dugme nakon Å¡to uklonite ili arhivirate vaÅ¡u poÅ¡tu.\n"
+msgstr "Å aljem poruku"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Nije moguÄ?e slanje poruke: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Proveravanje za novom poštom"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Koristi prilagoÄ?enu komandu za povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Komanda:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "Prik_aži samo prijavljene fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "P_remosti oblik imena fascikle koje daje server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Oblik imena"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ne mogu da dobavim fasciklu: neispravna operacija"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Za pristupanje Hula serverima"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"PremaÅ¡ili ste smeÅ¡tajno ograniÄ?enje za ovaj nalog. VaÅ¡e poruke biÄ?e odlagane "
+"u odlaznoj poÅ¡ti. PoÅ¡aljite ih ponovo pritiskom na dugme â??PoÅ¡alji/Primiâ?? nakon "
+"što uklonite ili arhivirate vašu poštu.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ova moguÄ?nost obezbeÄ?uje povezvanje na Hula server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Ne mogu da pošaljem poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "Bez izlaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "Bez ulaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
-msgstr "Operacija otkazana"
+msgstr "Operacija je otkazana"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, 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:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2967,1083 +3046,849 @@ msgstr ""
 "Upozorenje od IMAP servera %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "NeoÄ?ekivan odgovor od IMAP servera: %s"
+msgstr "NeoÄ?ekivan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "Neuspela IMAP komanda: %s"
+msgstr "Neuspela IMAP naredba: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Odgovor servera je prerano završen."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Odgovor IMAP servera nije sadržao %s podatak"
+msgstr "Odgovor IMAP servera nije sadržao â??%sâ?? podatak"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "NeoÄ?ekivan U redu odgovor od IMAP servera: %s"
+msgstr "NeoÄ?ekivan potvrdan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:286
 msgid "Always check for new mail in this folder"
-msgstr "Uvek proveri za nove poruke u ovoj fascikli"
+msgstr "Uvek proveri nove poruke u ovoj fascikli"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:358
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Nije moguÄ?e napraviti direktorijum %s: %s"
+msgstr "Ne mogu da napravim direktorijum â??%sâ??: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:965
+#: ../camel/providers/imapx/camel-imapx-server.c:3838
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Pretraga za izmenjenim porukama u %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "NeoÄ?ekivani status odgovora â??%sâ??â?? nakon naredbe APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr "Nema odziva nakon naredbe APPEND"
+msgstr "Pregledam izmenjene poruke u â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Nepoznata greška se javila tokom naredbe APPEND!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Nije moguÄ?e dovlaÄ?enje poruke: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3277
+msgid "Unable to retrieve message: "
+msgstr "Ne mogu da dovuÄ?em poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3312
+#: ../camel/providers/imapx/camel-imapx-server.c:5065
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Nije moguÄ?e dobiti poruku sa IB %s: %s"
+msgstr "Ne mogu da nabavim poruku sa IB â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3313
+#: ../camel/providers/imapx/camel-imapx-server.c:5066
 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:3387
+#: ../camel/providers/imap/camel-imap-folder.c:4257
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4067
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Nepotpun odgovor servera: podaci nisu dati za poruku %d"
+msgstr "Nepotpun odgovor servera: nisu dati podaci za poruku â??%dâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4077
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Nepotpun odgovor servera: JIB nije dat za poruku %d"
+msgstr "Nepotpun odgovor servera: JIB nije dat za poruku â??%dâ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4297
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "Nije moguÄ?e pronaÄ?i telo poruke u FETCH odgovoru."
+msgstr "Ne mogu da pronaÄ?em telo poruke u DOVUCI odgovoru."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nije moguÄ?e otvoriti direktorijum ostave: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Ne mogu da otvorim direktorijum ostave: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Neuspelo privremeno Ä?uvanje poruke %s: %s"
+msgstr "Nisam uspeo privremeno da saÄ?uvam poruku â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Neuspelo privremeno Ä?uvanje %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Nisam uspeo privremeno da saÄ?uvam poruku â??%sâ??: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Nisam uspeo privremeno da saÄ?uvam â??%sâ??: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Vršim proveru za novom poštom"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Oblik imena:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Povezivanje na server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Koristi prilagoÄ?enu komandu za povezivanje na server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Naredba:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "Prik_aži samo prijavljene fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "P_remosti oblik imena fascikle koje daje server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Oblik _imena:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Pri_meni filtere na nove poruke u SANDUÄ?ETU ovog servera"
+msgstr "Pri_meni filtere na nove poruke u SANDUÄ?ETU na ovom serveru"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
-msgstr "Proveri da nema Ä?u_breta meÄ?u novim porukama"
+msgstr "Proveri da nema _nepoželjnog sadržaja meÄ?u novim porukama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatski uskladi ud_aljenu poštu sa lokalnom"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za Ä?itanje i smeÅ¡tanje poÅ¡te na IMAP servere."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ova opcija Ä?e povezati na IMAP server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
+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:310
+#: ../camel/providers/imapx/camel-imapx-store.c:228
 #, c-format
 msgid "IMAP server %s"
-msgstr "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:312
+#: ../camel/providers/imapx/camel-imapx-store.c:230
 #, 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
+msgstr "IMAP servis za â??%sâ?? na â??%sâ??"
+
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Nije moguÄ?e povezivanje na %s: %s"
+msgstr "Ne mogu da se povežem na â??%sâ??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL nije dostupan"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Povezivanje otkazano"
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ne mogu da se povežem na â??%sâ??: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2884
+#: ../camel/providers/imapx/camel-imapx-server.c:2922
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Neuspelo povezivanje na IMAP server %s u sigurnosnom modu: %s"
+msgstr "Nisam uspeo da se povežem na IMAP server â??%sâ?? u bezbednom režimu: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2885
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podržano"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2923
 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:600
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 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:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2719
+#, c-format
+msgid "Connection cancelled"
+msgstr "Povezivanje je otkazano"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2724
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Nije moguÄ?e povezivanje komandom â??%sâ??: %s"
+msgstr "Ne mogu da se povežem sa naredbom â??%sâ??: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:468
+#: ../camel/providers/imapx/camel-imapx-store.c:1065
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:567
+#: ../camel/providers/local/camel-maildir-store.c:580
+#: ../camel/providers/local/camel-spool-store.c:508
 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:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2991
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP server %s ne podržava traženi tip prijave %s"
+msgstr "IMAP server â??%sâ?? ne podržava traženi tip prijavljivanja identiteta â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Nema podrške za tip prijave %s"
+msgstr "Nema podrÅ¡ke za tip potvrÄ?ivanja identiteta â??%sâ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3074
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nije moguÄ?a autentifikacija na IMAP server.\n"
+"Ne mogu da potvrdim identitet na IMAP server.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ime fascikle â??%sâ?? nije ispravno jer sadrži znak â??%câ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1887
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
-msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: fascikla postoji."
+msgstr "Ne mogu da napravim fasciklu â??%sâ??: fascikla postoji."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:874
 #, 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:3062
 #, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "Veza sa serverom je neoÄ?ekivano iskljuÄ?ena"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "NeoÄ?ekivan odgovor od IMAP4 servera %s: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3065
+msgid "Server unexpectedly disconnected: "
+msgstr "Veza sa serverom je neoÄ?ekivano iskljuÄ?ena: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "NeoÄ?ekivan pozdrav od IMAP servera: %s."
+msgid "Could not create folder summary for %s"
+msgstr "Ne mogu da napravim sažetak fascikle za â??%sâ??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Nije moguÄ?e izabrati fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
+msgid "Could not create cache for %s: "
+msgstr "Ne mogu da napravim ostavu za â??%sâ??: "
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Nije moguÄ?e izabrati fasciklu â??%sâ??: loÅ¡a naredba"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Koristi _Brzo ponovno usaglašavanje ako ga server podržava"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Koristi _Umiren ako ga server podržava"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "servis nije dostupan"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Naredba:"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP4 serverom %s je neoÄ?ekivano prekinuta: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Broj veza iz _ostave za koriÅ¡Ä?enje"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "OmoguÄ?avanje otkrivanja dopisne liste je potrebno nekim filterima i pravilima za vFascikle"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Oblik imena:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Isticanje zapamÄ?enih poruka koje nisu proÄ?itane za X sekundi"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "Isticanje zapamÄ?enih porukastarijih od X sekundi"
+#: ../camel/providers/imapx/camel-imapx-server.c:1396
+msgid "Error writing to cache stream: "
+msgstr "Greška prilikom upisa u tok ostave:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imapx/camel-imapx-server.c:2054
 #, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Nije moguÄ?e pristupiti fascikli â??%sâ??: %s"
+msgid "Not authenticated"
+msgstr "NepotvrÄ?enog identiteta"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imapx/camel-imapx-server.c:2810
 #, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Nije moguÄ?e uskladiti oznake za fasciklu â??%sâ??: nepoznata greÅ¡ka"
+msgid "Could not connect to %s (port %s): "
+msgstr "Ne mogu da se povežem na â??%sâ?? (port %s): "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Nije moguÄ?e uskladiti oznake za fasciklu â??%sâ??: loÅ¡a naredba"
+#: ../camel/providers/imapx/camel-imapx-server.c:3251
+msgid "Closing tmp stream failed: "
+msgstr "Zatvaranje privremenog toka nije uspelo:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Nije moguÄ?e isprazniti fasciklu â??%sâ??: nepoznata greÅ¡ka"
+#: ../camel/providers/imapx/camel-imapx-server.c:5188
+#: ../camel/providers/imapx/camel-imapx-server.c:5203
+msgid "Cannot create spool file: "
+msgstr "Ne mogu da napravim datoteku pripreme: "
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#: ../camel/providers/imapx/camel-imapx-store.c:437
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Nije moguÄ?e isprazniti fasciklu â??%sâ??: loÅ¡a naredba"
+msgid "No such folder: %s"
+msgstr "Nema takve fascikle: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#: ../camel/providers/imapx/camel-imapx-stream.c:68
 #, 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"
+msgid "Source stream returned no data"
+msgstr "Odgovor izvornog toka je bez podataka"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#: ../camel/providers/imapx/camel-imapx-stream.c:77
 #, 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"
+msgid "Source stream unavailable"
+msgstr "Tok izvora je nedostupan"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#: ../camel/providers/local/camel-local-folder.c:199
 #, 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"
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: nepoznata greÅ¡ka"
+msgid "mailbox: %s (%s)"
+msgstr "poÅ¡tansko sanduÄ?e:%s (%s)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: loÅ¡a naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguÄ?e premestiti poruku iz fascikle â??%sâ?? u fasciklu â??%sâ??: nepoznata greÅ¡ka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguÄ?e umnožiti poruke iz fascikle â??%sâ?? u fasciklu â??%sâ??: nepoznata greÅ¡ka"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguÄ?e premestiti poruke iz fascikle â??%sâ?? u fasciklu â??%sâ??: loÅ¡a naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguÄ?e umnožiti poruku iz fascikle â??%sâ?? u fasciklu â??%sâ??: loÅ¡a naredba"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Proveri da nema _Ä?ubreta meÄ?u novim porukama"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Proveri da nema Ä?ubreta samo u fascikli SANDUÄ?E"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Za Ä?itanje i smeÅ¡tanje poÅ¡te na IMAPv4rev1 servere."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ova opcija Ä?e povezati na IMAPv4rev1 server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Povezivanje otkazano"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Neuspelo povezivanje na IMAP server %s u bezbednosnom režimu: server ne podržava STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS pregovori nisu uspeli"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Nije moguÄ?a prijava na IMAP server %s pomoÄ?u mehanizma prijave %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nije moguÄ?a prijava na IMAP server %s pomoÄ?u %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Nije moguÄ?e pravljenje IMAP fascikli u režimu van mreže."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ?? sa IMAP servera %s: nepoznata greÅ¡ka"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, 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
-msgid "Bad command"
-msgstr "Loša komanda"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, 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
-#, 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
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: specijalna fascikla"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Nije moguÄ?e brisanje IMAP fascikli u režimu van mreže."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, 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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-#, 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
-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
-#, 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
-#, 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
-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
-#, 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
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Nije moguÄ?a odjava sa fascikle â??%sâ??: loÅ¡a naredba"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Pretraga za izmenjenim porukama"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, 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
-msgid "Fetching envelopes of new messages"
-msgstr "Pribavljanje omota za nove poruke"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "NeoÄ?ekivani element u odgovoru IMAP servera %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "Nema podataka"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neoÄ?ekivano prekinuta: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Ostava za poruke"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Eksperimentalni IMAP 4(.1) klijent\n"
-"Ovo je neproveren i nepodržan kod, bolje koristite obiÄ?an imap.\n"
-"\n"
-" !!! NE KORISTITE OVO ZA VAŽNU POŠTU  !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, 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"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:272
 msgid "Index message body data"
 msgstr "Popiši sadržaje poruka"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
-#, 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
-#, c-format
-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:677
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ne mogu da dobavim poruku â??%sâ?? iz fascikle â??%sâ??\n"
+"%s"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Koristite pregled fascikle â??.foldersâ?? (exmh)"
+msgstr "_Koristi pregled fascikle â??.foldersâ?? (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-oblikovani direktorijumi pošte"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za smeštanje lokalne pošte u direktorijume pošte nalik MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Lokalna dostava"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Za dovlaÄ?enje (premeÅ¡tanje) lokalne poÅ¡te iz mbox oblika u fascikle kojim upravlja Evolucija."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Za dovlaÄ?enje (premeÅ¡tanje) lokalne poÅ¡te iz standardne mboks formatirane "
+"pripreme u fascikle kojima upravlja Evolucija."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Primeni filtere na nove poruke u SANDUÄ?ETU"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Direktorijumi pošte u Maildir obliku"
+msgstr "Direktorijumi pošte u Mejldir obliku"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "Za smeštanje lokalne pošte u maildir direktorijume."
+msgstr "Za smeštanje lokalne pošte u mejldir direktorijume."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_Smesti zaglavlja o statusu u formatu Elm/Pine/Mutt"
+msgstr "_Smesti zaglavlja stanja u Elm/Pine/Mut formatu"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "Standardna Unix mbox spool datoteka"
+msgstr "Standardna Uniks mboks datoteka pripreme"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za Ä?itanje i smeÅ¡tanje lokalne poÅ¡te u spoljne standardne mbox spool datoteke.\n"
-"TakoÄ?e se može koristiti za Ä?itanje stabla fascikli u Elm, Pine, ili Mutt stilu."
+"Za Ä?itanje i smeÅ¡tanje lokalne poÅ¡te u spoljne standardne mboks datoteke "
+"pripreme.\n"
+"TakoÄ?e se može koristiti za Ä?itanje stabla fascikli u Elm, Pine ili Mut stilu."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "Standardni Unix mbox spool direktorijum"
+msgstr "Standardni Uniks mboks direktorijum pripreme"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:305
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Ostava root %s nije apsolutna putanja"
+msgstr "Administratorska ostava â??%sâ?? nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:179
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Ostava root %s nije regularan direktorijum"
+msgstr "Administratorska ostava â??%sâ?? nije regularan direktorijum"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:190
+#: ../camel/providers/local/camel-local-store.c:200
+#: ../camel/providers/local/camel-local-store.c:318
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Nije moguÄ?e dobiti fasciklu: %s: %s"
+msgstr "Ne mogu da dobavim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:214
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduÄ?e"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:271
 #, c-format
 msgid "Local mail file %s"
-msgstr "Lokalna datoteka pošte %s"
+msgstr "Lokalna datoteka poÅ¡te â??%sâ??"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Nije moguÄ?e preimenovati fasciklu %s u %s: %s"
+msgstr "Ne mogu da preimenujem fasciklu â??%sâ?? u â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:452
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Nije moguÄ?e preimenovati â??%sâ??: %s"
+msgstr "Ne mogu da preimenujem â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "Nije moguÄ?e obrisati indeks datoteku fascikle â??%sâ??: %s"
+msgstr "Ne mogu da obriÅ¡em indeksnu datoteku fascikle â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:510
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "Nije moguÄ?e obrisati meta datoteku fascikle â??%sâ??: %s"
+msgstr "Ne mogu da obriÅ¡em meta datoteku fascikle â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Nije moguÄ?e dodati poruku pregledu: nepoznat razlog"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Prododata maildir poruka poništena"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nije moguÄ?e dodati poruku u maildir fasciklu: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "Ne mogu da dodam poruku pregledu: nepoznat razlog"
+
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nije moguÄ?e dobiti poruku: %s iz fascikle %s\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Ne mogu da dodam poruku u fasciklu direktorijuma pošte: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Neispravan sadržaj poruke"
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Ne mogu da dobavim poruku â??%sâ?? iz fascikle â??%sâ??: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da napravim fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Nije moguÄ?e preuzeti fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da preuzmem fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Nije moguÄ?e preuzeti fasciklu â??%sâ??: fascikla ne postoji."
+msgstr "Ne mogu da preuzmem fasciklu â??%sâ??: fascikla ne postoji."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ??: nije maildir direktorijum."
+msgstr "Ne mogu da preuzmem fasciklu â??%sâ??: nije direktorijum poÅ¡te."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da obriÅ¡em fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
-msgstr "nije maildir direktorijum"
+msgstr "nije direktorijum pošte"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:487
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Nije moguÄ?e pretražiti fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da pretražim fasciklu â??%sâ??: %s"
 
 #: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:562
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Nije moguÄ?e otvaranje putanje maildir direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju direktorijuma pošte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:553
 msgid "Checking folder consistency"
-msgstr "Proveravanje celovitosti fascikle"
+msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:645
 msgid "Checking for new messages"
-msgstr "Proveravanje za nove poruke"
+msgstr "Vršim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:736
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
-msgstr "Smeštanje fascikle"
+msgstr "Smeštam fasciklu"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "Nije moguÄ?e zakljuÄ?ati fasciklu %s: %s"
+msgstr "Ne mogu da zakljuÄ?am fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nije moguÄ?e otvoriti poÅ¡tansko sanduÄ?e: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ne mogu da otvorim poÅ¡tansko sanduÄ?e: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "Dodavanje pošte otkazano"
-
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nije moguÄ?e dodavanje poruke u mbox datoteku: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ne mogu da dodam poruku u mboks datoteku: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:433
 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
-msgid "Message construction failed."
-msgstr "Sastavljanje poruke neuspelo."
+msgstr "Fascikla izgleda da je nepopravljivo oÅ¡teÄ?ena."
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Nije moguÄ?e napraviti fasciklu ovog imena."
+msgstr "Ne mogu da napravim fasciklu ovog imena."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ??: nije obiÄ?na datoteka."
+msgstr "Ne mogu da dobavim fasciklu â??%sâ??: nije obiÄ?na datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄ?e obrisati fasciklu â??%sâ??:\n"
+"Ne mogu da obriÅ¡em fasciklu â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, 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:250
 #, 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:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Nije moguÄ?e obrisati pregled fascikle â??%sâ??: %s"
+msgstr "Ne mogu da obriÅ¡em pregled fascikle â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
-msgstr "Nije moguÄ?e napraviti direktorijum â??%sâ??: %s."
+msgstr "Ne mogu da napravim direktorijum â??%sâ??: %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Nije moguÄ?e napraviti fasciklu: %s: %s"
+msgstr "Ne mogu da napravim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "Fascikla veÄ? postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 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:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "Nije moguÄ?e preimenovati â??%sâ??: â??%sâ??: %s"
+msgstr "Ne mogu da preimenujem â??%sâ??: â??%sâ??: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Nije moguÄ?e preimenovati â??%sâ?? u %s: %s"
+msgstr "Ne mogu da preimenujem â??%sâ?? u â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Nije moguÄ?e otvoriti fasciklu: %s: %s"
+msgstr "Ne mogu da otvorim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Kobna greÅ¡ka pri Ä?itanju poÅ¡te na mestu %ld u fascikli %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Kobna greÅ¡ka pri Ä?itanju poÅ¡te na mestu %s u fascikli â??%sâ??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Nije moguÄ?e proveriti fasciklu: %s: %s"
+msgstr "Ne mogu da proverim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Nije moguÄ?e otvoriti datoteku: %s: %s"
+msgstr "Ne mogu da otvorim datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Nije moguÄ?e otvaranje privremenog poÅ¡tanskog sanduÄ?eta: %s"
+msgstr "Ne mogu da otvorim privremeno poÅ¡tansko sanduÄ?e: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Nije moguÄ?e zatvaranje izvorne fascikle %s: %s"
+msgstr "Ne mogu da zatvorim izvornu fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "Nije moguÄ?e zatvaranje privremene fascikle: %s"
+msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Nije moguÄ?e preimenovati fasciklu: %s"
+msgstr "Ne mogu da preimenujem fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Nije moguÄ?e Ä?uvanje fascikle: %s"
+msgstr "Ne mogu da saÄ?uvam fasciklu: %s"
+
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOKS datoteka je oÅ¡teÄ?ena, popravite je. (OÄ?ekivano je IZ reda, ali nisam "
+"dobio.)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje pregleda i fascikle, Ä?ak i nakon usklaÄ?ivanja"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, 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:1211
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "Neuspelo pisanje u privremeno poÅ¡tansko sanduÄ?e: %s"
+msgstr "Nisam uspeo da zapiÅ¡em u privremeno poÅ¡tansko sanduÄ?e: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "Neuspelo pisanje u privremeno poÅ¡tansko sanduÄ?e: %s: %s"
-
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH dodavanje poruke otkazano"
+msgstr "Nisam uspeo da zapiÅ¡em u privremeno poÅ¡tansko sanduÄ?e: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nije moguÄ?e dodati poruku u mh fasciklu: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Ne mogu da dodam poruku u mh fasciklu: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: %s"
+msgstr "Ne mogu da napravim fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Nije moguÄ?e dobiti fasciklu â??%sâ??: nije direktorijum."
+msgstr "Ne mogu da dobavim fasciklu â??%sâ??: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Nije moguÄ?e otvoriti putanju MH direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju MH direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Priprema â??%sâ?? ne može se otvoriti: %s"
+msgstr "Ne mogu da otvorim pripremu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:132
 #, 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:158
 #, 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:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄ?e otvoriti fasciklu â??%sâ??:\n"
+"Ne mogu da otvorim fasciklu â??%sâ??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:176
 #, 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:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguÄ?e napraviti fasciklu â??%sâ??:\n"
+"Ne mogu da napravim fasciklu â??%sâ??:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:193
@@ -4051,110 +3896,133 @@ msgstr ""
 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:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ostava ne podržava SANDUÄ?E"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
-msgstr "Pripremna datoteka pošte %s"
+msgstr "Pripremna datoteka poÅ¡te â??%sâ??"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "Stablo fascikli za pripremu %s"
+msgstr "Stablo fascikle za pripremu â??%sâ??"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 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:251
+#, c-format
 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:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Nije moguÄ?e uskladiti privremenu fasciklu %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Ne mogu da uskladim privremenu fasciklu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Nije moguÄ?e uskladiti fasciklu za pripremu %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Ne mogu da uskladim fasciklu za pripremu â??%sâ??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Nije moguÄ?e uskladiti fasciklu za pripremu %s: %s\n"
+"Ne mogu da uskladim fasciklu za pripremu â??%sâ??: %s\n"
 "Fascikla je možda oÅ¡teÄ?ena, umnožite saÄ?uvano u â??%sâ??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Unutrašnja greška: JIB u neispravnom obliku: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ne mogu da dobavim poruku â??%sâ??: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, 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:513
+msgid "Posting failed: "
+msgstr "Neuspela pošiljka: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Ne možete poslati NNTP poruke ako niste povezani!"
+msgstr "Ne možete da pošaljete NNTP poruke ako niste povezani!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Ne možete umnožiti poruke iz NNTP fascikle!"
+msgstr "Ne možete da umnožite poruke iz NNTP fascikle!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Prikaži fascikle u kratkom zapisu (npr. c.o.linux umesto comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_Prikaži fascikle u kratkom zapisu (npr. â??c.o.linuxâ?? umesto â??comp.os.linuxâ??)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "U p_rozorÄ?etu za prijavu, prikaži relativna imena fascikli"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET vesti"
+msgstr "JUZNET vesti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Ovo je ponuÄ?aÄ? za Ä?itanje i slanje na USENET grupe vesti."
+msgstr "Ovo je dostavljaÄ? za Ä?itanje i slanje na JUZNET grupe vesti."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Ova opcija Ä?e prijaviti na NNTP server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Ova opcija Ä?e prijaviti na NNTP server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Nije moguÄ?e Ä?itanje pozdrava od %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Ne mogu da proÄ?itam pozdrav sa â??%sâ??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
+msgstr "NNTP server â??%sâ?? je vratio kod greÅ¡ke â??%dâ??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET vesti preko %s"
+msgstr "JUZNET vesti preko â??%sâ??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4033,650 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"Ne možete se prijaviti na ovu grupu vesti:\n"
+"Ne možete da se prijavite na ovu grupu vesti:\n"
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadreÄ?ena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"Ne možete se odjaviti sa ove grupe vesti:\n"
+"Ne možete da se odjavite sa ove grupe vesti:\n"
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Ne možete napraviti fasciklu u ostavi vesti: prijavite se umesto toga."
+msgstr ""
+"Ne možete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "Ne možete preimenovati fasciklu u ostavi vesti."
+msgstr "Ne možete da preimenujete fasciklu u ostavi vesti."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Ne možete ukloniti fasciklu u ostavi vesti: odjavite se umesto toga."
+msgstr ""
+"Ne možete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
-msgstr "Potrebna autentifikacija ali korisniÄ?ko ime nije uneto"
+msgstr "Potrebno je potvrÄ?ivanje identiteta ali korisniÄ?ko ime nije uneto"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "Nije moguÄ?a autentifikacija na server: %s"
+msgstr "Ne mogu da potvrdim identitet na serveru: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda neuspela: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+msgid "NNTP Command failed: "
+msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "Nepovezano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve fascikle: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: pretraživanje novih poruka"
+msgstr "%s: pretražujem nove poruke"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "NeoÄ?ekivan odgovor xover-a: %s"
+msgstr "NeoÄ?ekivan odgovor ksovera: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "NeoÄ?ekivan odgovor head-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "Koristite odustani"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
-msgstr "Preuzimanje POP pregleda"
+msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Nije moguÄ?e dobiti POP pregled: %s"
+msgstr "Ne mogu da dobavim POP pregled: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
-msgstr "Izbacivanje starih poruka"
+msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
-msgstr "Izbacivanje obrisanih poruka"
+msgstr "Izbacujem obrisane poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
+#: ../camel/providers/pop3/camel-pop3-folder.c:597
 #, c-format
 msgid "No message with UID %s"
-msgstr "Nema poruka sa JIB %s"
+msgstr "Nema poruke sa JIB %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:604
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "DovlaÄ?enje POP poruke %d"
+msgstr "DovlaÄ?im POP poruku %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:708
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "Ostava za poruke"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Ostavi poruke na serveru"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, 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:45
 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:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Za povezivanje i preuzimanje pošte sa POP servera."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Ova opcija Ä?e povezati na POP server koriÅ¡Ä?enjem lozinke u obiÄ?nom tekstu. Ovo je jedina opcija koju podržavaju mnogi POP serveri."
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
+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:82
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Ova opcija Ä?e povezati na POP server koriÅ¡Ä?enjem lozinke preko APOP "
+"protokola. Ovo možda neÄ?e raditi svim korisnicima Ä?ak i na serverima koji "
+"tvrde da to podržavaju."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Ova opcija Ä?e povezati na POP server koriÅ¡Ä?enjem lozinke preko APOP protokola. Ovo možda neÄ?e raditi svim korisnicima Ä?ak i na serverima koji tvrde da to podržavaju."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Neuspelo Ä?itanje ispravnog pozdrava POP servera %s"
+msgstr "Neuspelo Ä?itanje ispravnog pozdrava POP servera â??%sâ??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nije moguÄ?e povezivanje na POP server %s u sigurnosnom režimu %s"
+msgstr "Nisam uspeo da se povežem na POP server â??%sâ?? u bezbednom režimu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 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:205
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Nisam uspeo da se povežem na POP server â??%sâ?? u bezbednom režimu%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS pregovori nisu uspeli"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "TLS nije dostupan u ovom izdanju"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Nije moguÄ?e povezivanje na POP server %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Nije moguÄ?e povezivanje na POP server %s: traženi mehanizam autentifikacije nije podržan."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Ne mogu da se povežem na POP server â??%sâ??: traženi naÄ?in potvrÄ?ivanja "
+"identiteta nije podržan."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:323
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Neuspela SASL prijava â??%sâ?? na POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Nije uspela SASL prijava â??%sâ?? na POP server %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Nije moguÄ?a prijava na POP server %s: greÅ¡ka SASL protokola"
+msgstr "Ne mogu da se prijavim na POP server â??%sâ??: greÅ¡ka SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Nije moguÄ?a autentifikacija na POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Nisam uspeo da potvrdim identitet na POP serveru â??%sâ??: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Nije moguÄ?e povezivanje na POP server %s: primljen \tInvalid APOP IB. MoguÄ? napad zamenom identiteta. Obratite se adminu."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Ne mogu da se povežem na POP server â??%sâ??: primih Neispravan APOP IB. MoguÄ? "
+"je napad zamenom identiteta. Obratite se adminu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"Nije moguÄ?e povezivanje na POP server %s.\n"
+"Ne mogu da se povežem na POP server â??%sâ??.\n"
 "Greška pri slanju lozinke: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:484
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"Ne mogu da se povežem na POP server â??%sâ??.\n"
+"GreÅ¡ka pri slanju korisniÄ?kog imena%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:497
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
-"Nije moguÄ?e povezivanje na POP server %s.\n"
-"GreÅ¡ka pri slanju korisniÄ?kog imena: %s"
+"Ne mogu da se povežem na POP server â??%sâ??.\n"
+"Greška pri slanju lozinke%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ne mogu da se povežem na POP server â??%sâ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server â??%sâ??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server za â??%sâ?? na â??%sâ??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:685
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle â??%sâ??."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ostava nema hijerarhiju fascikli"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Za dostavu poÅ¡te prosleÄ?ivanjem â??sendmailâ?? programu na lokalnom sistemu."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Za dostavu poÅ¡te prosleÄ?ivanjem â??sendmailâ?? programu na lokalnom sistemu."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "Nije moguÄ?e Ä?itanje liste primalaca"
+msgstr "Ne mogu da analiziram spisak primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nije moguÄ?e napraviti vezu ka sendmail-u: %s: poÅ¡ta nije poslata"
+msgstr "Ne mogu da napravim vezu ka sendmejlu: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nije moguÄ?e podeliti sendmail: %s: poÅ¡ta nije poslata"
+msgstr "Ne mogu da podelim sendmejl: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Ne mogu da pošaljem poruku: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail je završio signalom %s: pošta nije poslata."
+msgstr "sendmejl je zavrÅ¡io signalom â??â??%s: poÅ¡ta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Nije moguÄ?e izvrÅ¡iti %s: poÅ¡ta nije poslata."
+msgstr "Ne mogu da izvrÅ¡im â??%sâ??: poÅ¡ta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail je završio sa statusom %d: pošta nije poslata."
+msgstr "sendmejl 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:248
 msgid "sendmail"
-msgstr "sendmail"
+msgstr "sendmejl"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
-msgstr "Dostava pošte preko programa sendmail"
+msgstr "Dostava pošte preko programa sendmejl"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Za dostavu poÅ¡te povezivanjem na prosleÄ?ivaÄ? poÅ¡te u mreži koriÅ¡Ä?enjem SMTP."
+msgstr ""
+"Za dostavu poÅ¡te povezivanjem na prosleÄ?ivaÄ? poÅ¡te u mreži koriÅ¡Ä?enjem SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
-msgstr "Greška u sintaksi, komanda nije prepoznata"
+msgstr "Greška u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 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:120
 msgid "Command not implemented"
-msgstr "Komanda nije podržana"
+msgstr "Naredba nije podržana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
-msgstr "Parametar komande nije podržan"
+msgstr "Parametar naredbe nije podržan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 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:126
 msgid "Help message"
 msgstr "Poruka o pomoÄ?i"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
-msgstr "Servis spreman"
+msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 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:132
 msgid "Service not available, closing transmission channel"
-msgstr "Servis nije dostupan, zatvaranje kanala prenosa"
+msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
-msgstr "Tražena radnja za poštu u redu, završeno"
+msgstr "Tražena radnja za poštu je u redu, završeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 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:138
 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:140
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Tražena radnja nije preduzeta: nedostupno poÅ¡tansko sanduÄ?e"
+msgstr "Tražena radnja nije preduzeta: poÅ¡tansko sanduÄ?e je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 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:144
 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:146
 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:148
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Odustato od tražene radnje za poštu: premašen dodeljen prostor"
+msgstr "Prekinuta je tražena radnja za poštu: premašen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 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:152
 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:154
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 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:160
 msgid "Authentication mechanism is too weak"
-msgstr "Mehanizam autentifikacije je preslab"
+msgstr "Mehanizam potvrÄ?ivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Neophodno šifrovanje za traženi mehanizam autentifikacije"
+msgstr "Neophodno je Å¡ifrovanje za traženi mehanizam potvrÄ?ivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
-msgstr "Neuspela privremena autentifikacija"
+msgstr "Nije uspelo privremeno potvrÄ?ivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Greška kod odgovora dobrodošlice"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Greška 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:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Nije moguÄ?e povezivanje na SMTP server %s u sigurnosnom režimu: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Neuspela STARTTLS komanda: %s"
+msgstr "Ne mogu da se povežem na SMTP server â??%sâ?? u sigurnosnom režimu: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Neuspela STARTTLS komanda"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "Neuspela STARTTLS naredba: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
 #, 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."
+msgstr "SMTP server â??%sâ?? ne podržava traženi tip potvrÄ?ivanja identiteta â??%sâ??."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nije moguÄ?a autentifikacija na SMTP server.\n"
+"Ne mogu da potvrdim identitet na SMTP serveru.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:676
 #, c-format
 msgid "SMTP server %s"
-msgstr "SMTP server %s"
+msgstr "SMTP server â??%sâ??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:678
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr "SMTP dostava pošte preko %s"
+msgstr "SMTP dostava poÅ¡te preko â??%sâ??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#, c-format
 msgid "Cannot send message: service not connected."
-msgstr "Nije moguÄ?e slanje poruke: servis nije povezan."
+msgstr "Ne mogu da pošaljem poruku: servis nije povezan."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:705
+#, c-format
 msgid "Cannot send message: sender address not valid."
-msgstr "Nije moguÄ?e slanje poruke: adresa poÅ¡iljaoca nije ispravna."
+msgstr "Ne mogu da pošaljem poruku: adresa pošiljaoca nije ispravna."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:709
 msgid "Sending message"
-msgstr "Slanje poruke"
+msgstr "Å aljem poruku"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#, c-format
 msgid "Cannot send message: no recipients defined."
-msgstr "Nije moguÄ?e slanje poruke: nisu odreÄ?eni primaoci."
+msgstr "Ne mogu da poÅ¡aljem poruku: nisu odreÄ?eni primaoci."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Nije moguÄ?e slanje poruke: jedan ili viÅ¡e neispravnih primalaca"
+msgstr "Ne mogu da pošaljem poruku: jedan ili više neispravnih primalaca"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:973
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Neuspela HELO komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "Neuspela HELO komanda"
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1019
+msgid "HELO command failed: "
+msgstr "Neuspela naredba â??HELOâ??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "SMTP Authentication"
-msgstr "SMTP autentifikacija"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "Greška pri pravljenju objekta SASL autentifikacije."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Neuspela AUTH komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Neuspela AUTH komanda"
+msgstr "SMTP potvrÄ?ivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "Loš odgovor na autentifikaciju od servera.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Neuspela MAIL FROM komanda: %s: pošta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Neuspela MAIL FROM komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Neuspela RCPT TO komanda: %s: pošta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> neuspelo"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 #, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Neuspela DATA komanda: %s: pošta nije poslata"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Neuspela DATA komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Neuspela RSET komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Neuspela RSET komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Neuspela QUIT komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Neuspela QUIT komanda"
+msgid "Error creating SASL authentication object."
+msgstr "GreÅ¡ka pri pravljenju objekta SASL potvrÄ?ivanja identiteta."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+msgid "AUTH command failed: "
+msgstr "Neuspela naredba â??AUTHâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1226
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+msgid "MAIL FROM command failed: "
+msgstr "Neuspela naredba â??MAIL FROMâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+msgid "RCPT TO command failed: "
+msgstr "Neuspela naredba â??RCPT TOâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1282
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> nije uspelo"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1328
+#: ../camel/providers/smtp/camel-smtp-transport.c:1337
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1404
+#: ../camel/providers/smtp/camel-smtp-transport.c:1420
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+msgid "DATA command failed: "
+msgstr "Neuspela naredba â??DATAâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+msgid "RSET command failed: "
+msgstr "Neuspela naredba â??RSETâ??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../camel/providers/smtp/camel-smtp-transport.c:1514
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+msgid "QUIT command failed: "
+msgstr "Neuspela naredba â??QUITâ??: "
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
 msgid "Competition"
 msgstr "Nadmetanje"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
 msgid "Goals/Objectives"
 msgstr "Ciljevi/zadaci"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
 msgid "Holiday Cards"
 msgstr "Ä?estitke"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
 msgid "Hot Contacts"
 msgstr "Važni kontakti"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
 msgid "International"
 msgstr "MeÄ?unarodno"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
 msgid "Key Customer"
 msgstr "Važna mušterija"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:58
-msgid "Personal"
-msgstr "LiÄ?no"
-
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
 msgid "Phone Calls"
 msgstr "Telefonski pozivi"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
 msgid "Suppliers"
 msgstr "DobavljaÄ?i"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
 msgid "Time & Expenses"
 msgstr "Vreme i izdaci"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
 msgid "Waiting"
 msgstr "Ä?ekanje"
 
@@ -4772,8 +4684,7 @@ msgstr "Ä?ekanje"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4692,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4700,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4708,78 @@ msgstr "%a %d. %m. %Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c: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,200 +4787,197 @@ 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"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupa LDAP serveru"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
 msgid "Failed to authenticate.\n"
-msgstr "Neuspela autentifikacija.\n"
+msgstr "Nisam uspeo da potvrdim identitet.\n"
+
+#: ../libedataserverui/e-categories-dialog.c:166
+msgid "Category Icon"
+msgstr "Ikonica kategorije"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:172
+msgid "_No Image"
+msgstr "_Bez slike"
+
+#: ../libedataserverui/e-categories-dialog.c:392
 #, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "U podeÅ¡avanju veÄ? postoji kategorija â??%sâ??. Izaberite drugo ime"
+msgid ""
+"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:700
 msgid "Icon"
-msgstr "Ikona"
+msgstr "Ikonica"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:705
 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"
+msgstr "_Ikonica 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 "Currently _used categories:"
+msgstr "Trenutno _koriÅ¡Ä?ene kategorije:"
 
-#: ../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:298
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Izrada kategorije â??%sâ??"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Podaci o bojama"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Boja za obradu"
-
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:335
 msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:674
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:678
 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:906
+#: ../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:2641
 #, 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:2656
 #, 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:2666
 #, 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:2683
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:516
 #, c-format
 msgid "_Delete %s"
-msgstr "_Ukloni %s"
+msgstr "_Ukloni â??%sâ??"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, 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:1120
 msgid "You have the Caps Lock key on."
-msgstr "Morate da ukljuÄ?ite velika slova."
+msgstr "UkljuÄ?ili ste velika slova."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1243
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1244
 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:1249
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1250
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -5085,329 +4986,837 @@ 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:174
 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/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "Neispravno povezivanje"
+
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "Neispravan odgovor servera"
+
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "Nema odgovora servera"
+
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "Loš parametar"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Unesite lozinku"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "â??%sâ?? u knjizi pre â??%sâ??"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "Vlasnik"
+#~ msgid "book busy"
+#~ msgstr "knjiga zauzeta"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "UreÄ?ivaÄ? za objavljivanje"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA izuzetak pri pozivu â??%sâ??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "UreÄ?ivaÄ?"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: nema trenutne operacije"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Autor za objavljivanje"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â??%sâ?? na knjizi posle â??%sâ??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Autor"
+# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
+#~ msgid "%s: canceled"
+#~ msgstr "%s: otkazano"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Autor koji ne ureÄ?uje"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: nema dostupne proizvodnje za adresu â??%s'"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Recenzent"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: nije moguÄ?e pravljenje EBookListener"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Saradnik"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: nema sopstveni JIB kontakta smešten u gconf"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "Ništa"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Nije moguÄ?e da napraviti niz za pribavljanje delti"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "PrilagoÄ?eno"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Rad van mreže nije dostupan"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Opšta greška"
+#~ msgid "Cannot open message"
+#~ msgstr "Nije moguÄ?e otvoriti poruku"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Fascikla istog imena veÄ? postoji"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Nepodržana operacija: prikljuÄ?enje poruke: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Naveden tip fascikle nije ispravan"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O greška"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Nepodržana operacija: prebrojavanje po izrazu: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Nema dovoljno prostora za pravljenje fascikle"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Nepodržana operacija: pretraga po JIB: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Fascikla nije prazna"
+#~ msgid "Learning junk"
+#~ msgstr "UÄ?enje Å¡ta je Ä?ubre"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Navedena fascikla nije pronaÄ?ena"
+#~ msgid "Learning non-junk"
+#~ msgstr "UÄ?enje Å¡ta nije Ä?ubre"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije primenjena u ovoj ostavi"
+#~ msgid "Canceled."
+#~ msgstr "Odustato."
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Operacija nije podržana"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Navedeni tip u ovoj ostavi nije podržan"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Nije moguÄ?a provera potpisa poruke: nije moguÄ?e napraviti privremenu "
+#~ "datoteku: %s"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Navedena fascikla ne može biti izmenjena niti uklonjena"
+#~ msgid "Unable to parse message content"
+#~ msgstr "Nije moguÄ?e proÄ?itati sadržaj poruke"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Nije moguÄ?e napraviti fasciklu tako da se nalazi u njoj samoj"
+#~ msgid "cannot create thread"
+#~ msgstr "nije moguÄ?e pravljenje niza"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Nije moguÄ?e napraviti fasciklu toga imena"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ova operacija ne može biti izvedena u režimu van mreže."
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "Ova opcija Ä?e povezati na server koriÅ¡Ä?enjem Kerberos 4 prijave."
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "Fascikle Ä?iji je vlasnik %s"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nije moguÄ?e dobiti Kerberos kartu:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "LiÄ?ne fascikle"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel sesija ne podržava prosleÄ?ivanje poruke."
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Omiljene javne fascikle"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "uvoz kljuÄ?eva: neizvedeno"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Sve javne fascikle"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "izvoz kljuÄ?eva: neizvedeno"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Globalna lista adresa"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Nije moguÄ?e napraviti fasciklu: neispravna operacija"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Obrisani predmeti"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Nije moguÄ?e dobijanje sertifikata izdavaÄ?a"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Nije moguÄ?e dobiti listu povuÄ?enih sertifikata"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Beleške"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Nije moguÄ?e deÅ¡ifrovanje potpisa sertifikata"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Odlazna"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Nije moguÄ?e deÅ¡ifrovanje potpisa za listu povuÄ?enih sertifikata"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslati predmeti"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Nije moguÄ?e deÅ¡ifrovati javni kljuÄ? izdavaÄ?a"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Zaduženja"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Neuspeo potpis sertifikata"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Neispravno povezivanje"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Neuspeo potpis za listu povuÄ?enih sertifikata"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Neispravan odgovor servera"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Sertifikat joÅ¡ nije važeÄ?i"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Nema odgovora servera"
+#~ msgid "Certificate has expired"
+#~ msgstr "Sertifikat je istekao"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Loš parametar"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL joÅ¡ nije važeÄ?i"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Podrška datoteke adresara za Evoluciju"
+#~ msgid "CRL has expired"
+#~ msgstr "CRL je istekao"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Datoteka kalendara i webcal podrška za Evoluciju"
+#~ msgid "Error in CRL"
+#~ msgstr "Greška u CRL"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Servis za proveru suÄ?elja Servera podataka Evolucije"
+#~ msgid "Out of memory"
+#~ msgstr "Nema više memorije"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servis za prijavu Servera podataka Evolucije"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Samopotpisani sertifikat je nulte veliÄ?ine"
 
-#. 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 "Self-signed certificate in chain"
+#~ msgstr "Samopotpisani sertifikat u lancu"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Nije moguÄ?e lokalno dobiti izdavaÄ?ev sertifikat"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Nije moguÄ?e dobiti potpis lista"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Lanac sertifikata je predugaÄ?ak"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "PovuÄ?en sertifikat"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Neispravan izdavaÄ? sertifikata (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "Premašena dužina putanje"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Neispravna svrha"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Nepoverljiv sertifikat"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Odbijen sertifikat"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Naslov/izdavaÄ? neslaganje"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID neslaganje"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/izdavaÄ? serijsko neslaganje"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Upotreba kljuÄ?a ne podržava potpis sertifikatom"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Greška pri proveri programa"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Loš sertifikat od %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Želite li ipak da prihvatite?"
+
+# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
+#~ msgid "User canceled"
+#~ msgstr "Korisnik odustao"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Fascikla za smeÄ?e je puna. Ispraznite je."
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Za pristupanje Hula serverima"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Ova moguÄ?nost obezbeÄ?uje povezvanje na Hula server koriÅ¡Ä?enjem lozinke u "
+#~ "obiÄ?nom tekstu."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "NeoÄ?ekivani status odgovora â??%sâ??â?? nakon naredbe APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Nema odziva nakon naredbe APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Nepoznata greška se javila tokom naredbe APPEND!"
+
+#~ msgid "Drafts"
+#~ msgstr "Priprema"
+
+#~ msgid "Sent"
+#~ msgstr "Poslato"
+
+#~ msgid "Templates"
+#~ msgstr "Å abloni"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "NeoÄ?ekivan odgovor od IMAP4 servera %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "NeoÄ?ekivan pozdrav od IMAP servera: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄ?e izabrati fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e izabrati fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Veza sa IMAP4 serverom %s je neoÄ?ekivano prekinuta: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "OmoguÄ?avanje otkrivanja dopisne liste je potrebno nekim filterima i "
+#~ "pravilima za vFascikle"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Isticanje zapamÄ?enih poruka koje nisu proÄ?itane za X sekundi"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Isticanje zapamÄ?enih porukastarijih od X sekundi"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Nije moguÄ?e pristupiti fascikli â??%sâ??: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Nije moguÄ?e uskladiti oznake za fasciklu â??%sâ??: nepoznata greÅ¡ka"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e uskladiti oznake za fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Nije moguÄ?e isprazniti fasciklu â??%sâ??: nepoznata greÅ¡ka"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e isprazniti fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Nije moguÄ?e dobiti poruku %s iz fascikle â??%sâ??: nema takve poruke"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e dobiti poruku %s iz fascikle â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: fascikla je samo za Ä?itanje"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: nepoznata greÅ¡ka"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e dodati poruku u fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄ?e premestiti poruku iz fascikle â??%sâ?? u fasciklu â??%sâ??: nepoznata "
+#~ "greška"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄ?e umnožiti poruke iz fascikle â??%sâ?? u fasciklu â??%sâ??: nepoznata "
+#~ "greška"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguÄ?e premestiti poruke iz fascikle â??%sâ?? u fasciklu â??%sâ??: loÅ¡a "
+#~ "naredba"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguÄ?e umnožiti poruku iz fascikle â??%sâ?? u fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Proveri da nema _Ä?ubreta meÄ?u novim porukama"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Proveri da nema Ä?ubreta samo u fascikli SANDUÄ?E"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Za Ä?itanje i smeÅ¡tanje poÅ¡te na IMAPv4rev1 servere."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Ova opcija Ä?e povezati na IMAPv4rev1 server koriÅ¡Ä?enjem lozinke u obiÄ?nom "
+#~ "tekstu."
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Neuspelo povezivanje na IMAP server %s u bezbednosnom režimu: server ne "
+#~ "podržava STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "Nije moguÄ?a prijava na IMAP server %s pomoÄ?u mehanizma prijave %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Nije moguÄ?a prijava na IMAP server %s pomoÄ?u %s"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Nije moguÄ?e pravljenje IMAP fascikli u režimu van mreže."
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "Nije moguÄ?e dobiti fasciklu â??%sâ?? sa IMAP servera %s: nepoznata greÅ¡ka"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Nije moguÄ?e dobiti LIST informaciju za â??%sâ?? sa IMAP servera %s: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "Loša komanda"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e napraviti fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Nije moguÄ?e brisanje IMAP fascikli u režimu van mreže."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?e obrisati fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "Nije moguÄ?e preimenovati fasciklu â??%sâ?? u â??%sâ??: specijalna fascikla"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Nije moguÄ?e preimenovanje IMAP fascikli u režimu van mreže."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Nije moguÄ?e preimenovati fasciklu â??%sâ?? u â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "Nije moguÄ?e preimenovati fasciklu â??%sâ?? u â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "Nije moguÄ?e dobiti podatke %s za obrazac â??%sâ?? sa IMAP servera %s: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Nije moguÄ?a prijava na IMAP fascikle u režimu van mreže."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄ?a prijava na fasciklu â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?a prijava na fasciklu â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "Nije moguÄ?e odjavljivanje sa IMAP fascikli u režimu van mreže."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguÄ?a odjava sa fascikle â??%sâ??: neispravno ime sanduÄ?eta"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "Nije moguÄ?a odjava sa fascikle â??%sâ??: loÅ¡a naredba"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Pretraga za izmenjenim porukama"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP server %s nije usklaÄ?en."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Pribavljanje omota za nove poruke"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "NeoÄ?ekivani element u odgovoru IMAP servera %s: "
+
+#~ msgid "No data"
+#~ msgstr "Nema podataka"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "Veza sa IMAP serverom %s je neoÄ?ekivano prekinuta: %s"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "Eksperimentalni IMAP 4(.1) klijent\n"
+#~ "Ovo je neproveren i nepodržan kod, bolje koristite obiÄ?an imap.\n"
+#~ "\n"
+#~ " !!! NE KORISTITE OVO ZA VAŽNU POŠTU  !!!\n"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "Nije moguÄ?e povezivanje na POP server %s"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Prododata maildir poruka poništena"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "Neispravan sadržaj poruke"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "Dodavanje pošte otkazano"
+
+#~ msgid "Message construction failed."
+#~ msgstr "Sastavljanje poruke neuspelo."
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH dodavanje poruke otkazano"
+
+#~ msgid "Use cancel"
+#~ msgstr "Koristite odustani"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Neuspela STARTTLS komanda"
+
+#~ msgid "HELO command failed"
+#~ msgstr "Neuspela HELO komanda"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "Neuspela AUTH komanda"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Loš odgovor na autentifikaciju od servera.\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Neuspela MAIL FROM komanda: %s: pošta nije poslata"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Neuspela RCPT TO komanda: %s: pošta nije poslata"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Neuspela DATA komanda: %s: pošta nije poslata"
+
+#~ msgid "RSET command failed"
+#~ msgstr "Neuspela RSET komanda"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "Neuspela QUIT komanda"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
+
+#~ msgid "Color Info"
+#~ msgstr "Podaci o bojama"
+
+#~ msgid "The color to render"
+#~ msgstr "Boja za obradu"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Unesite lozinku za %s"
+
+#~ msgid "Enter password"
+#~ msgstr "Unesite lozinku"
+
+#~ msgid "Owner"
+#~ msgstr "Vlasnik"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "UreÄ?ivaÄ? za objavljivanje"
+
+#~ msgid "Editor"
+#~ msgstr "UreÄ?ivaÄ?"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Autor za objavljivanje"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "Autor koji ne ureÄ?uje"
+
+#~ msgid "Reviewer"
+#~ msgstr "Recenzent"
+
+#~ msgid "Contributor"
+#~ msgstr "Saradnik"
+
+#~ msgid "None"
+#~ msgstr "Ništa"
+
+#~ msgid "Custom"
+#~ msgstr "PrilagoÄ?eno"
+
+#~ msgid "Generic error"
+#~ msgstr "Opšta greška"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Fascikla istog imena veÄ? postoji"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Naveden tip fascikle nije ispravan"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nema dovoljno prostora za pravljenje fascikle"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Fascikla nije prazna"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Navedena fascikla nije pronaÄ?ena"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija nije primenjena u ovoj ostavi"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operacija nije podržana"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Navedeni tip u ovoj ostavi nije podržan"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Navedena fascikla ne može biti izmenjena niti uklonjena"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Nije moguÄ?e napraviti fasciklu tako da se nalazi u njoj samoj"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nije moguÄ?e napraviti fasciklu toga imena"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ova operacija ne može biti izvedena u režimu van mreže."
+
+#~ msgid "%s's Folders"
+#~ msgstr "Fascikle Ä?iji je vlasnik %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "LiÄ?ne fascikle"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Omiljene javne fascikle"
+
+#~ msgid "All Public Folders"
+#~ msgstr "Sve javne fascikle"
+
+#~ msgid "Global Address List"
+#~ msgstr "Globalna lista adresa"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Obrisani predmeti"
+
+#~ msgid "Journal"
+#~ msgstr "Dnevnik"
+
+#~ msgid "Notes"
+#~ msgstr "Beleške"
+
+#~ msgid "Outbox"
+#~ msgstr "Odlazna"
+
+#~ msgid "Sent Items"
+#~ msgstr "Poslati predmeti"
+
+#~ msgid "Tasks"
+#~ msgstr "Zaduženja"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Podrška datoteke adresara za Evoluciju"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Datoteka kalendara i webcal podrška za Evoluciju"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Servis za proveru suÄ?elja Servera podataka Evolucije"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Servis za prijavu Servera podataka Evolucije"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "DoÅ¡lo je do viÅ¡estrukih prekoraÄ?enja segmenata; nije moguÄ?e prikazati "
+#~ "prozorÄ?e za greÅ¡ke\n"
 
 #~ msgid "Fair"
 #~ msgstr "Ä?isto"
+
 #~ msgid "Snow showers"
 #~ msgstr "MeÄ?ava"
+
 #~ msgid "Snow"
 #~ msgstr "Sneg"
+
 #~ msgid "Partly cloudy"
 #~ msgstr "MestimiÄ?no oblaÄ?no"
+
 #~ msgid "Smoke"
 #~ msgstr "Dim"
+
 #~ msgid "Thunderstorms"
 #~ msgstr "Grmljavine"
+
 #~ msgid "Cloudy"
 #~ msgstr "OblaÄ?no"
+
 #~ msgid "Drizzle"
 #~ msgstr "Slaba kiša"
+
 #~ msgid "Sunny"
 #~ msgstr "SunÄ?ano"
+
 #~ msgid "Dust"
 #~ msgstr "Prašina"
+
 #~ msgid "Clear"
 #~ msgstr "Vedro"
+
 #~ msgid "Mostly cloudy"
 #~ msgstr "Pretežno oblaÄ?no"
+
 #~ msgid "Windy"
 #~ msgstr "Vetrovito"
+
 #~ msgid "Rain showers"
 #~ msgstr "Jaka kiša"
+
 #~ msgid "Foggy"
 #~ msgstr "Maglovito"
+
 #~ msgid "Rain/snow mixed"
 #~ msgstr "Kiša i sneg"
+
 #~ msgid "Sleet"
 #~ msgstr "KiÅ¡a praÄ?ena snegom"
+
 #~ msgid "Very hot/humid"
 #~ msgstr "Veoma toplo/vlažno"
+
 #~ msgid "Blizzard"
 #~ msgstr "Ledena oluja"
+
 #~ msgid "Freezing rain"
 #~ msgstr "Ledena kiša"
+
 #~ msgid "Haze"
 #~ msgstr "Izmaglica"
+
 #~ msgid "Blowing snow"
 #~ msgstr "Snežni naleti"
+
 #~ msgid "Freezing drizzle"
 #~ msgstr "Ledena slaba kiša"
+
 #~ msgid "Very cold/wind chill"
 #~ msgstr "Veoma hladno/vetrovito"
+
 #~ msgid "Rain"
 #~ msgstr "Kiša"
+
 #~ msgid "Weather: Partly Cloudy"
 #~ msgstr "Vreme: mestimiÄ?no oblaÄ?no"
+
 #~ msgid "%.1f°C - %s"
 #~ msgstr "%.1f°C - %s"
+
 #~ msgid "%.1f°F - %s"
 #~ msgstr "%.1f°F - %s"
+
 #~ msgid "%.1f/%.1f°C - %s"
 #~ msgstr "%.1f/%.1f°C - %s"
+
 #~ msgid "%.1f/%.1f°F - %s"
 #~ msgstr "%.1f/%.1f°F - %s"
+
 #~ msgid "%d%% chance of precipitation\n"
 #~ msgstr "Å¡ansa od %d%% za padavine\n"
+
 #~ msgid "%.1fcm snow\n"
 #~ msgstr "%.1fcm sneg\n"
+
 #~ msgid "%.1fin snow\n"
 #~ msgstr "%.1fin sneg\n"
+
 #~ msgid "%.1f-%.1fcm snow\n"
 #~ msgstr "%.1f-%.1fcm sneg\n"
+
 #~ msgid "%.1f-%.1fin snow\n"
 #~ msgstr "%.1f-%.1fin sneg\n"
+
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "Neuspelo pravljenje sadržanog procesa â??%sâ??: %s"
+
 #~ msgid "Performing query on unknown header: %s"
 #~ msgstr "Izvršavanje pretrage na nepoznatom zaglavlju: %s"
+
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "Dekodiranje neuspelo, greška %d"
+
 #~ msgid "Cannot find certificate for `%s'"
 #~ msgstr "Nije moguÄ?e naÄ?i sertifikat za â??%sâ??"
+
 #~ msgid "%sPlease enter the GroupWise password for %s %s"
 #~ msgstr "%sUnesite Groupwise lozinku za %s %s"
+
 #~ msgid "Unable to authenticate to GroupWise server. "
 #~ msgstr "Nije moguÄ?a autentifikacija na GroupWise server."
+
 #~ msgid "Folder was destroyed and recreated on server."
 #~ msgstr "Fascikla je uništena i ponovo na serveru napravljena."
+
 #~ msgid ""
 #~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
 #~ msgstr "NeoÄ?ekivan odgovor servera: istovetni JIB za poruke %d i %d"
+
 #~ msgid "%sPlease enter the IMAP password for %s %s"
 #~ msgstr "%sUnesite IMAP lozinku za %s %s"
+
 #~ msgid "%sPlease enter the IMAP password for %s on host %s"
 #~ msgstr "%sUnesite IMAP lozinku korisnika %s na domaÄ?inu %s"
+
 #~ msgid "Could not save summary: %s: %s"
 #~ msgstr "Nije moguÄ?e Ä?uvanje pregleda: %s: %s"
+
 #~ msgid "Please enter the NNTP password for %s %s"
 #~ msgstr "Unesite NNTP lozinku za %s %s"
+
 #~ msgid "%sPlease enter the SMTP password for %s on host %s"
 #~ msgstr "%sUnesite SMTP lozinku za %s na domaÄ?inu %s"
+
 #~ msgid "Category _Color"
 #~ msgstr "_Boja kategorije"
+
 #~ msgid "Select User"
 #~ msgstr "Izaberite korisnika"
+
 #~ msgid "Addressbook..."
 #~ msgstr "Adresar..."
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "GreÅ¡ka pri pisanju u privremeno poÅ¡tansko sanduÄ?e: %s"
+
 #~ msgid "\t\t\t\t\t\t"
 #~ msgstr "\t\t\t\t\t\t"
+
 #~ msgid "Failed to create pipe to '%s': %s"
 #~ msgstr "Neuspelo pravljenje veze ka â??%sâ??: %s"
+
 #~ msgid "Cannot get folder info in offline mode."
 #~ msgstr "Nije moguÄ?e dobiti podatke za fasciklu u režimu van mreže."
+
 #~ msgid "Cannot delete GroupWise folders in offline mode."
 #~ msgstr "Nije moguÄ?e brisanje GroupWise fascikli u režimu van mreže."
+
 #~ msgid "Cannot rename GroupWise folders in offline mode."
 #~ msgstr "Nije moguÄ?e preimenovanje GroupWise fascikli u režimu van mreže."
+
 #~ msgid "%sEnter password for %s"
 #~ msgstr "%sUnesite lozinku za %s"
+
 #~ msgid ""
 #~ "Could not authenticate to server. (Password incorrect?)\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Nije moguÄ?a prijava na server. (NetaÄ?na lozinka?)\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Could not authenticate to server.\n"
 #~ "\n"
@@ -5425,14 +5834,17 @@ msgstr "DoÅ¡lo je do viÅ¡estrukih prekoraÄ?enja segmenata; nije moguÄ?e prikazat
 #~ "imena (npr. â??DOMEN\\korisnik\").\n"
 #~ "Ili ste možda samo pogrešno ukucali lozinku.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox za %s nije na ovom serveru."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "Server '%s' koristi Exchange 5.5 i stoga\n"
 #~ "nije kompatibilan sa Ximian Connector-om"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +5853,37 @@ msgstr "DoÅ¡lo je do viÅ¡estrukih prekoraÄ?enja segmenata; nije moguÄ?e prikazat
 #~ "Nije moguÄ?e pronaÄ?i Exchange Web Storage System na %s.\n"
 #~ "Ukoliko OWA radi na drugoj putanji, morate je navesti u\n"
 #~ "podešavanju naloga."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "Nema mailbox-a za korisnika %s na %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "Nije moguÄ?e povezivanje na server %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Nije moguÄ?e povezivanje na domaÄ?ina"
+
 #~ msgid "Network error"
 #~ msgstr "Greška na mreži"
+
 #~ msgid "Folder Name"
 #~ msgstr "Ime fascikle"
+
 #~ msgid "Folder Size"
 #~ msgstr "VeliÄ?ina fascikle"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise server %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: otkazan"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: nema dostupnih tvornica za adresu â??%sâ??"
+
 #~ msgid "File As"
 #~ msgstr "Zavedi kao"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +5892,153 @@ msgstr "DoÅ¡lo je do viÅ¡estrukih prekoraÄ?enja segmenata; nije moguÄ?e prikazat
 #~ "Nisam mogao da primenim GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "Nisam mogao da primenim GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "Adresar i kalendar"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "Agent za poštu:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "Koristi bezbednu vezu (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "Spisak za overu"
+
 #~ msgid "Server rejected username"
 #~ msgstr "Server je odbio korisnika"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "NeuspeÅ¡no slanje korisniÄ?kog imena serveru"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "Server je odbio korisnika/lozinku"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "Ne mogu da uÄ?itam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Ne mogu da saÄ?uvam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "Datoteka adresara i LDAP podrška za Evoluciju"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? oÄ?ekuje 1 argument"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? oÄ?ekuje 1 argument da bude niska"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_add_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba izuzetak poziva Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_commit_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba izuzetak poziva Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba izuzetak poziva Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba izuzetak poziva Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba izuzetak poziva Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba izuzetak poziva Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba izuzetak poziva Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba izuzetak poziva Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba izuzetak poziva Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove na imeniku pre e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "vreme-sada oÄ?ekuje 0 argumenata"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "unesi-vreme oÄ?ekuje da argument 1 bude niz"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "dodaj-vreme oÄ?ekuje 2 argumenta"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "vreme-poÄ?etka-dana oÄ?ekuje 1 argument"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "vreme-poÄ?etka-dana oÄ?ekuje da argument 1 bude time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "vreme-kraja-dana oÄ?ekuje 1 argument"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "desi-se-u-periodu? oÄ?ekuje 2 argumenta"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "desi-se-u-periodu? oÄ?ekuje da argument 1 bude time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "desi-se-u-periodu? oÄ?ekuje da argument 2 bude time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "ponavlja-se? ne oÄ?ekuje argumente"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "je-gotov? oÄ?ekuje 0 argumenata"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "gotov-pre? oÄ?ekuje 1 argument"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "gotov-pre? oÄ?ekuje da argument 1 bude time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1046
-msgid "On This Computer"
-msgstr "Na ovom raÄ?unaru"