Updated Serbian translation

author: Мирослав Николић <miroslavnikolic@rocketmail.com> 2011-06-24 20:41:21 +0200
committer: Милош Поповић <gpopac@gmail.com> 2011-06-24 20:41:21 +0200
commit: e5a8bfb519888fe9b27c95ad67d223362a27d296 (patch)
tree: e0e258a2f3259bdf9f068542d5b90d9cdd69ff38
parent: 75c691d7d3d0baf860dc55026dc4ae2916d170d7 (diff)
download: evolution-data-server-e5a8bfb519888fe9b27c95ad67d223362a27d296.tar.gz
2 files changed, 7225 insertions, 5979 deletions
diff --git a/po/sr.po b/po/sr.po
index 88d235921..b03490882 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,225 +1,188 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution-data-server package.
-#
 # Maintainer: Данило Шеган <dsegan@gmx.net>
 # Reviewed on 2005-08-20 by: Игор Несторовић <igor@prevod.org>
-#
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: Горан Ракић <grakic@devbase.net>\n"
-"Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-06-21 10:31+0000\n"
+"PO-Revision-Date: 2011-06-17 22:35+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2326
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "Учитавање је у току..."
+msgstr "Учитавам..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2257
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2279
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2324
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "Претраживање је у току..."
+msgstr "Претражујем..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contacts…"
+msgstr "Пропитујем за ажурираним контактима..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/libebook/e-book.c:3476 ../calendar/libecal/e-cal.c:1069
+msgid "Personal"
+msgstr "Лично"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Пријатељи"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Породица"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Сарадници"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groups…"
+msgstr "Пропитујем за ажурираним групама..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contact…"
+msgstr "Стварам нови контакт..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contact…"
+msgstr "Бришем контакт..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contact…"
+msgstr "Мењам контакт..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loading…"
+msgstr "Учитавам..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the server…"
+msgstr "Потврђујем идентитет са сервером..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Преузимање контаката (%d)... "
+msgstr "Преузимам контакте (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2853
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3034
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3081
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "Освежавање преузетих контаката (%d)... "
+msgstr "Освежавам преузете контакте (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "Нисам повезан"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
-msgstr "Коришћење истакнутог имена (DN)"
+msgstr "Користим истакнуто име (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "Коришћење електронске адресе"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
-msgstr "Поновно повезивање на LDAP сервер..."
+msgstr "Поново се повезујем на ЛДАП сервер..."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+msgid "Invalid DN syntax"
+msgstr "Неисправна ДН синтакса"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
-msgstr "Додавање контакта на LDAP сервер..."
+msgstr "Додајем контакт на ЛДАП сервер..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
-msgstr "Уклањање контакта са LDAP сервера..."
+msgstr "Уклањам контакт са ЛДАП сервера..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
-msgstr "Мењање контакта са LDAP сервера..."
+msgstr "Мењам контакт са ЛДАП сервера..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
-msgstr "Примање резултата претраге са LDAP сервера..."
+msgstr "Примам резултате претраге са ЛДАП сервера..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "Грешка током претраге"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288
-#: ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496
-#: ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639
-#: ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730
-#: ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028
-#: ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211
-#: ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370
-#: ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575
-#: ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818
-#: ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055
-#: ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263
-#: ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "„%s“ у књизи пре „%s“"
-
-#: ../addressbook/libebook/e-book.c:301
-#: ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652
-#: ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043
-#: ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384
-#: ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831
-#: ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276
-#: ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "књига заузета"
-
-#: ../addressbook/libebook/e-book.c:332
-#: ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540
-#: ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679
-#: ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770
-#: ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070
-#: ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255
-#: ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411
-#: ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624
-#: ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878
-#: ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099
-#: ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302
-#: ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537
-#: ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715
-#: ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913
-#: ../addressbook/libebook/e-book.c:3463
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA изузетак при позиву „%s“"
-
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: нема тренутне операције"
-
-#: ../addressbook/libebook/e-book.c:2555
-#: ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: није било могуће отказати"
-
-#: ../addressbook/libebook/e-book.c:2671
-#: ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "„%s“ на књизи после „%s“"
-
-# Ово је било "корисник поништен", али мислим да је ово ипак исправније
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: отказано"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: неисправан извор."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4286
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Непозната грешка"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: нема доступне производње за адресу ’%s'"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book.c:3159
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: није могуће прављење EBookListener"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: нема извора за јиб „%s“ смештеног у Гконфу."
 
-#: ../addressbook/libebook/e-book.c:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: нема сопствени ЈИБ контакта смештен у gconf"
+#: ../addressbook/libebook/e-book.c:3459 ../calendar/libecal/e-cal.c:1049
+msgid "On This Computer"
+msgstr "На овом рачунару"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: нема извора за јиб ’%s‘ смештеног у gconf."
+#: ../addressbook/libebook/e-book.c:3583
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Адресар не постоји"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Јединствени ИБ"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Смести под"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Адреса књиге"
 
@@ -227,810 +190,1034 @@ msgstr "Адреса књиге"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Пуно име"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Дато име"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Презиме"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Надимак"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. електронска адреса"
+msgstr "1° електронска адреса"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. електронска адреса"
+msgstr "2° електронска адреса"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. електронска адреса"
+msgstr "3° електронска адреса"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. електронска адреса"
+msgstr "4° електронска адреса"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Пошиљалац"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Ознака кућне адресе"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Ознака адресе на послу"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Ознака друге адресе"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Телефон помоћника"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Телефон на послу"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. телефон на послу"
+msgstr "2° телефон на послу"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Пословни факс"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
-msgstr "Tелефон за позивање"
+msgstr "Телефон за позивање"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Телефон у колима"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Телефон предузећа"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Кућни телефон"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. кућни телефон"
+msgstr "2° кућни телефон"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Кућни факс"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
-msgstr "ISDN"
+msgstr "ИСДН"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Други телефон"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Други факс"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Пејџер"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Главни телефон"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Радио"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Организација"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Организациона јединица"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Титула"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Улога"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Руководилац"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Помоћник"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "Лична страница"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Адреса веб дневника"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "Категорије"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Адреса календара"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Адреса за слободно/заузето"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
-msgstr "ICS календар"
+msgstr "ИЦС календар"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Адреса видео конференције"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Име супружника"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Напомена"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. кућно наденуто име за AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. наденуто име за AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. наденуто име за AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1° кућни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. пословно наденуто име за AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2° кућни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. пословно наденуто име за AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3° кућни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. пословно наденуто име за AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1° пословни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. кућно наденуто име за GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2° пословни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. кућно наденуто име за GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3° пословни АИМ надимак"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. кућно наденуто име за GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1° кућни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. пословно наденуто име за GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2° кућни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. пословно наденуто име за GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3° кућни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. пословно наденуто име за GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1° пословни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. кућни Jabber налог"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2° пословни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. кућни Jabber налог"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3° пословни ГроупВајз надимак"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. кућни Jabber налог"
+msgid "Jabber Home ID 1"
+msgstr "1° кућни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. пословни Jabber налог"
+msgid "Jabber Home ID 2"
+msgstr "2° кућни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. пословни Jabber налог"
+msgid "Jabber Home ID 3"
+msgstr "3° кућни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. пословни Jabber налог"
+msgid "Jabber Work ID 1"
+msgstr "1° пословни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. кућно наденуто име за Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2° пословни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. кућно наденуто име за Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3° пословни Џабер ИБ"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. кућно наденуто име за Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1° кућни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. пословно наденуто име за Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2° кућни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. пословно наденуто име за Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3° кућни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. пословно наденуто име за Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1° пословни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. кућно наденуто име за MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2° пословни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. кућно наденуто име за MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3° пословни Јаху! надимак"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. кућно наденуто име за MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1° кућни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. пословно наденуто име за MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2° кућни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. пословно наденуто име за MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3° кућни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. пословно наденуто име за MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1° пословни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. кућни ICQ налог"
+msgid "MSN Work Screen Name 2"
+msgstr "2° пословни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. кућни ICQ налог"
+msgid "MSN Work Screen Name 3"
+msgstr "3° пословни МСН надимак"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. кућни ICQ налог"
+msgid "ICQ Home ID 1"
+msgstr "1° кућни ИЦКу ИБ"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. пословни ICQ налог"
+msgid "ICQ Home ID 2"
+msgstr "2° кућни ИЦКу ИБ"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. пословни ICQ налог"
+msgid "ICQ Home ID 3"
+msgstr "3° кућни ИЦКу ИБ"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. пословни ICQ налог"
+msgid "ICQ Work ID 1"
+msgstr "1° пословни ИЦКу ИБ"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2° пословни ИЦКу ИБ"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3° пословни ИЦКу ИБ"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Последња ревизија"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Име или орг."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Разне адресе"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Кућна адреса"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Адреса на послу"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Друга адреса"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "Листа категорија"
+msgstr "Списак категорија"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Слика"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Лого"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Име"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "Листа електронских адреса"
+msgstr "Списак е-адреса"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "Листа наденутих имена за AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "Листа GroupWise иб-а"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Листа Jabber налога"
+msgid "AIM Screen Name List"
+msgstr "Списак АИМ надимака"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Листа наденутих имена за Yahoo!"
+msgid "GroupWise ID List"
+msgstr "Списак ГроупВајз налога"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "Листа наденутих имена за MSN"
+msgid "Jabber ID List"
+msgstr "Списак Џабер налога"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "Листа ICQ налога"
+msgid "Yahoo! Screen Name List"
+msgstr "Списак Јаху! надимака"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "Списак МСН надимака"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "Wants HTML Mail"
-msgstr "Жели HTML пошту"
+msgid "ICQ ID List"
+msgstr "Списак ИЦКу налога"
 
 #: ../addressbook/libebook/e-contact.c:256
+msgid "Wants HTML Mail"
+msgstr "Жели ХТМЛ пошту"
+
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "Листа"
+msgstr "Списак"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "Листа приказаних адреса"
+msgstr "Списак приказаних адреса"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "Рођендан"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "Годишњица"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 сертификат"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu кућни Иб 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu кућни Иб 2"
+msgid "X.509 Certificate"
+msgstr "X.509 уверење"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu кућни Иб 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1° кућни Гаду-Гаду ИБ"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu пословни Иб 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2° кућни Гаду-Гаду ИБ"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu пословни Иб 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3° кућни Гаду-Гаду ИБ"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu пословни Иб 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1° пословни Гаду-Гаду ИБ"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Иб листа"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2° пословни Гаду-Гаду ИБ"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3° пословни Гаду-Гаду ИБ"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Списак Гаду-Гаду налога"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Географски подаци"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. име за Skype код куће"
+msgstr "1° кућно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. име за Skype код куће"
+msgstr "2° кућно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. име за Skype код куће"
+msgstr "3° кућно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. име за Skype на послу"
+msgstr "1° пословно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. име за Skype на послу"
+msgstr "2° пословно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. име за Skype на послу"
+msgstr "3° пословно Скајп име"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Листа наденутих имена за Skype"
+msgstr "Списак Скајп имена"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
-msgstr "SIP адреса"
+msgstr "СИП адреса"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "Листа без имена"
+msgstr "Неименовани списак"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
+#, c-format
+msgid "Empty URI"
+msgstr "Празна адреса"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "Invalid source"
+msgstr "Неисправан извор"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "Успешно"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "Складиште није на мрежи"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4268 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "Забрањен приступ"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "Контакт није пронађен"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "ИБ контакта већ постоји"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "Неуспела аутентификација"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "Потребна је аутентификација"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "Неподржано поље"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "Неподржан начин аутентификације"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "ТЛС није доступан"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Књига је уклоњена"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "Није доступно у режиму ван мреже"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "Премашена величина претраге"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "Истекло време за претрагу"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "Неисправан упит"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "Упит је одбијен"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "Не могу да откажем"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "Неисправна верзија сервера"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "Нема простора"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4252 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "Неисправан аргумент"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4291 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Није подржан"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Друга грешка"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Не могу да отворим књигу: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Не могу да уклоним књигу: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Не могу да добијем контакт: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "Празан упит: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Не могу да добијем списак контакта: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Не могу да потврдим идентитет корисника: %s "
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Не могу да додам контакт: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Не могу да изменим контакт: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Не могу да уклоним контакте: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Не могу да добијем подржана поља: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Не могу да добијем обавезна поља: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Не могу да добијем подржане начине потврђивања идентитета: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Неисправан упит: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Не могу да добијем измене: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Није успела операција отказивања: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "Сервер је недоступан (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Сервер је недоступан, календар је отворен у режиму само за читање.\n"
+"Порука грешке: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Календар не подржава Слободно / Заузето"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "Рођендан: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Годишњица: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "Није могуће чување података из календара: лоша адреса."
+msgstr "Не могу да сачувам податак из календара: лоша адреса."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 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 "Није могуће направити датотеку за оставу"
+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 "Није могуће направити низ за попуњавање оставе"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
-msgstr "Потребан одговор: за "
+msgstr "Потребан је одговор: за "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
-msgstr "Потребан одговор: када је згодно"
+msgstr "Потребан је одговор: када је згодно"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "Учитавање %s предмета"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "Учитавам ставке заказивања"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "Учитавам ставке задатка"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "Учитавам ставке белешке"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "Учитавам ставке"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "Неисправна адреса сервера"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1156
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1188
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1226
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
-msgstr "Неуспела аутентификација"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Не могу да направим датотеку за оставу"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Не могу да направим низ за попуњавање оставе"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "Преусмерено на неисправну адресу"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "Лош облик датотеке."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "Није календар."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
-msgstr "Није могуће добијање података о времену"
+msgstr "Не могу да добијем податке о времену"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "Време: магла"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Време: облачно"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "Време: облачна ноћ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../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:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "Време: пљусак"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "Време: снег"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Време: сунчано"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "Време: ведра ноћ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../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:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "Прогноза"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "Неименовани заказани састанак"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
-msgstr "1."
+msgstr "1°"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
-msgstr "2."
+msgstr "2°"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
-msgstr "3."
+msgstr "3°"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
-msgstr "4."
+msgstr "4°"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
-msgstr "5."
+msgstr "5°"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
-msgstr "6."
+msgstr "6°"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
-msgstr "7."
+msgstr "7°"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
-msgstr "8."
+msgstr "8°"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
-msgstr "9."
+msgstr "9°"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
-msgstr "10."
+msgstr "10°"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
-msgstr "11."
+msgstr "11°"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
-msgstr "12."
+msgstr "12°"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
-msgstr "13."
+msgstr "13°"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
-msgstr "14."
+msgstr "14°"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
-msgstr "15."
+msgstr "15°"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
-msgstr "16."
+msgstr "16°"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
-msgstr "17."
+msgstr "17°"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
-msgstr "18."
+msgstr "18°"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
-msgstr "19."
+msgstr "19°"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
-msgstr "20."
+msgstr "20°"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
-msgstr "21."
+msgstr "21°"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
-msgstr "22."
+msgstr "22°"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
-msgstr "23."
+msgstr "23°"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
-msgstr "24."
+msgstr "24°"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
-msgstr "25."
+msgstr "25°"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
-msgstr "26."
+msgstr "26°"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
-msgstr "27."
+msgstr "27°"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
-msgstr "28."
+msgstr "28°"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
-msgstr "29."
+msgstr "29°"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
-msgstr "30."
+msgstr "30°"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
-msgstr "31."
+msgstr "31°"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Високо"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Нормално"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Ниско"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Недефинисано"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1294 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Унесите лозинку за %s (корисник %s)"
@@ -1039,427 +1226,542 @@ msgstr "Унесите лозинку за %s (корисник %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1308
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Унесите лозинку за %s како би мрежни посредник био омогућен за %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Неисправан аргумент"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4254
 msgid "Backend is busy"
 msgstr "Подршка је заузета"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4256
 msgid "Repository is offline"
 msgstr "Складиште није на мрежи"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4258
 msgid "No such calendar"
 msgstr "Нема таквог календара"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4260 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Објекат није нађен"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4262 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Неисправан објекат"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4264
 msgid "URI not loaded"
 msgstr "Адреса није учитана"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4266
 msgid "URI already loaded"
 msgstr "Адреса је већ учитана"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Забрањен приступ"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4270 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Непознат корисник"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4272 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "ИБ објекта већ постоји"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4274
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4276
 msgid "Operation has been canceled"
 msgstr "Операција је отказана"
 
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4278
 msgid "Could not cancel operation"
-msgstr "Није могуће отказати операцију"
+msgstr "Не могу да откажем операцију"
+
+#: ../calendar/libecal/e-cal.c:4280
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "Потврђивање идентитета није успело"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4282
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
-msgstr "Обавезна аутентификација"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "Дошло је до CORBA изузетка"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "Непозната грешка"
+msgstr "Потребно је потврђивање идентитета"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4284
+msgid "A D-Bus exception has occurred"
+msgstr "Дошло је до Д-бас изузетка"
+
+#: ../calendar/libecal/e-cal.c:4288
 msgid "No error"
 msgstr "Нема грешке"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "„%s“ не очекује аргументе"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "„%s“ очекује један аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "„%s“ очекује да први аргумент буде ниска"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "„%s“ очекује да први аргумент буде ниска ИСО 8601 датума/времена"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "„%s“ очекује два аргумента"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "„%s“ очекује да први аргумент буде time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "„%s“ очекује да други аргумент буде цео број"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "„%s“ очекује да други аргумент буде time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "„%s“ очекује да други аргумент буде ниска"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "„%s“ очекује да први аргумент буде „any“, „summary“, „description“, „location“, „attendee“, „organizer“, или „classification“"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"„%s“ очекује да први аргумент буде „any“, „summary“, „description“, "
+"„location“, „attendee“, „organizer“, или „classification“"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "„%s“ очекује бар један аргумент"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "„%s“ очекује да сви аргументи буду ниске или један и само један аргумент да буде логички нетачан (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"„%s“ очекује да сви аргументи буду ниске или један и само један аргумент да "
+"буде логички нетачан (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "Неисправан опсег"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Неподржано поље"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "Неподржан метод"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Немподржан метод аутентификације"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "Календар не постоји"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS није доступан"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "Непознат корисник"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Рад ван мреже није доступан"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Не могу да преузмем адресу календара: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Премашена величина претраге"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Не могу да преузмем адресу е-поште аларма календара: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Истекло време за претрагу"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Не могу да преузмем ЛДАП особину календара: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Неисправан упит"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Не могу да преузмем информације заказивања календара: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Упит одбијен"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "Не могу да отворим календар: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Неисправна верзија сервера"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "Не могу да освежим календар: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "Не могу да уклоним календар: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "Не могу да направим објекат календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "Не могу да изменим објекат календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "Не могу да уклоним објекат календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "Не могу да примим објекте календара: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Не могу да одбацим аларм календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "Не могу да пошаљем објекте календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Не могу да преузмем основну путању објекта календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Не могу да преузмем путању објекта календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Не могу да преузмем списак објекта календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "Не могу да преузмем списак прилога: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "Не могу да довршим упит календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Не могу да преузмем временску зону календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "Не могу да додам временску зону календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "Не могу да подесим основну временску зону календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Не могу да преузмем измене календара: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Не могу да преузмем списак слободног/заузетог календара: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
+msgid "Invalid URI"
+msgstr "Неисправна адреса"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Нема погона позадинца за „%s“ од „%s“"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Не могу да покренем позадинца"
+
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава потписивање"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Потписивање поруке"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава проверу"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Проверавање поруке"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава шифровање"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Шифровање поруке"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава дешифровање"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Дешифровање поруке"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Можда нећете моћи да увезете кључеве са овим алгоритмом"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Можда нећете моћи да извезете кључеве са овим алгоритмом"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Потписивање поруке"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Шифровање поруке"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Дешифровање поруке"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
-msgstr "Није могуће направити путању за привремено чување"
+msgstr "Не могу да направити путању за привремено чување"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Није могуће уклонити унос из оставе: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "Нема доступног тока"
+
+#: ../camel/camel-db.c:471
+#, c-format
 msgid "Insufficient memory"
 msgstr "Недовољно меморије"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Није могуће уписати унос у лог: %s\n"
+"Не могу да запишем унос дневника: %s\n"
 "Даље операције на овом серверу неће бити извршене када\n"
 "се будете поново повезали на мрежу."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Није могуће отворити „%s“:\n"
+"Не могу да отворим „%s“:\n"
 "%s\n"
 "Промене на овој фасцикли неће бити усклађене."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
-msgstr "Поновно усклађивање са сервером"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Умножи садржај фасцикле локално за рад ван мреже"
+msgstr "Вршим поновно усклађивање са сервером"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
-msgstr "Преузимање нових порука у за рад ван мреже"
+msgstr "Преузимам нове поруке за рад ван мреже"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Припремање фасцикле ’%s‘ за рад ван мреже"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "Припремам фасциклу „%s“ за рад ван мреже"
+
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "Умножи садржај фасцикле локално за рад ван мреже"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Морате да будете на мрежи да би завршили ову операцију"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Нема доступног описа"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Отказано"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Неуспело прављење садржаног процеса ’%s‘: %s"
+msgstr "Нисам успео да направим садржани процес „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Неисправан низ порука примљен од %s: %s"
+msgstr "Неисправан низ порука примљен од „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
-msgstr "Усклађивање фасцикли"
+msgstr "Усклађујем фасцикле"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Грешка при читању филтера: %s: %s"
+msgstr "Грешка приликом читања филтера: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Грешка у примени филтера: %s: %s"
+msgstr "Грешка приликом примене филтера: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Није могуће отварање фасцикле припреме"
+msgstr "Не могу да отворим фасциклу припреме"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Није могућа обрада фасцикле припреме"
+msgstr "Не могу да обрадим фасциклу припреме"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Примање поруке %d (%d%%)"
+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:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка код поруке %d"
 
-#: ../camel/camel-filter-driver.c:1283
-#: ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
-msgstr "Усклађивање фасцикле"
+msgstr "Усклађујем фасциклу"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "Завршено"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Примање поруке %d од %d"
+msgstr "Примам поруку %d од %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка код поруке %d од %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "Неуспело довлачење поруке"
+msgstr "Нисам успео да довучем поруку"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1769,426 @@ msgstr "Неисправни аргументи за (системска-озн�
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "Неипсравни аргументи за (корисничка-ознака)"
+msgstr "Неисправни аргументи за (корисничка-ознака)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка у примени филтера за претрагу: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Није могуће читање израза за претрагу: %s:\n"
+"Не могу да анализирам израз претраге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Грешка при извршавању израза за претрагу: %s:\n"
+"Грешка приликом извршавања израза претраге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) захтева само један логички резултат"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) није дозвољено унутар %s"
 
-#: ../camel/camel-folder-search.c:912
-#: ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) захтева ниску са типом поклапања"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) очекује низ као резултат"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) захтева скуп фасцикли"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподржана операција: прикључење поруке: за %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподржана операција: претрага по изразу: за %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Учим нову спам поруку у „%s“"
+msgstr[1] "Учим нове спам поруке у „%s“"
+msgstr[2] "Учим нове спам поруке у „%s“"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Неподржана операција: пребројавање по изразу: за %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Учим нову хам поруку у %s"
+msgstr[1] "Учим нове хам поруке у %s"
+msgstr[2] "Учим нове хам поруке у %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Неподржана операција: претрага по ЈИБ: за %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Филтрирам нову поруку у „%s“"
+msgstr[1] "Филтрирам нове поруке у „%s“"
+msgstr[2] "Филтрирам нове поруке у „%s“"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:318
 msgid "Moving messages"
-msgstr "Премештање порука"
+msgstr "Премештам поруке"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
-msgstr "Умножавање порука"
+msgstr "Умножавам поруке"
 
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "Учење шта је ђубре"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Довлачим поруку „%s“"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "Учење шта није ђубре"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Нисам успео да извршим гпг: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "Филтрирање поруке(а)"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Непознато"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Јавио се неочекиван статус GnuPG поруке:\n"
+"Дошло је до неочекиване поруке ГнуПГ стања:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Неуспело читање gpg userid подсетника."
+msgstr "Нисам успео да анализирам подсетник гпг иб корисника."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Неуспело читање захтева за gpg лозинком."
+msgstr "Нисам успео да анализирам захтев за гпг лозинком."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"Потребан Вам је ПИН за откључавање кључа за\n"
-"SmartCard: „%s“"
+"Потребан вам је ПИН да откључате кључ\n"
+"Паметне картице: „%s“"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Потребна Вам је лозинка за откључавање кључа\n"
+"Потребна вам је лозинка да откључате кључ\n"
 "корисника: „%s“"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Неочекиван захтев од GnuPG-а за „%s“"
+msgstr "Неочекиван захтев ГнуПГ-а за „%s“"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "Одустато."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Отказано"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Неуспело откључавање тајног кључа: унете су 3 погрешне лозинке."
+msgstr "Нисам успео да откључам тајни кључ: унете су 3 погрешне лозинке."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "Неочекиван одговор од GnuPG-а: %s"
+msgstr "Неочекиван одговор ГнуПГ-а: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Неуспело шифровање: нису означени исправни примаоци."
+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
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Неуспело извршавање gpg: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+msgid "Could not generate signing data: "
+msgstr "Не могу да направим податке за потписивање:"
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Није могуће направити податке за потписивање: %s"
-
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
-msgstr "Неуспело извршавање gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "Ово је део поруке са дигиталним потписом"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Није могућа провера потписа поруке: неисправан облик поруке"
+msgstr "Нисам успео да извршим гпг."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Није могућа провера потписа поруке: није могуће направити привремену датотеку: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Не могу да проверим потпис поруке: неисправан облик поруке"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Није могуће направити податке за шифровање: %s"
+#: ../camel/camel-gpg-context.c:1737
+msgid "Cannot verify message signature: "
+msgstr "Не могу да проверим потпис поруке:"
+
+#: ../camel/camel-gpg-context.c:1858
+msgid "Could not generate encrypting data: "
+msgstr "Не могу да направим податке за шифровање:"
 
-#: ../camel/camel-gpg-context.c:1673
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "Ово је дигитално шифрован део поруке"
 
-#: ../camel/camel-gpg-context.c:1726
-#: ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Није могуће дешифровати поруку: неисправан облик поруке"
+msgstr "Не могу да дешифрујем поруку: неисправан облик поруке"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Није могуће дешифровати MIME део: грешка у протоколу"
+msgstr "Нисам успео да дешифрујем МИМЕ део: грешка у протоколу"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "Шифрован садржај"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "Није могуће прочитати садржај поруке"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Непознато"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Није могуће направити везу ка помоћнику закључавања: %s"
+msgstr "Не могу да направим везу ка помоћнику закључавања: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Није могуће поделити помоћника закључавања: %s"
+msgstr "Не могу да поделим помоћника закључавања: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Није могуће закључати ’%s‘: грешка у протоколу са помоћником закључавања"
+msgstr "Не могу да закључам „%s“: грешка у протоколу са помоћником закључавања"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Није могуће закључати ’%s‘"
+msgstr "Не могу да закључам „%s“"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Није могуће направити закључану датотеку за %s: %s"
+msgstr "Не могу да направим закључану датотеку за „%s“: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Истекло време при покушају прибављања закључане датотеке на %s. Покушајте касније."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Истекло је време приликом покушаја да прибавим закључану датотеку на „%s“. "
+"Покушајте касније."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Неуспело закључавање коришћењем fcntl(2): %s"
+msgstr "Нисам успео да закључам користећи „fcntl(2)“: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Неуспело закључавање коришћењем flock(2): %s"
+msgstr "Нисам успео да закључам користећи „flock(2)“: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Није могућа провера датотеке поште %s: %s"
+msgstr "Не могу да проверим датотеку поште „%s“: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Није могуће отворити датотеку поште %s: %s"
+msgstr "Не могу да отворим датотеку поште „%s“: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Није могуће отворити привремену датотеку поште %s: %s"
+msgstr "Не могу да отворим привремену датотеку поште „%s“: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Неуспело смештање поште у привремену датотеку %s: %s"
+msgstr "Нисам успео да сместим пошту у привремену датотеку „%s“: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Није могуће направити везу: %s"
+msgstr "Не могу да направим везу: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Није могуће поделити: %s"
+msgstr "Не могу да поделим: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Програм за премештање поште је отказао: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Непозната грешка)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Грешка при читању датотеке поште: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Грешка при писању привремене датотеке поште: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Грешка при умножавању привремене датотеке: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "грешка читања"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+msgid "No content available"
+msgstr "Нема доступног садржаја"
 
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Одустато"
+#: ../camel/camel-multipart-signed.c:335
+#, c-format
+msgid "No signature available"
+msgstr "Нема доступног потписа"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "није могуће прављење низа"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "грешка читања"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
-msgstr "Налажење: %s"
+msgstr "Налазим: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
-msgstr "Неуспело тражење домаћина"
+msgstr "Није успело тражење домаћина"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Неуспело тражење домаћина: %s: %s"
+msgstr "Није успело тражење домаћина: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
-msgstr "Налажење адресе"
+msgstr "Налазим адресу"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
-msgstr "Тражење имена неуспело"
+msgstr "Није успело тражење имена"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "Тражење имена неуспело: %s"
+msgstr "Није успело тражење имена: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "Усклађивање порука у фасцикли ’%s‘ са диском"
+msgstr "Усклађујем поруке из фасцикле „%s“ на диск"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Није могућ унос у дневник за фасциклу „%s“: %s"
+msgstr "Не могу да запишем ван мрежни унос у дневник за фасциклу „%s“: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "Понуђач електронске поште са виртуелном фасциклом"
+msgstr "Достављач виртуелне фасцикле е-поште"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "За читање поште као упита другог скупа фасцикли"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Није могуће учитати %s: овај систем не подржава учитавање модула."
+msgstr "Не могу да учитам „%s“: овај систем не подржава учитавање модула."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Није могуће учитати %s: %s"
+msgstr "Не могу да учитам „%s“: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Није могуће учитати %s: нема кода за покретање у модулу."
+msgstr "Не могу да учитам „%s“: нема кода за покретање у модулу."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Нема доступног понуђача за протокол „%s“"
+msgstr "Нема доступног достављача за протокол „%s“"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ова опција ће повезати на сервер коришћењем анонимне пријаве."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
-msgstr "Неуспела аутентификација."
+msgstr "Потврђивање идентитета није успело."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Неисправан податак о пореклу електронске адресе:\n"
+"Неисправан податак о пореклу адресе е-поште:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2197,7 @@ msgstr ""
 "Неисправан податак о сложеном пореклу:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2206,533 @@ msgstr ""
 "Неисправан податак о пореклу:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+msgstr "ЦРАМ-МД5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Ова опција ће повезати на сервер коришћењем сигурносне CRAM-MD5 лозинке, ако је сервер подржава."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Ова опција ће повезати на сервер коришћењем сигурносне ЦРАМ-МД5 лозинке, ако "
+"је сервер подржава."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
+msgstr "ДИГЕСТ-МД5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Ова опција ће повезати на сервер коришћењем сигурносне DIGEST-MD5 лозинке, ако је сервер подржава."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Ова опција ће повезати на сервер коришћењем сигурносне ДИГЕСТ-МД5 лозинке, "
+"ако је сервер подржава."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "Упит на сервер сувише дуг (>2048 октета)"
+msgstr "Упит сервера је сувише дуг (>2048 октета)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "Упит на сервер неисправан\n"
+msgstr "Упит сервера је неисправан\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Упит на сервер је садржао неисправан „Квалитет заштите“ унос"
+msgstr "Упит сервера је садржао неисправан унос „Квалитет заштите“"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Одговор сервера није садржао податке о ауторизацији"
+msgstr "Одговор сервера није садржао податке о овлашћењу"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Одговор сервера је садржао некомплетне податке о ауторизацији"
+msgstr "Одговор сервера је садржао некомплетне податке о овлашћењу"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Одговор сервера се не слаже"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
-msgstr "GSSAPI"
+msgstr "ГССАПИ"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Ова опција ће повезати на сервер коришћењем Kerberos 5 пријаве."
+msgstr ""
+"Ова опција ће повезати на сервер коришћењем Керберос 5 потврђивања "
+"идентитета."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Изабрани механизам понуђени метод не подржава, или га примењен метод није препознао."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Изабрани механизам понуђени метод не подржава, или га примењен метод није "
+"препознао."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
-msgstr "Понуђени параметар target_name није правилно обликован."
+msgstr "Понуђени параметар циљног имена (target_name) није правилно обликован."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Понуђени параметар target_name је садржао неисправан или неподржан тип имена."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Понуђени параметар циљног имена (target_name) је садржао неисправан или "
+"неподржан тип имена."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token садржи различита везивања за канале од оних одређених преко параметра input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"Упит уноса (input_token) садржи различита везивања канала од оних одређених "
+"преко параметра везице ланца уноса (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token садржи неисправну структуру, или потпис није могао бити проверен."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Упит уноса (input_token) садржи неисправну структуру, или потпис није могао "
+"бити проверен."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Пружена уверавања нису била исправна за отпочињање процеса, или је носач уверења дошао без њих."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Пружена уверавања нису била исправна за отпочињање процеса, или је носач "
+"уверења дошао без њих."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Пружен носач садржаја није упућивао на исправан садржај."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Неуспеле провере целовитости на input_token."
+msgstr "Нису успеле провере целовитости на упиту уноса (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "Неуспеле провере целовитости на уверењима."
+msgstr "Нису успеле провере целовитости на уверењима."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "Важење тражених уверења је истекло."
 
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "Лош одговор на аутентификацију од сервера."
+msgstr "Лош одговор потврђивања идентитета са сервера."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Неподржан сигурносни слој."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ова опција ће повезати на сервер коришћењем Kerberos 4 пријаве."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Није могуће добити Kerberos карту:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Пријава"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Ова опција ће повезати на сервер коришћењем обичне лозинке."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Непознато стање аутентификације."
+msgstr "Непознато стање потврђивања идентитета."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
+msgstr "НТЛМ / СПА"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Ова опција ће повезати на Windows сервер коришћењем NTLM / Сигурносне провере лозинке."
+#: ../camel/camel-sasl-ntlm.c:39
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ова опција ће повезати на Виндоуз сервер коришћењем НТМЛ / Сигурносне "
+"провере лозинке."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "ОБИЧНО"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
-msgstr "POP пре SMTP"
+msgstr "ПОП пре СМТП"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ова опција ће одобрити POP везу а затим покушати SMTP"
+msgstr "Ова опција ће одобрити ПОП везу пре покушаја СМТП"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
-msgstr "POP изворна адреса"
+msgstr "ПОП изворна адреса"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP пре SMTP auth коришћењем непознатог транспорта"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "ПОП пре СМТП провере коришћењем непознатог транспорта"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP пре SMTP auth коришћењем извора који није pop"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "ПОП пре СМТП провере коришћењем не-ПОП извора"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Неуспело превођење регуларног израза: %s: %s"
+msgstr "Није успело превођење регуларног израза: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:87
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "Адреса ’%s‘ тражи део са корисничким именом"
+msgstr "Адреса „%s“ тражи део са корисничким именом"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:91
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "Адреса ’%s‘ тражи део са именом домаћина"
+msgstr "Адреса „%s“ тражи део са именом домаћина"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:95
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "Адреса ’%s‘ тражи део са путањом"
+msgstr "Адреса „%s“ тражи део са путањом"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Није могуће направити директоријум %s:\n"
+"Не могу да направим директоријум „%s“:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Унесите %s лозинку за %s на домаћину %s."
-
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel сесија не подржава прослеђивање поруке."
+msgstr "Унесите „%s“ лозинку за „%s“ на домаћину „%s“."
 
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Није могуће налажење сертификата за ’%s‘"
+msgstr "Не могу да нађем уверење за „%s“"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
-msgstr "Није могуће направити CMS поруку"
+msgstr "Не могу да направим ЦМС поруку"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
-msgstr "Није могуће потписивање CMS података"
+msgstr "Не могу да направим ЦМС потписане податке"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
-msgstr "Није могуће приложити потписане CMS податке"
+msgstr "Не могу да приложим ЦМС потписане податке"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
-msgstr "Није могуће приложити CMS податке"
+msgstr "Не могу да приложим ЦМС податке"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
-msgstr "Није могуће прављење података о CMS потписнику"
+msgstr "Не могу да направим податак ЦМС потписника"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
-msgstr "Није могуће налажење ланца сертификата"
+msgstr "Не могу да нађем ланац уверења"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
-msgstr "Није могуће додавање времена CMS потписа"
+msgstr "Не могу да додам време ЦМС потписа"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "Сертификат за шифровање ’%s‘ не постоји"
+msgstr "Уверење шифровања „%s“ не постоји"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Није могуће додавање атрибута SMIMEEncKeyPrefs"
+msgstr "Не могу да додам атрибут СМИМЕ поставки кључа шифровања"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Није могуће додавање атрибута MS SMIMEEncKeyPrefs"
+msgstr "Не могу да додам атрибут МС СМИМЕ поставки кључа шифровања"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
-msgstr "Није могуће додавање сертификата за шифровање"
+msgstr "Не могу да додам уверење шифровања"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
-msgstr "Није могуће додавање податка о CMS потписнику"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Није могуће направити контекст за шифровање."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "Неуспело додавање података у CMS енкодер"
+msgstr "Не могу да додам податак ЦМС потписника"
 
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Неуспело кодирање података"
-
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
-msgstr "Непроверено"
+msgstr "Непроверен"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Добар потпис"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "Лош потпис"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "Садржај је измењен или оштећен при преносу"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
-msgstr "Сертификат потписа није нађен"
+msgstr "Уверење потписа није нађено"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
-msgstr "Сертификат потписа није поверљив"
+msgstr "Уверење потписа није поверљиво"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Алгоритам потписа је непознат"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
-msgstr "Алгоритам потписа је неподржан"
+msgstr "Алгоритам потписа није подржан"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Неисправан потпис"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "Грешка при обради"
 
 # хм, хм...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "Нема потписаног податка у потпису"
+msgstr "Нема назначеног податка у потпису"
 
 # хм, може то и боље од „окружених“...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Недостају збирке из окружених података"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "Није могуће израчунати збирке"
+msgstr "Не могу да израчунам збирке"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "Није могуће поставити збирке порука"
+msgstr "Не могу да поставим збирке порука"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "Неуспео увоз сертификата"
+msgstr "Није успео увоз уверења"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Порука има само сертификат, није могућа провера сертификата"
+msgstr "Уверење је једина порука, не могу да проверим уверење"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Порука има само сертификат, сертификати увезени и проверени"
+msgstr "Уверење је једина порука, уверења су увежена и проверена"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "Није могуће наћи збирке потписа"
+msgstr "Не могу да нађем збирке потписа"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Потписник: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "Не могу да направим контекст шифровања."
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "Нисам успео да додам податак у ЦМС шифрер"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "Нисам успео да шифрујем податке"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
-msgstr "Неуспело декодирање"
+msgstr "Нисам успео да дешифрујем"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Није могуће наћи општи алгоритам за шифровање гомиле"
+msgstr "Не могу да нађем општи алгоритам за шифровање групе"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Није могуће доделити место кључу за шифровање гомиле"
+msgstr "Не могу да доделим место кључу за шифровање групе"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
-msgstr "Није могуће направити CMS поруку"
+msgstr "Не могу да направим ЦМС поруку"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
-msgstr "Није могуће прављење CMS Enveloped data"
+msgstr "Не могу да направим ЦМС обавијене податке"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Није могуће прилагање CMS Enveloped data"
+msgstr "Не могу да приложим ЦМС обавијене податке"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
-msgstr "Није могуће прилагање објекта са CMS подацима"
+msgstr "Не могу да приложим објекат ЦМС података"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
-msgstr "Није могуће прављење CMS податка о примаоцу"
+msgstr "Не могу да направим податак ЦМС примаоца"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
-msgstr "Није могуће додати податак о CMS примаоцу"
+msgstr "Не могу да додам податак ЦМС примаоца"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
-msgstr "Неуспело додавање података у енкодер"
+msgstr "Нисам успео да додам податке у шифрер"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME дешифровање: нису нађени шифровани подаци"
-
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "увоз кључева: неизведено"
-
-#: ../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 "Није могуће добити фасциклу: неисправна операција"
+msgstr "С/МИМЕ дешифровање: нису нађени шифровани подаци"
 
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2177
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "Није могуће направити фасциклу „%s“: фасцикла постоји"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Није могуће направити фасциклу: неисправна операција"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Није могуће направити фасциклу: %s: фасцикла постоји"
-
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Није могуће обрисати фасциклу: %s: неисправна операција"
-
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Није могуће преименовати фасциклу: %s: неисправна операција"
+msgstr "Не могу да направим фасциклу „%s“: фасцикла постоји"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2368 ../camel/camel-store.c:2378
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Смеће"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Ђубре"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Није могуће добијање сертификата издавача"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Није могуће добити листу повучених сертификата"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Није могуће дешифровање потписа сертификата"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Није могуће дешифровање потписа за листу повучених сертификата"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Није могуће дешифровати јавни кључ издавача"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Неуспео потпис сертификата"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Неуспео потпис за листу повучених сертификата"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Сертификат још није важећи"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Сертификат је истекао"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL још није важећи"
+#: ../camel/camel-store.c:2825
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не могу да да направим фасциклу: %s: фасцикла постоји"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL је истекао"
+#: ../camel/camel-store.c:2952 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Не могу да обришем фасциклу: %s: неисправна операција"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Грешка у CRL"
+#: ../camel/camel-store.c:3093 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:700
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Не могу да преименујем фасциклу: %s: неисправна операција"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Нема више меморије"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "Домаћин посредник не подржава СОЦКС4"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Самопотписани сертификат је нулте величине"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "Домаћин посредник је одбио наш захтев: кôд „%d“"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Самопотписани сертификат у ланцу"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Домаћин посредник не подржава СОЦКС5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Није могуће локално добити издавачев сертификат"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Не могу да пронађем одговарајући тип потврђивања идентитета: код 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Није могуће добити потпис листа"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Неуспех општег СОЦКС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Ланац сертификата је предугачак"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Правила СОЦКС сервера не дозвољавају везу"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Повучен сертификат"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "Мрежа је недоступан са СОЦКС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Неисправан издавач сертификата (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Домаћин је недоступан са СОЦКС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Премашена дужина путање"
+#: ../camel/camel-tcp-stream-raw.c:895
+msgid "Connection refused"
+msgstr "Веза је одбијена"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Неисправна сврха"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "Време живота је истекло"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Неповерљив сертификат"
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
+msgstr "СОЦКС сервер не подржава наредбу"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Одбијен сертификат"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
+msgstr "СОЦКС сервер не подржава врсту адресе"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Наслов/издавач неслагање"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "Unknown error from SOCKS server"
+msgstr "Непозната грешка са СОКЦС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID неслагање"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Добих непознату врсту адресе са СОЦКС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/издавач серијско неслагање"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Непотпун одговор са СОЦКС сервера"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Употреба кључа не подржава потпис сертификатом"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Име домаћина је предуго (највише 255 знакова)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Грешка при провери програма"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Неисправан одговор сервера посредника"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2745,16 @@ msgstr ""
 "Отисак:       %s\n"
 "Потпис:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "ДОБРО"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "ЛОШЕ"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Лош сертификат од %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Желите ли ипак да прихватите?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,1609 +2763,1374 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Провера SSL сертификата за %s:\n"
+"Провера ССЛ уверења за „%s“:\n"
 "\n"
 "%s\n"
 "\n"
 "Желите ли да прихватите?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"Проблем са сертификатом: %s\n"
+"Проблем са уверењем: %s\n"
 "Издавач: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Лош домен сертификата: %s\n"
+"Лош домен уверења: %s\n"
 "Издавач: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Истекао сертификат: %s\n"
+"Истекло уверење: %s\n"
 "Издавач: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Истекла листа повучених сертификата: %s\n"
+"Истекао је списак повучених уверења: %s\n"
 "Издавач: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "Није могуће прочитати адресу „%s“"
+msgstr "Не могу да анализирам адресу „%s“"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1263 ../camel/camel-vee-folder.c:1426
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Грешка при смештању „%s“: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Не могу да умножим или преместим поруке у виртуелну фасциклу"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1299
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Нема такве поруке %s у %s"
+msgstr "Нема такве поруке „%s“ у „%s“"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Није могуће умножити или преместити поруке у виртуелну фасциклу"
+#: ../camel/camel-vee-folder.c:1367
+#, c-format
+msgid "Error storing '%s': "
+msgstr "Грешка при смештању „%s“:"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "Непоклопљено"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "Није могуће обрисати фасциклу: %s: нема такве фасцикле"
+msgstr "Не могу да обришем фасциклу: %s: нема такве фасцикле"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Није могуће променити име фасцикли: %s: нема такве фасцикле"
+msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Није могуће умножити поруке у фасциклу за смеће"
+msgstr "Не могу да умножим поруке у фасциклу за смеће"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Није могуће умножити поруке у фасциклу за ђубре"
+msgstr "Не могу да умножим поруке у фасциклу за ђубре"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Није могуће добити поруку: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "Нема такве поруке"
+msgid "Could not load summary for %s"
+msgstr "Не могу да учитам преглед за „%s“"
 
-# Ово је било "корисник поништен", али мислим да је ово ипак исправније
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Корисник одустао"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Није могуће добити поруку %s: %s"
+msgid "Checking for deleted messages %s"
+msgstr "Вршим проверу за избрисаним порукама „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "Ова порука није доступна у режиму ван мреже."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "Прикупљам преглед података нових порука у „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
 msgid "Could not get message"
-msgstr "Није могуће добијање поруке"
+msgstr "Не могу да добавим поруку"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "Није могуће учитавање прегледа за %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "Не могу да додам поруку у фасциклу „%s“: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "Фасцикла за смеће је пуна. Испразните је."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "Не могу да направим поруку: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Прикупљање прегледа података за нове поруке у %s"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Не могу да добавим поруку: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Нема такве поруке"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:462
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Није могуће додати поруку у фасциклу „%s“: %s"
+msgid "Cannot get message %s: "
+msgstr "Не могу да набавим поруку „%s“: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "Није могуће прављење поруке: %s"
+msgid "This message is not available in offline mode."
+msgstr "Ова порука није доступна у режиму ван мреже."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "Није могуће добити садржај фасцикле %s"
+msgstr "Не могу да набавим садржај фасцикле „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Није могуће додати поруку у режиму ван мреже: недоступна остава"
+msgstr "Не могу да приложим поруку у режиму ван мреже: недоступна остава"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Није могуће додавати поруку у режиму ван мреже: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+msgid "Cannot append message in offline mode: "
+msgstr "Не могу да приложим поруку у режиму ван мреже: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "Проверавање за новом поштом"
+msgstr "Вршим проверу за новом поштом"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "Про_вери за нове поруке у свим фасциклама"
+msgstr "П_отражи нове поруке у свим фасциклама"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Опције"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Примени филтере на нове поруке у Сандучету на овом серверу"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Провери да нема ђ_убрета међу новим порукама"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Провери да нема ђубрета само у фасцикли САН_ДУЧЕ"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Аутоматски у_склади налог локално"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
-msgstr "SOAP подешавања"
+msgstr "СОАП подешавања"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Порт СОАП посредника за пошту:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Новел ГроупВајз"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "За приступање Novell Groupwise серверима"
+msgstr "За приступ Новел ГроупВајз серверима"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ова опција ће повезати на GroupWise сервер коришћењем лозинке у обичном тексту."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"Ова опција ће повезати на ГроупВајз сервер коришћењем лозинке у обичном "
+"тексту."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
-msgstr "Домаћин или корисник у адреси нису доступни"
+msgstr "Домаћин или корисник нису доступни у адреси"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "Нисте унели лозинку."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Неке опције можда неће исправно радити на тренутној верзији сервера"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
-msgstr "Нема такве фасцикле %s"
+msgstr "Нема такве фасцикле „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Није могуће прављење GroupWise фасцикли у режиму ван мреже."
+msgstr "Не могу да направим ГроупВајз фасцикле у режиму ван мреже."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Не могу да направим посебну фасциклу система"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Главна фасцикла не може садржати фасцикле у себи"
+msgstr "Главна фасцикла не може да садржи друге фасцикле"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Није могуће преименовати GroupWise фасциклу „%s“ у „%s“"
+msgstr "Не могу да преименујем ГроупВајз фасциклу „%s“ у „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise сервер %s"
+msgstr "ГроупВајз сервер „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise сервис за %s на %s"
+msgstr "ГроупВајз сервис за „%s“ на „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise достава поште преко %s"
+msgstr "ГроупВајз достава поште преко „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
-msgstr "Слање поруке"
+msgstr "Шаљем поруку"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Достигли сте смештајно ограничење за овај налог. Ваше поруке биће одлагане у одлазној пошти. Пошаљите их поново притиском на Пошаљи/Прими дугме након што уклоните или архивирате вашу пошту.\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Није могуће слање поруке: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Проверавање за новом поштом"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Повезивање на сервер"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Користи прилагођену команду за повезивање на сервер"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Команда:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Фасцикле"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "Прик_ажи само пријављене фасцикле"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "П_ремости облик имена фасцикле које даје сервер"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Облик имена"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Хула"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Не могу да добавим фасциклу: неисправна операција"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "За приступање Хула серверима"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"Премашили сте смештајно ограничење за овај налог. Ваше поруке биће одлагане "
+"у одлазној пошти. Пошаљите их поново притиском на дугме „Пошаљи/Прими“ након "
+"што уклоните или архивирате вашу пошту.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ова могућност обезбеђује повезвање на Хула сервер коришћењем лозинке у обичном тексту."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Не могу да пошаљем поруку: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "Без излазног тока"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "Без улазног тока"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
-msgstr "Операција отказана"
+msgstr "Операција је отказана"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Веза са сервером је неочекивано искључена: %s"
 
 #. for imap ALERT codes, account user@host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
-"Упозорење од IMAP сервера %s@%s:\n"
+"Упозорење од ИМАП сервера %s@%s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Неочекиван одговор од IMAP сервера: %s"
+msgstr "Неочекиван одговор ИМАП сервера: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "Неуспела IMAP команда: %s"
+msgstr "Неуспела ИМАП наредба: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Одговор сервера је прерано завршен."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Одговор IMAP сервера није садржао %s податак"
+msgstr "Одговор ИМАП сервера није садржао „%s“ податак"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Неочекиван У реду одговор од IMAP сервера: %s"
+msgstr "Неочекиван потврдан одговор ИМАП сервера: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
-msgstr "Увек провери за нове поруке у овој фасцикли"
+msgstr "Увек провери нове поруке у овој фасцикли"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Није могуће направити директоријум %s: %s"
+msgstr "Не могу да направим директоријум „%s“: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Претрага за измењеним порукама у %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1950
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Неочекивани статус одговора „%s„“ након наредбе APPEND"
+msgstr "Прегледам измењене поруке у „%s“"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1965
-msgid "No response on continuation after APPEND command"
-msgstr "Нема одзива након наредбе APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Непозната грешка се јавила током наредбе APPEND!"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2842
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Није могуће довлачење поруке: %s"
+#: ../camel/providers/imap/camel-imap-folder.c:3369
+msgid "Unable to retrieve message: "
+msgstr "Не могу да довучем поруку: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5211
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Није могуће добити поруку са ИБ %s: %s"
+msgstr "Не могу да набавим поруку са ИБ „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5212
 msgid "No such message available."
 msgstr "Нема такве поруке."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ова порука није тренутно доступна"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Непотпун одговор сервера: подаци нису дати за поруку %d"
+msgstr "Непотпун одговор сервера: нису дати подаци за поруку „%d“"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Непотпун одговор сервера: ЈИБ није дат за поруку %d"
+msgstr "Непотпун одговор сервера: ЈИБ није дат за поруку „%d“"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "Није могуће пронаћи тело поруке у FETCH одговору."
+msgstr "Не могу да пронађем тело поруке у ДОВУЦИ одговору."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Није могуће отворити директоријум оставе: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Не могу да отворим директоријум оставе: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Неуспело привремено чување поруке %s: %s"
+msgstr "Нисам успео привремено да сачувам поруку „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Неуспело привремено чување %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Нисам успео привремено да сачувам поруку „%s“: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Нисам успео привремено да сачувам „%s“: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Вршим проверу за новом поштом"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Про_вери за нове поруке у пријављеним фасциклама"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Облик имена:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Повезивање на сервер"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "При_мени филтере на нове поруке у САНДУЧЕТУ овог сервера"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Користи прилагођену команду за повезивање на сервер"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Наредба:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Фасцикле"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "Прик_ажи само пријављене фасцикле"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "П_ремости облик имена фасцикле које даје сервер"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Облик _имена:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
-msgstr "Провери да нема ђу_брета међу новим порукама"
+msgstr "Провери да нема _непожељног садржаја међу новим порукама"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Аутоматски усклади уд_аљену пошту са локалном"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
-msgstr "IMAP"
+msgstr "ИМАП"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
-msgstr "За читање и смештање поште на IMAP сервере."
+msgstr "За читање и смештање поште на ИМАП сервере."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP сервер %s"
+msgstr ""
+"Ова опција ће повезати на ИМАП сервер коришћењем лозинке у обичном тексту."
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP сервис за %s на %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Није могуће повезивање на %s: %s"
+msgstr "Не могу да се повежем на „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
-msgstr "SSL није доступан"
+msgstr "ССЛ није доступан"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Повезивање отказано"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Не могу да се повежем на „%s“: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Неуспело повезивање на IMAP сервер %s у сигурносном моду: %s"
+msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
-msgstr "STARTTLS није подржано"
+msgstr "СТАРТТЛС није подржано"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
-msgstr "SSL преговори нису успели"
+msgstr "ССЛ преговори нису успели"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
-msgstr "SSL није доступан у овој верзији"
+msgstr "ССЛ није доступан у овој верзији"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Није могуће повезивање командом „%s“: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "Сандуче"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Припрема"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Послато"
+msgid "Connection cancelled"
+msgstr "Повезивање је отказано"
 
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Шаблони"
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Не могу да се повежем са наредбом „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP сервер %s не подржава тражени тип пријаве %s"
+msgstr "ИМАП сервер „%s“ не подржава тражени тип пријављивања идентитета „%s“"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Нема подршке за тип пријаве %s"
+msgstr "Нема подршке за тип потврђивања идентитета „%s“"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Није могућа аутентификација на IMAP сервер.\n"
+"Не могу да потврдим идентитет на ИМАП сервер.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“"
-
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Није могуће направити фасциклу „%s“: фасцикла постоји."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Непозната главна фасцикла: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Неуспело слање команде IMAP серверу %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неочекиван одговор од IMAP4 сервера %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Неочекиван поздрав од IMAP сервера: %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Није могуће изабрати фасциклу „%s“: неисправно име сандучета"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Није могуће изабрати фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Неуспело слање наредбе IMAP серверу %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "сервис није доступан"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Веза са IMAP4 сервером %s је неочекивано прекинута: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "Омогућавање откривања дописне листе је потребно неким филтерима и правилима за вФасцикле"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Истицање запамћених порука које нису прочитане за X секунди"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "Истицање запамћених порукастаријих од X секунди"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Није могуће приступити фасцикли „%s“: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Није могуће ускладити ознаке за фасциклу „%s“: непозната грешка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Није могуће ускладити ознаке за фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Није могуће испразнити фасциклу „%s“: непозната грешка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Није могуће испразнити фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Није могуће добити поруку %s из фасцикле „%s“: нема такве поруке"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Није могуће добити поруку %s из фасцикле „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Није могуће додати поруку у фасциклу „%s“: фасцикла је само за читање"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Није могуће додати поруку у фасциклу „%s“: непозната грешка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Није могуће додати поруку у фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Није могуће преместити поруку из фасцикле „%s“ у фасциклу „%s“: непозната грешка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Није могуће умножити поруке из фасцикле „%s“ у фасциклу „%s“: непозната грешка"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Није могуће преместити поруке из фасцикле „%s“ у фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Није могуће умножити поруку из фасцикле „%s“ у фасциклу „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Провери да нема _ђубрета међу новим порукама"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Провери да нема ђубрета само у фасцикли САНДУЧЕ"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "За читање и смештање поште на IMAPv4rev1 сервере."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ова опција ће повезати на IMAPv4rev1 сервер коришћењем лозинке у обичном тексту."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Повезивање отказано"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Неуспело повезивање на IMAP сервер %s у безбедносном режиму: сервер не подржава STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS преговори нису успели"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Није могућа пријава на IMAP сервер %s помоћу механизма пријаве %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Није могућа пријава на IMAP сервер %s помоћу %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Није могуће прављење IMAP фасцикли у режиму ван мреже."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Није могуће добити фасциклу „%s“ са IMAP сервера %s: непозната грешка"
+msgid "IMAP server %s"
+msgstr "ИМАП сервер „%s“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Није могуће добити LIST информацију за „%s“ са IMAP сервера %s: %s"
+msgid "IMAP service for %s on %s"
+msgstr "ИМАП сервис за „%s“ на „%s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "Лоша команда"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:434
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:701
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Сандуче"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Није могуће направити фасциклу „%s“: неисправно име сандучета"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Није могуће направити фасциклу „%s“: лоша наредба"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Не могу да направим фасциклу „%s“: фасцикла постоји."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Није могуће обрисати фасциклу „%s“: специјална фасцикла"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Није могуће брисање IMAP фасцикли у режиму ван мреже."
+msgid "Unknown parent folder: %s"
+msgstr "Непозната главна фасцикла: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Није могуће обрисати фасциклу „%s“: неисправно име сандучета"
+msgid "Server unexpectedly disconnected"
+msgstr "Веза са сервером је неочекивано искључена"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Није могуће обрисати фасциклу „%s“: лоша наредба"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+msgid "Server unexpectedly disconnected: "
+msgstr "Веза са сервером је неочекивано искључена: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Није могуће преименовати фасциклу „%s“ у „%s“: специјална фасцикла"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Није могуће преименовање IMAP фасцикли у режиму ван мреже."
+msgid "Could not create folder summary for %s"
+msgstr "Не могу да направим сажетак фасцикле за „%s“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Није могуће преименовати фасциклу „%s“ у „%s“: неисправно име сандучета"
+msgid "Could not create cache for %s: "
+msgstr "Не могу да направим оставу за „%s“: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Није могуће преименовати фасциклу „%s“ у „%s“: лоша наредба"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Користи _Брзо поновно усаглашавање ако га сервер подржава"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Није могуће добити податке %s за образац „%s“ са IMAP сервера %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Користи _Умирен ако га сервер подржава"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Није могућа пријава на IMAP фасцикле у режиму ван мреже."
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Наредба:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Није могућа пријава на фасциклу „%s“: неисправно име сандучета"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Број веза из _оставе за коришћење"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Није могућа пријава на фасциклу „%s“: лоша наредба"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Облик имена:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Није могуће одјављивање са IMAP фасцикли у режиму ван мреже."
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "ИМАП+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Није могућа одјава са фасцикле „%s“: неисправно име сандучета"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+msgid "Error writing to cache stream: "
+msgstr "Грешка приликом уписа у ток оставе:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Није могућа одјава са фасцикле „%s“: лоша наредба"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Претрага за измењеним порукама"
+msgid "Not authenticated"
+msgstr "Непотврђеног идентитета"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP сервер %s није усклађен."
+msgid "Could not connect to %s (port %s): "
+msgstr "Не могу да се повежем на „%s“ (порт %s): "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "Прибављање омота за нове поруке"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+msgid "Closing tmp stream failed: "
+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/imapx/camel-imapx-server.c:5357
+#: ../camel/providers/imapx/camel-imapx-server.c:5372
+msgid "Cannot create spool file: "
+msgstr "Не могу да направим датотеку припреме: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Веза са IMAP сервером %s је неочекивано прекинута: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Остава за поруке"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Експериментални IMAP 4(.1) клијент\n"
-"Ово је непроверен и неподржан код, боље користите обичан imap.\n"
-"\n"
-" !!! НЕ КОРИСТИТЕ ОВО ЗА ВАЖНУ ПОШТУ  !!!\n"
+msgid "No such folder: %s"
+msgstr "Нема такве фасцикле: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Није могуће повезивање на %s (порт %s): %s"
+msgid "Source stream returned no data"
+msgstr "Одговор изворног тока је без података"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Није могуће повезивање на POP сервер %s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "Попиши садржаје порука"
+msgid "Source stream unavailable"
+msgstr "Ток извора је недоступан"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "поштанско сандуче:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "Попиши садржаје порука"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Не могу да добавим поруку „%s“ из фасцикле „%s“\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Користите преглед фасцикле „.folders“ (exmh)"
+msgstr "_Користи преглед фасцикле „.folders“ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
-msgstr "MH-обликовани директоријуми поште"
+msgstr "МХ-обликовани директоријуми поште"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "За смештање локалне поште у директоријуме поште налик MH."
+msgstr "За смештање локалне поште у директоријуме поште налик МХ."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Локална достава"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "За довлачење (премештање) локалне поште из mbox облика у фасцикле којим управља Еволуција."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"За довлачење (премештање) локалне поште из стандардне мбокс форматиране "
+"припреме у фасцикле којима управља Еволуција."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Примени филтере на нове поруке у САНДУЧЕТУ"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Директоријуми поште у Maildir облику"
+msgstr "Директоријуми поште у Мејлдир облику"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "За смештање локалне поште у maildir директоријуме."
+msgstr "За смештање локалне поште у мејлдир директоријуме."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_Смести заглавља о статусу у формату Elm/Pine/Mutt"
+msgstr "_Смести заглавља стања у Елм/Пине/Мут формату"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "Стандардна Unix mbox spool датотека"
+msgstr "Стандардна Уникс мбокс датотека припреме"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"За читање и смештање локалне поште у спољне стандардне mbox spool датотеке.\n"
-"Такође се може користити за читање стабла фасцикли у Elm, Pine, или Mutt стилу."
+"За читање и смештање локалне поште у спољне стандардне мбокс датотеке "
+"припреме.\n"
+"Такође се може користити за читање стабла фасцикли у Елм, Пине или Мут стилу."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "Стандардни Unix mbox spool директоријум"
+msgstr "Стандардни Уникс мбокс директоријум припреме"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Остава root %s није апсолутна путања"
+msgstr "Администраторска остава „%s“ није апсолутна путања"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Остава root %s није регуларан директоријум"
+msgstr "Администраторска остава „%s“ није регуларан директоријум"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Није могуће добити фасциклу: %s: %s"
+msgstr "Не могу да добавим фасциклу: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Локалне оставе немају сандуче"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
-msgstr "Локална датотека поште %s"
+msgstr "Локална датотека поште „%s“"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Није могуће преименовати фасциклу %s у %s: %s"
+msgstr "Не могу да преименујем фасциклу „%s“ у „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Није могуће преименовати ’%s‘: %s"
+msgstr "Не могу да преименујем „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "Није могуће обрисати индекс датотеку фасцикле „%s“: %s"
+msgstr "Не могу да обришем индексну датотеку фасцикле „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "Није могуће обрисати мета датотеку фасцикле „%s“: %s"
+msgstr "Не могу да обришем мета датотеку фасцикле „%s“: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Није могуће додати поруку прегледу: непознат разлог"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Прододата maildir порука поништена"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Није могуће додати поруку у maildir фасциклу: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "Не могу да додам поруку прегледу: непознат разлог"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Не могу да додам поруку у фасциклу директоријума поште: %s: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Не могу да добавим поруку „%s“ из фасцикле „%s“: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Не могу да пребацим поруку у одредишну фасциклу: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr ""
-"Није могуће добити поруку: %s из фасцикле %s\n"
-"  %s"
+"Не могу да направим фасциклу „%s“: назив фасцикле не може да садржи тачку."
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Неисправан садржај поруке"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:718
+#, c-format
+msgid "Folder %s already exists"
+msgstr "Фасцикла „%s“ већ постоји"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Није могуће направити фасциклу „%s“: %s"
+msgstr "Не могу да направим фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Није могуће преузети фасциклу „%s“: %s"
+msgstr "Не могу да преузмем фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Није могуће преузети фасциклу „%s“: фасцикла не постоји."
+msgstr "Не могу да преузмем фасциклу „%s“: фасцикла не постоји."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Није могуће добити фасциклу „%s“: није maildir директоријум."
+msgstr "Не могу да преузмем фасциклу „%s“: није директоријум поште."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Није могуће обрисати фасциклу „%s“: %s"
+msgstr "Не могу да обришем фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
-msgstr "није maildir директоријум"
+msgstr "није директоријум поште"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:866
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Није могуће претражити фасциклу „%s“: %s"
+msgstr "Не могу да претражим фасциклу „%s“: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:709
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr ""
+"Не могу да преименујем фасциклу „%s“: назив фасцикле не може да садржи тачку."
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Није могуће отварање путање maildir директоријума: %s: %s"
+msgstr "Не могу да отворим путању директоријума поште: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
-msgstr "Проверавање целовитости фасцикле"
+msgstr "Проверавам целовитост фасцикле"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
-msgstr "Проверавање за нове поруке"
+msgstr "Вршим проверу за новим порукама"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
-msgstr "Смештање фасцикле"
-
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Није могуће закључати фасциклу %s: %s"
+msgstr "Смештам фасциклу"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Није могуће отворити поштанско сандуче: %s: %s\n"
-
-#: ../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:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Није могуће додавање поруке у mbox датотеку: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Не могу да додам поруку у мбокс датотеку: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Фасцикла изгледа непоправљиво оштећена."
+msgstr "Фасцикла изгледа да је непоправљиво оштећена."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "Састављање поруке неуспело."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Не могу да закључам фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Није могуће направити фасциклу овог имена."
+msgstr "Не могу да направим фасциклу овог имена."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "Није могуће добити фасциклу „%s“: није обична датотека."
+msgstr "Не могу да добавим фасциклу „%s“: није обична датотека."
+
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Не могу да направим директоријум „%s“: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Не могу да направим фасциклу: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Фасцикла већ постоји"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Није могуће обрисати фасциклу „%s“:\n"
+"Не могу да обришем фасциклу „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "„%s“ није обична датотека."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Фасцикла „%s“ није празна. Није обрисана."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Није могуће обрисати преглед фасцикле „%s“: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Није могуће направити директоријум „%s“: %s."
+msgstr "Не могу да обришем преглед фасцикле „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Није могуће направити фасциклу: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "Фасцикла већ постоји"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "Ново име фасцикле је неисправно."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "Није могуће преименовати „%s“: „%s“: %s"
+msgstr "Не могу да преименујем „%s“: „%s“: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Није могуће преименовати ’%s‘ у %s: %s"
+msgstr "Не могу да преименујем „%s“ у „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Није могуће отворити фасциклу: %s: %s"
+msgstr "Не могу да отворим фасциклу: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Кобна грешка при читању поште на месту %ld у фасцикли %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Кобна грешка при читању поште на месту %s у фасцикли „%s“"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Није могуће проверити фасциклу: %s: %s"
+msgstr "Не могу да проверим фасциклу: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Није могуће отворити датотеку: %s: %s"
+msgstr "Не могу да отворим датотеку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Није могуће отварање привременог поштанског сандучета: %s"
+msgstr "Не могу да отворим привремено поштанско сандуче: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Није могуће затварање изворне фасцикле %s: %s"
+msgstr "Не могу да затворим изворну фасциклу „%s“: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "Није могуће затварање привремене фасцикле: %s"
+msgstr "Не могу да затворим привремену фасциклу: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Није могуће преименовати фасциклу: %s"
+msgstr "Не могу да преименујем фасциклу: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Није могуће чување фасцикле: %s"
+msgstr "Не могу да сачувам фасциклу: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c: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:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"МБОКС датотека је оштећена, поправите је. (Очекивано је „Из реда“, али нисам "
+"добио.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Неслагање прегледа и фасцикле, чак и након усклађивања"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Непозната грешка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "Неуспело писање у привремено поштанско сандуче: %s"
+msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "Неуспело писање у привремено поштанско сандуче: %s: %s"
-
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "MH додавање поруке отказано"
+msgstr "Нисам успео да запишем у привремено поштанско сандуче: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Није могуће додати поруку у mh фасциклу: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Не могу да додам поруку у мх фасциклу: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Није могуће направити фасциклу „%s“: %s"
+msgstr "Не могу да направим фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Није могуће добити фасциклу „%s“: није директоријум."
+msgstr "Не могу да добавим фасциклу „%s“: није директоријум."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Није могуће отворити путању MH директоријума: %s: %s"
+msgstr "Не могу да отворим путању МХ директоријума: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Припрема „%s“ не може се отворити: %s"
+msgstr "Не могу да отворим припрему „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Припрема „%s“ није регуларна датотека или директоријум"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Припремна датотека поште „%s“"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Стабло фасцикле за припрему „%s“"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Фасцикла „%s/%s“ не постоји."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Није могуће отворити фасциклу „%s“:\n"
+"Не могу да отворим фасциклу „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Фасцикла „%s“ не постоји."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Није могуће направити фасциклу „%s“:\n"
+"Не могу да направим фасциклу „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "„%s“ није датотека сандучета."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Остава не подржава САНДУЧЕ"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Припремна датотека поште %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Фасцикле за припрему не могу бити обрисане"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Стабло фасцикли за припрему %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "Фасцикле за припрему не могу бити преименоване"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "Фасцикле за припрему не могу бити обрисане"
-
+#: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Није могуће ускладити привремену фасциклу %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Не могу да ускладим привремену фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Није могуће ускладити фасциклу за припрему %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Не могу да ускладим фасциклу за припрему „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Није могуће ускладити фасциклу за припрему %s: %s\n"
+"Не могу да ускладим фасциклу за припрему „%s“: %s\n"
 "Фасцикла је можда оштећена, умножите сачувано у „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
 #: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Унутрашња грешка: ЈИБ у неисправном облику: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:376
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Не могу да добавим поруку „%s“: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Неуспела пошиљка: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "Неуспела пошиљка: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Не можете послати NNTP поруке ако нисте повезани!"
+msgstr "Не можете да пошаљете ННТП поруке ако нисте повезани!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Не можете умножити поруке из NNTP фасцикле!"
+msgstr "Не можете да умножите поруке из ННТП фасцикле!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Прикажи фасцикле у кратком запису (нпр. c.o.linux уместо comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_Прикажи фасцикле у кратком запису (нпр. „c.o.linux“ уместо „comp.os.linux“)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "У п_розорчету за пријаву, прикажи релативна имена фасцикли"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET вести"
+msgstr "ЈУЗНЕТ вести"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Ово је понуђач за читање и слање на USENET групе вести."
+msgstr "Ово је достављач за читање и слање на ЈУЗНЕТ групе вести."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Ова опција ће пријавити на ННТП сервер коришћењем лозинке у обичном тексту."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "Потребно је потврђивање идентитета али корисничко име није унето"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Ова опција ће пријавити на NNTP сервер коришћењем лозинке у обичном тексту."
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Не могу да потврдим идентитет на серверу: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Није могуће читање поздрава од %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Не могу да прочитам поздрав са „%s“: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP сервер %s је узвратио кодом о грешци %d: %s"
+msgstr "ННТП сервер „%s“ је вратио код грешке „%d“: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET вести преко %s"
+msgstr "ЈУЗНЕТ вести преко „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4141,677 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"Не можете се пријавити на ову групу вести:\n"
+"Не можете да се пријавите на ову групу вести:\n"
 "\n"
 "Нема такве групе. Изабрана ставка је вероватно надређена фасцикла."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"Не можете се одјавити са ове групе вести:\n"
+"Не можете да се одјавите са ове групе вести:\n"
 "\n"
 "група не постоји!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Не можете направити фасциклу у остави вести: пријавите се уместо тога."
+msgstr ""
+"Не можете да направите фасциклу у остави вести: пријавите се уместо тога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, c-format
 msgid "You cannot rename a folder in a News store."
-msgstr "Не можете преименовати фасциклу у остави вести."
+msgstr "Не можете да преименујете фасциклу у остави вести."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:982
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Не можете уклонити фасциклу у остави вести: одјавите се уместо тога."
+msgstr ""
+"Не можете да уклоните фасциклу у остави вести: одјавите се уместо тога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "Потребна аутентификација али корисничко име није унето"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "ННТП наредба није успела: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "Cannot authenticate to server: %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:1360
 msgid "Not connected."
 msgstr "Неповезано."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "Нема такве фасцикле: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: претраживање нових порука"
+msgstr "%s: претражујем нове поруке"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Неочекиван одговор xover-а: %s"
+msgstr "Неочекиван одговор ксовера: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Неочекиван одговор head-а: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "Користите одустани"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Неуспела операција: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:282
+#: ../camel/providers/pop3/camel-pop3-folder.c:341
+#, c-format
+msgid "No message with UID %s"
+msgstr "Нема поруке са ЈИБ %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Довлачим ПОП поруку %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:454
+msgid "Unknown reason"
+msgstr "Непознат разлог"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Retrieving POP summary"
-msgstr "Преузимање POP прегледа"
+msgstr "Преузимам ПОП преглед"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:518
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Није могуће добити POP преглед: %s"
+msgstr "Не могу да добавим ПОП преглед: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Expunging old messages"
-msgstr "Избацивање старих порука"
+msgstr "Избацујем старе поруке"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:590
 msgid "Expunging deleted messages"
-msgstr "Избацивање обрисаних порука"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Нема порука са ЈИБ %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Довлачење POP поруке %d"
+msgstr "Избацујем обрисане поруке"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Непознат разлог"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "Остава за поруке"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Остави поруке на серверу"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "О_бриши након %s дана"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "Обриши _избачено из локалне „Долазно“"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
-msgstr "Искључи _подршку за сва POP3 проширења"
+msgstr "Искључи _подршку за сва ПОП3 проширења"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
-msgstr "POP"
+msgstr "ПОП"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "За повезивање и преузимање поште са POP сервера."
+msgstr "За повезивање и преузимање поште са ПОП сервера."
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Ова опција ће повезати на ПОП сервер коришћењем лозинке у обичном тексту. "
+"Ово је једина опција коју подржавају многи ПОП сервери."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c: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:85
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Ова опција ће повезати на ПОП сервер коришћењем лозинке преко АПОП "
+"протокола. Ово можда неће радити свим корисницима чак и на серверима који "
+"тврде да то подржавају."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Ова опција ће повезати на POP сервер коришћењем лозинке преко APOP протокола. Ово можда неће радити свим корисницима чак и на серверима који тврде да то подржавају."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Неуспело читање исправног поздрава POP сервера %s"
+msgstr "Неуспело читање исправног поздрава ПОП сервера „%s“"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Није могуће повезивање на POP сервер %s у сигурносном режиму %s"
+msgstr "Нисам успео да се повежем на ПОП сервер „%s“ у безбедном режиму: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
-msgstr "Сервер не подржава STLS"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:257
-msgid "TLS is not available in this build"
-msgstr "TLS није доступан у овом издању"
+msgstr "Сервер не подржава СТЛС"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 #, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Није могуће повезивање на POP сервер %s"
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Нисам успео да се повежем на ПОП сервер „%s“ у безбедном режиму%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "ТЛС преговори нису успели"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+msgid "TLS is not available in this build"
+msgstr "ТЛС није доступан у овом издању"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Није могуће повезивање на POP сервер %s: тражени механизам аутентификације није подржан."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Не могу да се повежем на ПОП сервер „%s“: тражени начин потврђивања "
+"идентитета није подржан."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Неуспела SASL пријава „%s“ на POP сервер %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Није успела САСЛ пријава „%s“ на ПОП сервер %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Није могућа пријава на POP сервер %s: грешка SASL протокола"
+msgstr "Не могу да се пријавим на ПОП сервер „%s“: грешка САСЛ протокола"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Није могућа аутентификација на POP сервер %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Нисам успео да потврдим идентитет на ПОП серверу „%s“: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Није могуће повезивање на POP сервер %s: примљен \tInvalid APOP ИБ. Могућ напад заменом идентитета. Обратите се админу."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Не могу да се повежем на ПОП сервер „%s“: примих Неисправан АПОП ИБ. Могућ "
+"је напад заменом идентитета. Обратите се админу."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"Није могуће повезивање на POP сервер %s.\n"
+"Не могу да се повежем на ПОП сервер „%s“.\n"
 "Грешка при слању лозинке: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
-"Није могуће повезивање на POP сервер %s.\n"
-"Грешка при слању корисничког имена: %s"
+"Не могу да се повежем на ПОП сервер „%s“.\n"
+"Грешка при слању корисничког имена%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"Не могу да се повежем на ПОП сервер „%s“.\n"
+"Грешка при слању лозинке%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "ПОП3 сервер „%s“"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "ПОП3 сервер за „%s“ на „%s“"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Не могу да се повежем на ПОП сервер „%s“"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:721
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Нема такве фасцикле „%s“."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:738
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "ПОП3 остава нема хијерархију фасцикли"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "За доставу поште прослеђивањем „sendmail“ програму на локалном систему."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"За доставу поште прослеђивањем „sendmail“ програму на локалном систему."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Достава поште преко програма сендмејл"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "Није могуће читање листе прималаца"
+msgstr "Не могу да анализирам списак прималаца"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Није могуће направити везу ка sendmail-у: %s: пошта није послата"
+msgstr "Не могу да направим везу ка сендмејлу: %s: пошта није послата"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Није могуће поделити sendmail: %s: пошта није послата"
+msgstr "Не могу да поделим сендмејл: %s: пошта није послата"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "Не могу да пошаљем поруку: %s"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail је завршио сигналом %s: пошта није послата."
+msgstr "сендмејл је завршио сигналом „“%s: пошта није послата."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Није могуће извршити %s: пошта није послата."
+msgstr "Не могу да извршим „%s“: пошта није послата."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail је завршио са статусом %d: пошта није послата."
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "Достава поште преко програма sendmail"
+msgstr "сендмејл је завршио са статусом „%d“: пошта није послата."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
-msgstr "SMTP"
+msgstr "СМТП"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "За доставу поште повезивањем на прослеђивач поште у мрежи коришћењем SMTP."
+msgstr ""
+"За доставу поште повезивањем на прослеђивач поште у мрежи коришћењем СМТП."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Грешка одговора добродошлице: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Не могу да се повежем на СМТП сервер „%s“ у сигурносном режиму: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "Неуспела СТАРТТЛС наредба: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "СМТП сервер „%s“"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "СМТП достава поште преко „%s“"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "СМТП сервер „%s“ не подржава тражени тип потврђивања идентитета „%s“."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Не могу да потврдим идентитет на СМТП серверу.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Не могу да пошаљем поруку: сервис није повезан."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "Не могу да пошаљем поруку: адреса пошиљаоца није исправна."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "Слање поруке"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Не могу да пошаљем поруку: нису одређени примаоци."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Не могу да пошаљем поруку: један или више неисправних прималаца"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
-msgstr "Грешка у синтакси, команда није препозната"
+msgstr "Грешка у синтакси, наредба није препозната"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "Грешка у синтакси у параметрима или аргументима"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
-msgstr "Команда није подржана"
+msgstr "Наредба није подржана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
-msgstr "Параметар команде није подржан"
+msgstr "Параметар наредбе није подржан"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "Статус система, или одговор на помоћ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "Порука о помоћи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
-msgstr "Сервис спреман"
+msgstr "Сервис је спреман"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "Сервис затвара канал преноса"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
-msgstr "Сервис није доступан, затварање канала преноса"
+msgstr "Сервис није доступан, затварам канал преноса"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
-msgstr "Тражена радња за пошту у реду, завршено"
+msgstr "Тражена радња за пошту је у реду, завршено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "Корисник није локалан; биће прослеђено на <путања-прослеђивања>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Тражена радња за пошту није предузета: недоступно поштанско сандуче"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Тражена радња није предузета: недоступно поштанско сандуче"
+msgstr "Тражена радња није предузета: поштанско сандуче је недоступно"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "Тражена радња није предузета: грешка при обради"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "Корисник није локалан; покушајте <путања-прослеђивања>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Тражена радња није предузета: недовољно простора на систему"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Одустато од тражене радње за пошту: премашен додељен простор"
+msgstr "Прекинута је тражена радња за пошту: премашен је додељен простор"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Тражена радња није предузета: име поштанског сандучета није дозвољено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Почиње унос поште; завршава са <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "Неуспео пренос"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "Потребно је слање лозинке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
-msgstr "Механизам аутентификације је преслаб"
+msgstr "Механизам потврђивања идентитета је преслаб"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Неопходно шифровање за тражени механизам аутентификације"
+msgstr "Неопходно је шифровање за тражени механизам потврђивања идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
-msgstr "Неуспела привремена аутентификација"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Грешка код одговора добродошлице"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Није могуће повезивање на SMTP сервер %s у сигурносном режиму: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Неуспела STARTTLS команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Неуспела STARTTLS команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP сервер %s не подржава тражени тип аутентификације %s."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Није могућа аутентификација на SMTP сервер.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP сервер %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP достава поште преко %s"
+msgstr "Није успело привремено потврђивање идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "Није могуће слање поруке: сервис није повезан."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "Није могуће слање поруке: адреса пошиљаоца није исправна."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "Слање поруке"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "Није могуће слање поруке: нису одређени примаоци."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Није могуће слање поруке: један или више неисправних прималаца"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
-msgstr "SMTP поздрав"
-
-#: ../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:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "Неуспела наредба „HELO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
-msgstr "SMTP аутентификација"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "Грешка при прављењу објекта SASL аутентификације."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Неуспела AUTH команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Неуспела AUTH команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "Лош одговор на аутентификацију од сервера.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Неуспела MAIL FROM команда: %s: пошта није послата"
+msgstr "СМТП потврђивање идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Неуспела MAIL FROM команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Неуспела RCPT TO команда: %s: пошта није послата"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> неуспело"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Неуспела DATA команда: %s: пошта није послата"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Неуспела DATA команда"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
-msgid "RSET command failed: %s"
-msgstr "Неуспела RSET команда: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Неуспела RSET команда"
+msgid "Error creating SASL authentication object."
+msgstr "Грешка при прављењу објекта САСЛ потврђивања идентитета."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "Неуспела наредба „AUTH“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "Неуспела наредба „MAIL FROM“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "Неуспела наредба „RCPT TO“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> није успело"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "Неуспела наредба „DATA“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "Неуспела наредба „RSET“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "Неуспела наредба „QUIT“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Неуспела QUIT команда: %s"
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Годишњица"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Неуспела QUIT команда"
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Рођендан"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "Посао"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Надметање"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Омиљено"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Поклони"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Циљеви/задаци"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Празник"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Честитке"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Важни контакти"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Идеје"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "Међународно"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Важна муштерија"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Разно"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Лично"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Телефонски позиви"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Статус"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Стратегије"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Добављачи"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Време и издаци"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
-msgstr "VIP"
+msgstr "ВИП"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Чекање"
 
@@ -4772,8 +4819,7 @@ msgstr "Чекање"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4827,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4835,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4843,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:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707
-#: ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834
-#: ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838
-#: ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4883,200 +4922,199 @@ 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:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1875
 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:673
 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:435
 msgid "Failed to authenticate.\n"
-msgstr "Неуспела аутентификација.\n"
+msgstr "Нисам успео да потврдим идентитет.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "У подешавању већ постоји категорија ’%s‘. Изаберите друго име"
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Особине категорије"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "Икона"
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "И_ме категорије"
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "Категорија"
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "_Иконица категорије"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
-msgstr "Икона категорије"
+msgstr "Иконица категорије"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "Особине категорије"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_Икона категорије"
+#: ../libedataserverui/e-categories-dialog.c:191
+msgid "_No Image"
+msgstr "_Без слике"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "И_ме категорије"
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "У подешавању већ постоји категорија „%s“. Изаберите друго име"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Предмет(и) припада(ју) овим _категоријама:"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "Тренутно _коришћене категорије:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "_Доступне категорије:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "категорије"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Иконица"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Категорија"
+
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Израда категорије „%s“"
 
-#: ../libedataserverui/e-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:176
+msgid "Show Contacts"
+msgstr "Прикажи контакте"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "Изаберите контакте из адресара"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "А_дресар:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "_Додај"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Катего_рија:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "_Уклони"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_Претражи:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "Ко_нтакти"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>Ко_нтакти</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Прикажи контакте</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "А_дресар:"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Претрага"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "_Адресар"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.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.c:295
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "Претрага"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Изаберите контакте из адресара"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_Претражи:"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Додај"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "Грешка приликом учитавања адресара: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Простри %s унутар"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "У_множи %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "И_сеци %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "_Уреди %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
-msgstr "_Уклони %s"
+msgstr "_Уклони „%s“"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Кључ привеска није употребљив: нема корисника нити домаћина"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
-msgstr "Морате да укључите велика слова."
+msgstr "Укључили сте велика слова."
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Запамти ову лозинку"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -5085,329 +5123,855 @@ msgstr "_Запамти ову лозинку до краја ове сесиј�
 msgid "Select destination"
 msgstr "Изаберите одредиште"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:170
 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 "Verifying message"
+#~ msgstr "Проверавање поруке"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Нема довољно простора за прављење фасцикле"
+#~ msgid "Cannot open message"
+#~ msgstr "Није могуће отворити поруку"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Фасцикла није празна"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Неподржана операција: прикључење поруке: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Наведена фасцикла није пронађена"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Неподржана операција: претрага по изразу: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Функција није примењена у овој остави"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Неподржана операција: пребројавање по изразу: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Операција није подржана"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Неподржана операција: претрага по ЈИБ: за %s"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Наведени тип у овој остави није подржан"
+#~ msgid "Learning junk"
+#~ msgstr "Учење шта је ђубре"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "Наведена фасцикла не може бити измењена нити уклоњена"
+#~ msgid "Learning non-junk"
+#~ msgstr "Учење шта није ђубре"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Није могуће направити фасциклу тако да се налази у њој самој"
+#~ msgid "Canceled."
+#~ msgstr "Одустато."
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Није могуће направити фасциклу тога имена"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Ово је део поруке са дигиталним потписом"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Ова операција не може бити изведена у режиму ван мреже."
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Није могућа провера потписа поруке: није могуће направити привремену "
+#~ "датотеку: %s"
 
-#. 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 "Unable to parse message content"
+#~ msgstr "Није могуће прочитати садржај поруке"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "Личне фасцикле"
+#~ msgid "cannot create thread"
+#~ msgstr "није могуће прављење низа"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Омиљене јавне фасцикле"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All 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:1311
-msgid "Global Address List"
-msgstr "Глобална листа адреса"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Није могуће добити Kerberos карту:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Обрисани предмети"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel сесија не подржава прослеђивање поруке."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Дневник"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "увоз кључева: неизведено"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Белешке"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "извоз кључева: неизведено"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Одлазна"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Није могуће направити фасциклу: неисправна операција"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Послати предмети"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Није могуће добијање сертификата издавача"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Задужења"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Није могуће добити листу повучених сертификата"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Неисправно повезивање"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Није могуће дешифровање потписа сертификата"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Неисправан одговор сервера"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Није могуће дешифровање потписа за листу повучених сертификата"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Нема одговора сервера"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Није могуће дешифровати јавни кључ издавача"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Лош параметар"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Неуспео потпис сертификата"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Подршка датотеке адресара за Еволуцију"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Неуспео потпис за листу повучених сертификата"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Датотека календара и webcal подршка за Еволуцију"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Сертификат још није важећи"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Сервис за проверу сучеља Сервера података Еволуције"
+#~ msgid "Certificate has expired"
+#~ msgstr "Сертификат је истекао"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Сервис за пријаву Сервера података Еволуције"
+#~ msgid "CRL not yet valid"
+#~ 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 "CRL has expired"
+#~ msgstr "CRL је истекао"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Грешка у CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "Нема више меморије"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Самопотписани сертификат је нулте величине"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Самопотписани сертификат у ланцу"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Није могуће локално добити издавачев сертификат"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Није могуће добити потпис листа"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Ланац сертификата је предугачак"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "Повучен сертификат"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Неисправан издавач сертификата (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "Премашена дужина путање"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Неисправна сврха"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Неповерљив сертификат"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Одбијен сертификат"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Наслов/издавач неслагање"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID неслагање"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/издавач серијско неслагање"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Употреба кључа не подржава потпис сертификатом"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Грешка при провери програма"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Лош сертификат од %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Желите ли ипак да прихватите?"
+
+# Ово је било "корисник поништен", али мислим да је ово ипак исправније
+#~ msgid "User canceled"
+#~ msgstr "Корисник одустао"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Фасцикла за смеће је пуна. Испразните је."
+
+#~ msgid "Hula"
+#~ msgstr "Хула"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "За приступање Хула серверима"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Ова могућност обезбеђује повезвање на Хула сервер коришћењем лозинке у "
+#~ "обичном тексту."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Неочекивани статус одговора „%s„“ након наредбе APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Нема одзива након наредбе APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Непозната грешка се јавила током наредбе APPEND!"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "При_мени филтере на нове поруке у САНДУЧЕТУ овог сервера"
+
+#~ msgid "Drafts"
+#~ msgstr "Припрема"
+
+#~ msgid "Sent"
+#~ msgstr "Послато"
+
+#~ msgid "Templates"
+#~ msgstr "Шаблони"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Неуспело слање команде IMAP серверу %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Неочекиван одговор од IMAP4 сервера %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Неочекиван поздрав од IMAP сервера: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Није могуће изабрати фасциклу „%s“: неисправно име сандучета"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Није могуће изабрати фасциклу „%s“: лоша наредба"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Неуспело слање наредбе IMAP серверу %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Веза са IMAP4 сервером %s је неочекивано прекинута: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Омогућавање откривања дописне листе је потребно неким филтерима и "
+#~ "правилима за вФасцикле"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Истицање запамћених порука које нису прочитане за X секунди"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Истицање запамћених порукастаријих од X секунди"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Није могуће приступити фасцикли „%s“: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Није могуће ускладити ознаке за фасциклу „%s“: непозната грешка"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Није могуће ускладити ознаке за фасциклу „%s“: лоша наредба"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Није могуће испразнити фасциклу „%s“: непозната грешка"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Није могуће испразнити фасциклу „%s“: лоша наредба"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Није могуће добити поруку %s из фасцикле „%s“: нема такве поруке"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Није могуће добити поруку %s из фасцикле „%s“: лоша наредба"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Није могуће додати поруку у фасциклу „%s“: фасцикла је само за читање"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Није могуће додати поруку у фасциклу „%s“: непозната грешка"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Није могуће додати поруку у фасциклу „%s“: лоша наредба"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Није могуће преместити поруку из фасцикле „%s“ у фасциклу „%s“: непозната "
+#~ "грешка"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Није могуће умножити поруке из фасцикле „%s“ у фасциклу „%s“: непозната "
+#~ "грешка"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Није могуће преместити поруке из фасцикле „%s“ у фасциклу „%s“: лоша "
+#~ "наредба"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Није могуће умножити поруку из фасцикле „%s“ у фасциклу „%s“: лоша наредба"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Провери да нема _ђубрета међу новим порукама"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Провери да нема ђубрета само у фасцикли САНДУЧЕ"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "За читање и смештање поште на IMAPv4rev1 сервере."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Ова опција ће повезати на IMAPv4rev1 сервер коришћењем лозинке у обичном "
+#~ "тексту."
+
+#~ 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 "categories"
+#~ msgstr "категорије"
+
+#~ msgid "Color Info"
+#~ msgstr "Подаци о бојама"
+
+#~ msgid "The color to render"
+#~ msgstr "Боја за обраду"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>Ко_нтакти</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Прикажи контакте</b>"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Унесите лозинку за %s"
+
+#~ msgid "Enter password"
+#~ msgstr "Унесите лозинку"
+
+#~ msgid "Owner"
+#~ msgstr "Власник"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "Уређивач за објављивање"
+
+#~ msgid "Editor"
+#~ msgstr "Уређивач"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Аутор за објављивање"
+
+#~ msgid "Author"
+#~ msgstr "Аутор"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "Аутор који не уређује"
+
+#~ msgid "Reviewer"
+#~ msgstr "Рецензент"
+
+#~ msgid "Contributor"
+#~ msgstr "Сарадник"
+
+#~ msgid "None"
+#~ msgstr "Ништа"
+
+#~ msgid "Custom"
+#~ msgstr "Прилагођено"
+
+#~ msgid "Generic error"
+#~ msgstr "Општа грешка"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Фасцикла истог имена већ постоји"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Наведен тип фасцикле није исправан"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Нема довољно простора за прављење фасцикле"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Фасцикла није празна"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Наведена фасцикла није пронађена"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функција није примењена у овој остави"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Операција није подржана"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Наведени тип у овој остави није подржан"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Наведена фасцикла не може бити измењена нити уклоњена"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Није могуће направити фасциклу тако да се налази у њој самој"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Није могуће направити фасциклу тога имена"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ова операција не може бити изведена у режиму ван мреже."
+
+#~ msgid "%s's Folders"
+#~ msgstr "Фасцикле чији је власник %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "Личне фасцикле"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Омиљене јавне фасцикле"
+
+#~ msgid "All Public Folders"
+#~ msgstr "Све јавне фасцикле"
+
+#~ msgid "Global Address List"
+#~ msgstr "Глобална листа адреса"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Обрисани предмети"
+
+#~ msgid "Journal"
+#~ msgstr "Дневник"
+
+#~ msgid "Notes"
+#~ msgstr "Белешке"
+
+#~ msgid "Outbox"
+#~ msgstr "Одлазна"
+
+#~ msgid "Sent Items"
+#~ msgstr "Послати предмети"
+
+#~ msgid "Tasks"
+#~ msgstr "Задужења"
+
+#~ msgid "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 +5989,17 @@ msgstr "Дошло је до вишеструких прекорачења се�
 #~ "имена (нпр. „ДОМЕН\\корисник\").\n"
 #~ "Или сте можда само погрешно укуцали лозинку.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox за %s није на овом серверу."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "Сервер '%s' користи Exchange 5.5 и стога\n"
 #~ "није компатибилан са Ximian Connector-ом"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +6008,37 @@ msgstr "Дошло је до вишеструких прекорачења се�
 #~ "Није могуће пронаћи Exchange Web Storage System на %s.\n"
 #~ "Уколико OWA ради на другој путањи, морате је навести у\n"
 #~ "подешавању налога."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "Нема mailbox-а за корисника %s на %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "Није могуће повезивање на сервер %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Није могуће повезивање на домаћина"
+
 #~ msgid "Network error"
 #~ msgstr "Грешка на мрежи"
+
 #~ msgid "Folder Name"
 #~ msgstr "Име фасцикле"
+
 #~ msgid "Folder Size"
 #~ msgstr "Величина фасцикле"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise сервер %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: отказан"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: нема доступних творница за адресу „%s“"
+
 #~ msgid "File As"
 #~ msgstr "Заведи као"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +6047,153 @@ msgstr "Дошло је до вишеструких прекорачења се�
 #~ "Нисам могао да применим GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "Нисам могао да применим GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "Адресар и календар"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "Агент за пошту:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "Користи безбедну везу (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "Списак за оверу"
+
 #~ msgid "Server rejected username"
 #~ msgstr "Сервер је одбио корисника"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "Неуспешно слање корисничког имена серверу"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "Сервер је одбио корисника/лозинку"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "Нисам могао да преузмем списак група са сервера."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "Не могу да учитам датотеку са списком група за %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Не могу да сачувам датотеку са списком група за %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "Датотека адресара и LDAP подршка за Еволуцију"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? очекује 1 аргумент"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? очекује 1 аргумент да буде ниска"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "позван је e_book_add_contact на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba изузетак позива Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "позван је e_book_commit_contact на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba изузетак позива Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba изузетак позива Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba изузетак позива Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba изузетак позива Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba изузетак позива Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact на именику пре e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba изузетак позива Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba изузетак позива Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba изузетак позива Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes на именику пре e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba изузетак позива Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba изузетак позива Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove на именику пре e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "време-сада очекује 0 аргумената"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "унеси-време очекује да аргумент 1 буде низ"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "додај-време очекује 2 аргумента"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "време-почетка-дана очекује 1 аргумент"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "време-почетка-дана очекује да аргумент 1 буде time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "време-краја-дана очекује 1 аргумент"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "деси-се-у-периоду? очекује 2 аргумента"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "деси-се-у-периоду? очекује да аргумент 1 буде time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "деси-се-у-периоду? очекује да аргумент 2 буде time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "понавља-се? не очекује аргументе"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "је-готов? очекује 0 аргумената"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "готов-пре? очекује 1 аргумент"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "готов-пре? очекује да аргумент 1 буде time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "На овом рачунару"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 7c5dbdc6f..dc1bc5337 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,225 +1,188 @@
 # Serbian translation of evolution-data-server
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution-data-server package.
-#
 # Maintainer: Danilo Šegan <dsegan@gmx.net>
 # Reviewed on 2005-08-20 by: Igor Nestorović <igor@prevod.org>
-#
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 07:35+0100\n"
-"PO-Revision-Date: 2009-03-11 07:44+0100\n"
-"Last-Translator: Goran Rakić <grakic@devbase.net>\n"
-"Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-06-21 10:31+0000\n"
+"PO-Revision-Date: 2011-06-17 22:35+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
+#: ../addressbook/backends/file/e-book-backend-file.c:574
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2326
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
-msgstr "Učitavanje je u toku..."
+msgstr "Učitavam..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
+#: ../addressbook/backends/file/e-book-backend-file.c:577
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2257
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2279
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2324
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "Pretraživanje je u toku..."
+msgstr "Pretražujem..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contacts…"
+msgstr "Propitujem za ažuriranim kontaktima..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/libebook/e-book.c:3476 ../calendar/libecal/e-cal.c:1069
+msgid "Personal"
+msgstr "Lično"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Prijatelji"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Porodica"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Saradnici"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groups…"
+msgstr "Propitujem za ažuriranim grupama..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contact…"
+msgstr "Stvaram novi kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contact…"
+msgstr "Brišem kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contact…"
+msgstr "Menjam kontakt..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loading…"
+msgstr "Učitavam..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the server…"
+msgstr "Potvrđujem identitet sa serverom..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Preuzimanje kontakata (%d)... "
+msgstr "Preuzimam kontakte (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2853
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3034
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3081
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "Osvežavanje preuzetih kontakata (%d)... "
+msgstr "Osvežavam preuzete kontakte (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "Nisam povezan"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
-msgstr "Korišćenje istaknutog imena (DN)"
+msgstr "Koristim istaknuto ime (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "Korišćenje elektronske adrese"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
-msgstr "Ponovno povezivanje na LDAP server..."
+msgstr "Ponovo se povezujem na LDAP server..."
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+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:1675
 msgid "Adding contact to LDAP server..."
-msgstr "Dodavanje kontakta na LDAP server..."
+msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
-msgstr "Uklanjanje kontakta sa LDAP servera..."
+msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
-msgstr "Menjanje kontakta sa LDAP servera..."
+msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
-msgstr "Primanje rezultata pretrage sa LDAP servera..."
+msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "Greška tokom pretrage"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:288
-#: ../addressbook/libebook/e-book.c:292
-#: ../addressbook/libebook/e-book.c:496
-#: ../addressbook/libebook/e-book.c:500
-#: ../addressbook/libebook/e-book.c:639
-#: ../addressbook/libebook/e-book.c:643
-#: ../addressbook/libebook/e-book.c:730
-#: ../addressbook/libebook/e-book.c:734
-#: ../addressbook/libebook/e-book.c:1028
-#: ../addressbook/libebook/e-book.c:1033
-#: ../addressbook/libebook/e-book.c:1211
-#: ../addressbook/libebook/e-book.c:1215
-#: ../addressbook/libebook/e-book.c:1370
-#: ../addressbook/libebook/e-book.c:1374
-#: ../addressbook/libebook/e-book.c:1575
-#: ../addressbook/libebook/e-book.c:1579
-#: ../addressbook/libebook/e-book.c:1818
-#: ../addressbook/libebook/e-book.c:1822
-#: ../addressbook/libebook/e-book.c:2055
-#: ../addressbook/libebook/e-book.c:2059
-#: ../addressbook/libebook/e-book.c:2263
-#: ../addressbook/libebook/e-book.c:2267
-#: ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "„%s“ u knjizi pre „%s“"
-
-#: ../addressbook/libebook/e-book.c:301
-#: ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:652
-#: ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:1043
-#: ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1384
-#: ../addressbook/libebook/e-book.c:1588
-#: ../addressbook/libebook/e-book.c:1831
-#: ../addressbook/libebook/e-book.c:2069
-#: ../addressbook/libebook/e-book.c:2276
-#: ../addressbook/libebook/e-book.c:2685
-#: ../addressbook/libebook/e-book.c:2883
-#, c-format
-msgid "book busy"
-msgstr "knjiga zauzeta"
-
-#: ../addressbook/libebook/e-book.c:332
-#: ../addressbook/libebook/e-book.c:336
-#: ../addressbook/libebook/e-book.c:540
-#: ../addressbook/libebook/e-book.c:544
-#: ../addressbook/libebook/e-book.c:679
-#: ../addressbook/libebook/e-book.c:683
-#: ../addressbook/libebook/e-book.c:770
-#: ../addressbook/libebook/e-book.c:774
-#: ../addressbook/libebook/e-book.c:1070
-#: ../addressbook/libebook/e-book.c:1073
-#: ../addressbook/libebook/e-book.c:1255
-#: ../addressbook/libebook/e-book.c:1258
-#: ../addressbook/libebook/e-book.c:1411
-#: ../addressbook/libebook/e-book.c:1415
-#: ../addressbook/libebook/e-book.c:1624
-#: ../addressbook/libebook/e-book.c:1628
-#: ../addressbook/libebook/e-book.c:1878
-#: ../addressbook/libebook/e-book.c:1882
-#: ../addressbook/libebook/e-book.c:2099
-#: ../addressbook/libebook/e-book.c:2103
-#: ../addressbook/libebook/e-book.c:2302
-#: ../addressbook/libebook/e-book.c:2306
-#: ../addressbook/libebook/e-book.c:2537
-#: ../addressbook/libebook/e-book.c:2711
-#: ../addressbook/libebook/e-book.c:2715
-#: ../addressbook/libebook/e-book.c:2909
-#: ../addressbook/libebook/e-book.c:2913
-#: ../addressbook/libebook/e-book.c:3463
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA izuzetak pri pozivu „%s“"
-
-#: ../addressbook/libebook/e-book.c:2526
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: nema trenutne operacije"
-
-#: ../addressbook/libebook/e-book.c:2555
-#: ../addressbook/libebook/e-book.c:2600
-#: ../addressbook/libebook/e-book.c:2639
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: nije bilo moguće otkazati"
-
-#: ../addressbook/libebook/e-book.c:2671
-#: ../addressbook/libebook/e-book.c:2675
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "„%s“ na knjizi posle „%s“"
-
-# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
-#: ../addressbook/libebook/e-book.c:2739
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: otkazano"
-
-#: ../addressbook/libebook/e-book.c:3318
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: neispravan izvor."
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4286
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Nepoznata greška"
 
-#: ../addressbook/libebook/e-book.c:3326
-#: ../addressbook/libebook/e-book.c:3392
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: nema dostupne proizvodnje za adresu ’%s'"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3338
+#: ../addressbook/libebook/e-book.c:3159
 #, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: nije moguće pravljenje EBookListener"
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: nema izvora za jib „%s“ smeštenog u Gkonfu."
 
-#: ../addressbook/libebook/e-book.c:3605
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: nema sopstveni JIB kontakta smešten u gconf"
+#: ../addressbook/libebook/e-book.c:3459 ../calendar/libecal/e-cal.c:1049
+msgid "On This Computer"
+msgstr "Na ovom računaru"
 
-#: ../addressbook/libebook/e-book.c:3738
-#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: nema izvora za jib ’%s‘ smeštenog u gconf."
+#: ../addressbook/libebook/e-book.c:3583
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Adresar ne postoji"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "Jedinstveni IB"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Smesti pod"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "Adresa knjige"
 
@@ -227,810 +190,1034 @@ msgstr "Adresa knjige"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Puno ime"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Dato ime"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "1. elektronska adresa"
+msgstr "1° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "2. elektronska adresa"
+msgstr "2° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "3. elektronska adresa"
+msgstr "3° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "4. elektronska adresa"
+msgstr "4° elektronska adresa"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Oznaka kućne adrese"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Oznaka adrese na poslu"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Oznaka druge adrese"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Telefon pomoćnika"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
-msgstr "2. telefon na poslu"
+msgstr "2° telefon na poslu"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Poslovni faks"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Telefon za pozivanje"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Telefon u kolima"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Telefon preduzeća"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
-msgstr "2. kućni telefon"
+msgstr "2° kućni telefon"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Kućni faks"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Drugi telefon"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Pejdžer"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Glavni telefon"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Teleks"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Organizaciona jedinica"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Titula"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Pomoćnik"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "Lična stranica"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "Adresa veb dnevnika"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "Adresa kalendara"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "Adresa za slobodno/zauzeto"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS kalendar"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "Adresa video konferencije"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Ime supružnika"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Napomena"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
-msgid "AIM Home Screen Name 1"
-msgstr "1. kućno nadenuto ime za AIM"
-
-#: ../addressbook/libebook/e-contact.c:190
-msgid "AIM Home Screen Name 2"
-msgstr "2. nadenuto ime za AIM"
-
 #: ../addressbook/libebook/e-contact.c:191
-msgid "AIM Home Screen Name 3"
-msgstr "3. nadenuto ime za AIM"
+msgid "AIM Home Screen Name 1"
+msgstr "1° kućni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:192
-msgid "AIM Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 2"
+msgstr "2° kućni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:193
-msgid "AIM Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za AIM"
+msgid "AIM Home Screen Name 3"
+msgstr "3° kućni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:194
-msgid "AIM Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za AIM"
+msgid "AIM Work Screen Name 1"
+msgstr "1° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:195
-msgid "GroupWise Home Screen Name 1"
-msgstr "1. kućno nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 2"
+msgstr "2° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:196
-msgid "GroupWise Home Screen Name 2"
-msgstr "2. kućno nadenuto ime za GroupWise"
+msgid "AIM Work Screen Name 3"
+msgstr "3° poslovni AIM nadimak"
 
 #: ../addressbook/libebook/e-contact.c:197
-msgid "GroupWise Home Screen Name 3"
-msgstr "3. kućno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 1"
+msgstr "1° kućni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:198
-msgid "GroupWise Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 2"
+msgstr "2° kućni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:199
-msgid "GroupWise Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Home Screen Name 3"
+msgstr "3° kućni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:200
-msgid "GroupWise Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za GroupWise"
+msgid "GroupWise Work Screen Name 1"
+msgstr "1° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
-msgstr "1. kućni Jabber nalog"
+msgid "GroupWise Work Screen Name 2"
+msgstr "2° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "2. kućni Jabber nalog"
+msgid "GroupWise Work Screen Name 3"
+msgstr "3° poslovni GroupVajz nadimak"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "3. kućni Jabber nalog"
+msgid "Jabber Home ID 1"
+msgstr "1° kućni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "1. poslovni Jabber nalog"
+msgid "Jabber Home ID 2"
+msgstr "2° kućni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "2. poslovni Jabber nalog"
+msgid "Jabber Home ID 3"
+msgstr "3° kućni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "3. poslovni Jabber nalog"
+msgid "Jabber Work ID 1"
+msgstr "1° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Yahoo! Home Screen Name 1"
-msgstr "1. kućno nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 2"
+msgstr "2° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Yahoo! Home Screen Name 2"
-msgstr "2. kućno nadenuto ime za Yahoo!"
+msgid "Jabber Work ID 3"
+msgstr "3° poslovni Džaber IB"
 
 #: ../addressbook/libebook/e-contact.c:209
-msgid "Yahoo! Home Screen Name 3"
-msgstr "3. kućno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 1"
+msgstr "1° kućni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:210
-msgid "Yahoo! Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 2"
+msgstr "2° kućni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:211
-msgid "Yahoo! Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Home Screen Name 3"
+msgstr "3° kućni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:212
-msgid "Yahoo! Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za Yahoo!"
+msgid "Yahoo! Work Screen Name 1"
+msgstr "1° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:213
-msgid "MSN Home Screen Name 1"
-msgstr "1. kućno nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 2"
+msgstr "2° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:214
-msgid "MSN Home Screen Name 2"
-msgstr "2. kućno nadenuto ime za MSN"
+msgid "Yahoo! Work Screen Name 3"
+msgstr "3° poslovni Jahu! nadimak"
 
 #: ../addressbook/libebook/e-contact.c:215
-msgid "MSN Home Screen Name 3"
-msgstr "3. kućno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 1"
+msgstr "1° kućni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:216
-msgid "MSN Work Screen Name 1"
-msgstr "1. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 2"
+msgstr "2° kućni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:217
-msgid "MSN Work Screen Name 2"
-msgstr "2. poslovno nadenuto ime za MSN"
+msgid "MSN Home Screen Name 3"
+msgstr "3° kućni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:218
-msgid "MSN Work Screen Name 3"
-msgstr "3. poslovno nadenuto ime za MSN"
+msgid "MSN Work Screen Name 1"
+msgstr "1° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
-msgstr "1. kućni ICQ nalog"
+msgid "MSN Work Screen Name 2"
+msgstr "2° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "2. kućni ICQ nalog"
+msgid "MSN Work Screen Name 3"
+msgstr "3° poslovni MSN nadimak"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "3. kućni ICQ nalog"
+msgid "ICQ Home ID 1"
+msgstr "1° kućni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "1. poslovni ICQ nalog"
+msgid "ICQ Home ID 2"
+msgstr "2° kućni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "2. poslovni ICQ nalog"
+msgid "ICQ Home ID 3"
+msgstr "3° kućni ICKu IB"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "3. poslovni ICQ nalog"
+msgid "ICQ Work ID 1"
+msgstr "1° poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "2° poslovni ICKu IB"
+
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
+msgstr "3° poslovni ICKu IB"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "Poslednja revizija"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Ime ili org."
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Razne adrese"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Kućna adresa"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Adresa na poslu"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Druga adresa"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
-msgstr "Lista kategorija"
+msgstr "Spisak kategorija"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Slika"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Logo"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Ime"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
-msgstr "Lista elektronskih adresa"
+msgstr "Spisak e-adresa"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
-msgid "AIM Screen Name List"
-msgstr "Lista nadenutih imena za AIM"
-
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
-msgstr "Lista GroupWise ib-a"
-
 #: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Lista Jabber naloga"
+msgid "AIM Screen Name List"
+msgstr "Spisak AIM nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "Yahoo! Screen Name List"
-msgstr "Lista nadenutih imena za Yahoo!"
+msgid "GroupWise ID List"
+msgstr "Spisak GroupVajz naloga"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "MSN Screen Name List"
-msgstr "Lista nadenutih imena za MSN"
+msgid "Jabber ID List"
+msgstr "Spisak Džaber naloga"
 
 #: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
-msgstr "Lista ICQ naloga"
+msgid "Yahoo! Screen Name List"
+msgstr "Spisak Jahu! nadimaka"
+
+#: ../addressbook/libebook/e-contact.c:253
+msgid "MSN Screen Name List"
+msgstr "Spisak MSN nadimaka"
 
 #: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "Spisak ICKu naloga"
+
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Želi HTML poštu"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
-msgstr "Lista"
+msgstr "Spisak"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
-msgstr "Lista prikazanih adresa"
+msgstr "Spisak prikazanih adresa"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "Rođendan"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "Godišnjica"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
-msgid "X.509 Certificate"
-msgstr "X.509 sertifikat"
-
 #: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu kućni Ib 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu kućni Ib 2"
+msgid "X.509 Certificate"
+msgstr "X.509 uverenje"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu kućni Ib 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "1° kućni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu poslovni Ib 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "2° kućni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu poslovni Ib 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "3° kućni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu poslovni Ib 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "1° poslovni Gadu-Gadu IB"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
-msgstr "Gadu-Gadu Ib lista"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "2° poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "3° poslovni Gadu-Gadu IB"
+
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
+msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
-msgstr "1. ime za Skype kod kuće"
+msgstr "1° kućno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
-msgstr "2. ime za Skype kod kuće"
+msgstr "2° kućno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
-msgstr "3. ime za Skype kod kuće"
+msgstr "3° kućno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
-msgstr "1. ime za Skype na poslu"
+msgstr "1° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
-msgstr "2. ime za Skype na poslu"
+msgstr "2° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
-msgstr "3. ime za Skype na poslu"
+msgstr "3° poslovno Skajp ime"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
-msgstr "Lista nadenutih imena za Skype"
+msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1516
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
-msgstr "Lista bez imena"
+msgstr "Neimenovani spisak"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
+#, c-format
+msgid "Empty URI"
+msgstr "Prazna adresa"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "Invalid source"
+msgstr "Neispravan izvor"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "Uspešno"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "Skladište nije na mreži"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4268 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "IB kontakta već postoji"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "Neuspela autentifikacija"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "Potrebna je autentifikacija"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "Nepodržano polje"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "Nepodržan način autentifikacije"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "TLS nije dostupan"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Knjiga je uklonjena"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "Nije dostupno u režimu van mreže"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "Premašena veličina pretrage"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "Isteklo vreme za pretragu"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid query"
+msgstr "Neispravan upit"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "Upit je odbijen"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "Ne mogu da otkažem"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "Neispravna verzija servera"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "Nema prostora"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4252 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "Neispravan argument"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4291 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Nije podržan"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Druga greška"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ne mogu da otvorim knjigu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ne mogu da uklonim knjigu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ne mogu da dobijem kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "Prazan upit: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ne mogu da dobijem spisak kontakta: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ne mogu da potvrdim identitet korisnika: %s "
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ne mogu da dodam kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ne mogu da izmenim kontakt: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ne mogu da uklonim kontakte: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ne mogu da dobijem podržana polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ne mogu da dobijem obavezna polja: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ne mogu da dobijem podržane načine potvrđivanja identiteta: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Neispravan upit: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ne mogu da dobijem izmene: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Nije uspela operacija otkazivanja: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "Server je nedostupan (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Server je nedostupan, kalendar je otvoren u režimu samo za čitanje.\n"
+"Poruka greške: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Kalendar ne podržava Slobodno / Zauzeto"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../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:702
+#: ../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:212
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "Nije moguće čuvanje podataka iz kalendara: loša adresa."
+msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 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"
-
-#: ../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"
+msgstr "Ne mogu da sačuvam podatke kalendara"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1918
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
-msgstr "Potreban odgovor: za "
+msgstr "Potreban je odgovor: za "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1923
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
-msgstr "Potreban odgovor: kada je zgodno"
+msgstr "Potreban je odgovor: kada je zgodno"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
-#, c-format
-msgid "Loading %s items"
-msgstr "Učitavanje %s predmeta"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "Učitavam stavke zakazivanja"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "Učitavam stavke zadatka"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "Učitavam stavke beleške"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "Učitavam stavke"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "Neispravna adresa servera"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c: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"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Ne mogu da napravim datoteku za ostavu"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Ne mogu da napravim niz za popunjavanje ostave"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../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:289
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "Loš oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
-msgstr "Nije moguće dobijanje podataka o vremenu"
+msgstr "Ne mogu da dobijem podatke o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Vreme: oblačno"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblačna noć"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c: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:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Vreme: sunčano"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noć"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c: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:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
-msgstr "1."
+msgstr "1°"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
-msgstr "2."
+msgstr "2°"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
-msgstr "3."
+msgstr "3°"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
-msgstr "4."
+msgstr "4°"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
-msgstr "5."
+msgstr "5°"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
-msgstr "6."
+msgstr "6°"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
-msgstr "7."
+msgstr "7°"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
-msgstr "8."
+msgstr "8°"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
-msgstr "9."
+msgstr "9°"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
-msgstr "10."
+msgstr "10°"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
-msgstr "11."
+msgstr "11°"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
-msgstr "12."
+msgstr "12°"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
-msgstr "13."
+msgstr "13°"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
-msgstr "14."
+msgstr "14°"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
-msgstr "15."
+msgstr "15°"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
-msgstr "16."
+msgstr "16°"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
-msgstr "17."
+msgstr "17°"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
-msgstr "18."
+msgstr "18°"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
-msgstr "19."
+msgstr "19°"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
-msgstr "20."
+msgstr "20°"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
-msgstr "21."
+msgstr "21°"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
-msgstr "22."
+msgstr "22°"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
-msgstr "23."
+msgstr "23°"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
-msgstr "24."
+msgstr "24°"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
-msgstr "25."
+msgstr "25°"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
-msgstr "26."
+msgstr "26°"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
-msgstr "27."
+msgstr "27°"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
-msgstr "28."
+msgstr "28°"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
-msgstr "29."
+msgstr "29°"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
-msgstr "30."
+msgstr "30°"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
-msgstr "31."
+msgstr "31°"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Visoko"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Nisko"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Nedefinisano"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1294 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
@@ -1039,427 +1226,542 @@ msgstr "Unesite lozinku za %s (korisnik %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1308
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Unesite lozinku za %s kako bi mrežni posrednik bio omogućen za %s"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Neispravan argument"
-
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:4254
 msgid "Backend is busy"
 msgstr "Podrška je zauzeta"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4256
 msgid "Repository is offline"
 msgstr "Skladište nije na mreži"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4258
 msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4260 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objekat nije nađen"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4262 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:4264
 msgid "URI not loaded"
 msgstr "Adresa nije učitana"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:4266
 msgid "URI already loaded"
 msgstr "Adresa je već učitana"
 
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4270 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4272 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "IB objekta već postoji"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:4274
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:4276
 msgid "Operation has been canceled"
 msgstr "Operacija je otkazana"
 
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4278
 msgid "Could not cancel operation"
-msgstr "Nije moguće otkazati operaciju"
+msgstr "Ne mogu da otkažem operaciju"
 
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:4280
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "Potvrđivanje identiteta nije uspelo"
+
+#: ../calendar/libecal/e-cal.c:4282
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
-msgstr "Obavezna autentifikacija"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "Došlo je do CORBA izuzetka"
-
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "Nepoznata greška"
+msgstr "Potrebno je potvrđivanje identiteta"
+
+#: ../calendar/libecal/e-cal.c:4284
+msgid "A D-Bus exception has occurred"
+msgstr "Došlo je do D-bas izuzetka"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:4288
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "„%s“ ne očekuje argumente"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "„%s“ očekuje jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "„%s“ očekuje da prvi argument bude niska"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "„%s“ očekuje da prvi argument bude niska ISO 8601 datuma/vremena"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "„%s“ očekuje dva argumenta"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "„%s“ očekuje da prvi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "„%s“ očekuje da drugi argument bude ceo broj"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "„%s“ očekuje da drugi argument bude time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "„%s“ očekuje da drugi argument bude niska"
 
 # bug: no need for two ", or"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "„%s“ očekuje da prvi argument bude „any“, „summary“, „description“, „location“, „attendee“, „organizer“, ili „classification“"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"„%s“ očekuje da prvi argument bude „any“, „summary“, „description“, "
+"„location“, „attendee“, „organizer“, ili „classification“"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "„%s“ očekuje bar jedan argument"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "„%s“ očekuje da svi argumenti budu niske ili jedan i samo jedan argument da bude logički netačan (#f)"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"„%s“ očekuje da svi argumenti budu niske ili jedan i samo jedan argument da "
+"bude logički netačan (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Nepodržano polje"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "Nepodržan metod"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Nempodržan metod autentifikacije"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "Kalendar ne postoji"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS nije dostupan"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "Nepoznat korisnik"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Rad van mreže nije dostupan"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ne mogu da preuzmem adresu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Premašena veličina pretrage"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ne mogu da preuzmem adresu e-pošte alarma kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Isteklo vreme za pretragu"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ne mogu da preuzmem LDAP osobinu kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Neispravan upit"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ne mogu da preuzmem informacije zakazivanja kalendara: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Upit odbijen"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "Ne mogu da otvorim kalendar: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Neispravna verzija servera"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "Ne mogu da osvežim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "Ne mogu da uklonim kalendar: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "Ne mogu da napravim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "Ne mogu da izmenim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "Ne mogu da uklonim objekat kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ne mogu da primim objekte kalendara: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ne mogu da odbacim alarm kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "Ne mogu da pošaljem objekte kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ne mogu da preuzmem osnovnu putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ne mogu da preuzmem putanju objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ne mogu da preuzmem spisak objekta kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ne mogu da preuzmem spisak priloga: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "Ne mogu da dovršim upit kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ne mogu da preuzmem vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "Ne mogu da dodam vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ne mogu da podesim osnovnu vremensku zonu kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ne mogu da preuzmem izmene kalendara: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#, c-format
+msgid "Invalid URI"
+msgstr "Neispravna adresa"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Nema pogona pozadinca za „%s“ od „%s“"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Ne mogu da pokrenem pozadinca"
+
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Potpisivanje poruke"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava proveru"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Proveravanje poruke"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava šifrovanje"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Šifrovanje poruke"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava dešifrovanje"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Dešifrovanje poruke"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Možda nećete moći da uvezete ključeve sa ovim algoritmom"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Možda nećete moći da izvezete ključeve sa ovim algoritmom"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Potpisivanje poruke"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Šifrovanje poruke"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Dešifrovanje poruke"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
-msgstr "Nije moguće napraviti putanju za privremeno čuvanje"
+msgstr "Ne mogu da napraviti putanju za privremeno čuvanje"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nije moguće ukloniti unos iz ostave: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "Nema dostupnog toka"
+
+#: ../camel/camel-db.c:471
+#, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-"Nije moguće upisati unos u log: %s\n"
+"Ne mogu da zapišem unos dnevnika: %s\n"
 "Dalje operacije na ovom serveru neće biti izvršene kada\n"
 "se budete ponovo povezali na mrežu."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Nije moguće otvoriti „%s“:\n"
+"Ne mogu da otvorim „%s“:\n"
 "%s\n"
 "Promene na ovoj fascikli neće biti usklađene."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
-msgstr "Ponovno usklađivanje sa serverom"
-
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Umnoži sadržaj fascikle lokalno za rad van mreže"
+msgstr "Vršim ponovno usklađivanje sa serverom"
 
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
-msgstr "Preuzimanje novih poruka u za rad van mreže"
+msgstr "Preuzimam nove poruke za rad van mreže"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Pripremanje fascikle ’%s‘ za rad van mreže"
-
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+msgstr "Pripremam fasciklu „%s“ za rad van mreže"
+
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "Umnoži sadržaj fascikle lokalno za rad van mreže"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Morate da budete na mreži da bi završili ovu operaciju"
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "Nema dostupnog opisa"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Otkazano"
 
-#: ../camel/camel-filter-driver.c:795
-#: ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr "Neuspelo pravljenje sadržanog procesa ’%s‘: %s"
+msgstr "Nisam uspeo da napravim sadržani proces „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Neispravan niz poruka primljen od %s: %s"
+msgstr "Neispravan niz poruka primljen od „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
-msgstr "Usklađivanje fascikli"
+msgstr "Usklađujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Greška pri čitanju filtera: %s: %s"
+msgstr "Greška prilikom čitanja filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Greška u primeni filtera: %s: %s"
+msgstr "Greška prilikom primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
-msgstr "Nije moguće otvaranje fascikle pripreme"
+msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
-msgstr "Nije moguća obrada fascikle pripreme"
+msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Primanje poruke %d (%d%%)"
+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:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: ../camel/camel-filter-driver.c:1283
-#: ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
-msgstr "Usklađivanje fascikle"
+msgstr "Usklađujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "Završeno"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Primanje poruke %d od %d"
+msgstr "Primam poruku %d od %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "Neuspelo dovlačenje poruke"
+msgstr "Nisam uspeo da dovučem poruku"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1467,450 +1769,426 @@ msgstr "Neispravni argumenti za (sistemska-oznaka)"
 
 #: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
-msgstr "Neipsravni argumenti za (korisnička-oznaka)"
+msgstr "Neispravni argumenti za (korisnička-oznaka)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Nije moguće čitanje izraza za pretragu: %s:\n"
+"Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
-"Greška pri izvršavanju izraza za pretragu: %s:\n"
+"Greška prilikom izvršavanja izraza pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) zahteva samo jedan logički rezultat"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nije dozvoljeno unutar %s"
 
-#: ../camel/camel-folder-search.c:912
-#: ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) zahteva nisku sa tipom poklapanja"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) očekuje niz kao rezultat"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: priključenje poruke: za %s"
-
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Učim novu spam poruku u „%s“"
+msgstr[1] "Učim nove spam poruke u „%s“"
+msgstr[2] "Učim nove spam poruke u „%s“"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Nepodržana operacija: prebrojavanje po izrazu: za %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Učim novu ham poruku u %s"
+msgstr[1] "Učim nove ham poruke u %s"
+msgstr[2] "Učim nove ham poruke u %s"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Nepodržana operacija: pretraga po JIB: za %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Filtriram novu poruku u „%s“"
+msgstr[1] "Filtriram nove poruke u „%s“"
+msgstr[2] "Filtriram nove poruke u „%s“"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:318
 msgid "Moving messages"
-msgstr "Premeštanje poruka"
+msgstr "Premeštam poruke"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
-msgstr "Umnožavanje poruka"
+msgstr "Umnožavam poruke"
 
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "Učenje šta je đubre"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Dovlačim poruku „%s“"
 
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "Učenje šta nije đubre"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Nisam uspeo da izvršim gpg: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "Filtriranje poruke(a)"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"Javio se neočekivan status GnuPG poruke:\n"
+"Došlo je do neočekivane poruke GnuPG stanja:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "Neuspelo čitanje gpg userid podsetnika."
+msgstr "Nisam uspeo da analiziram podsetnik gpg ib korisnika."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
-msgstr "Neuspelo čitanje zahteva za gpg lozinkom."
+msgstr "Nisam uspeo da analiziram zahtev za gpg lozinkom."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 msgstr ""
-"Potreban Vam je PIN za otključavanje ključa za\n"
-"SmartCard: „%s“"
+"Potreban vam je PIN da otključate ključ\n"
+"Pametne kartice: „%s“"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"Potrebna Vam je lozinka za otključavanje ključa\n"
+"Potrebna vam je lozinka da otključate ključ\n"
 "korisnika: „%s“"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
-msgstr "Neočekivan zahtev od GnuPG-a za „%s“"
+msgstr "Neočekivan zahtev GnuPG-a za „%s“"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1304
-msgid "Canceled."
-msgstr "Odustato."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Neuspelo otključavanje tajnog ključa: unete su 3 pogrešne lozinke."
+msgstr "Nisam uspeo da otključam tajni ključ: unete su 3 pogrešne lozinke."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "Neočekivan odgovor od GnuPG-a: %s"
+msgstr "Neočekivan odgovor GnuPG-a: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Neuspelo šifrovanje: nisu označeni ispravni primaoci."
+msgstr "Nisam uspeo da šifrujem: 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
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Neuspelo izvršavanje gpg: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+msgid "Could not generate signing data: "
+msgstr "Ne mogu da napravim podatke za potpisivanje:"
 
-#: ../camel/camel-gpg-context.c: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:1352
-#: ../camel/camel-gpg-context.c:1554
-#: ../camel/camel-gpg-context.c:1640
-#: ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-gpg-context.c:1771
-#: ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1866
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
-msgstr "Neuspelo izvršavanje gpg."
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "Ovo je deo poruke sa digitalnim potpisom"
-
-#: ../camel/camel-gpg-context.c:1458
-#: ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1470
-#: ../camel/camel-gpg-context.c:1485
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Nije moguća provera potpisa poruke: neispravan oblik poruke"
+msgstr "Nisam uspeo da izvršim gpg."
 
-#: ../camel/camel-gpg-context.c:1524
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Nije moguća provera potpisa poruke: nije moguće napraviti privremenu datoteku: %s"
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1623
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Nije moguće napraviti podatke za šifrovanje: %s"
+#: ../camel/camel-gpg-context.c:1737
+msgid "Cannot verify message signature: "
+msgstr "Ne mogu da proverim potpis poruke:"
+
+#: ../camel/camel-gpg-context.c:1858
+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:1911
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno šifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:1726
-#: ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "Nije moguće dešifrovati poruku: neispravan oblik poruke"
+msgstr "Ne mogu da dešifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Nije moguće dešifrovati MIME deo: greška u protokolu"
+msgstr "Nisam uspeo da dešifrujem MIME deo: greška u protokolu"
 
-#: ../camel/camel-gpg-context.c:1808
-#: ../camel/camel-smime-context.c:1185
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
-#: ../camel/camel-gpg-context.c:1827
-msgid "Unable to parse message content"
-msgstr "Nije moguće pročitati sadržaj poruke"
-
-#: ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1896
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr "Nije moguće napraviti vezu ka pomoćniku zaključavanja: %s"
+msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Nije moguće podeliti pomoćnika zaključavanja: %s"
+msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Nije moguće zaključati ’%s‘: greška u protokolu sa pomoćnikom zaključavanja"
+msgstr "Ne mogu da zaključam „%s“: greška u protokolu sa pomoćnikom zaključavanja"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
-msgstr "Nije moguće zaključati ’%s‘"
+msgstr "Ne mogu da zaključam „%s“"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "Nije moguće napraviti zaključanu datoteku za %s: %s"
+msgstr "Ne mogu da napravim zaključanu datoteku za „%s“: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Isteklo vreme pri pokušaju pribavljanja zaključane datoteke na %s. Pokušajte kasnije."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr ""
+"Isteklo je vreme prilikom pokušaja da pribavim zaključanu datoteku na „%s“. "
+"Pokušajte kasnije."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Neuspelo zaključavanje korišćenjem fcntl(2): %s"
+msgstr "Nisam uspeo da zaključam koristeći „fcntl(2)“: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "Neuspelo zaključavanje korišćenjem flock(2): %s"
+msgstr "Nisam uspeo da zaključam koristeći „flock(2)“: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr "Nije moguća provera datoteke pošte %s: %s"
+msgstr "Ne mogu da proverim datoteku pošte „%s“: %s"
 
 #: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr "Nije moguće otvoriti datoteku pošte %s: %s"
+msgstr "Ne mogu da otvorim datoteku pošte „%s“: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "Nije moguće otvoriti privremenu datoteku pošte %s: %s"
+msgstr "Ne mogu da otvorim privremenu datoteku pošte „%s“: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr "Neuspelo smeštanje pošte u privremenu datoteku %s: %s"
+msgstr "Nisam uspeo da smestim poštu u privremenu datoteku „%s“: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "Nije moguće napraviti vezu: %s"
+msgstr "Ne mogu da napravim vezu: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
-msgstr "Nije moguće podeliti: %s"
+msgstr "Ne mogu da podelim: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program za premeštanje pošte je otkazao: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Nepoznata greška)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Greška pri čitanju datoteke pošte: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Greška pri pisanju privremene datoteke pošte: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Greška pri umnožavanju privremene datoteke: %s"
 
-#: ../camel/camel-multipart-signed.c:593
-msgid "parse error"
-msgstr "greška čitanja"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+msgid "No content available"
+msgstr "Nema dostupnog sadržaja"
 
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Odustato"
+#: ../camel/camel-multipart-signed.c:335
+#, c-format
+msgid "No signature available"
+msgstr "Nema dostupnog potpisa"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "nije moguće pravljenje niza"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "greška čitanja"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
-msgstr "Nalaženje: %s"
+msgstr "Nalazim: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
-msgstr "Neuspelo traženje domaćina"
+msgstr "Nije uspelo traženje domaćina"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Neuspelo traženje domaćina: %s: %s"
+msgstr "Nije uspelo traženje domaćina: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
-msgstr "Nalaženje adrese"
+msgstr "Nalazim adresu"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
-msgstr "Traženje imena neuspelo"
+msgstr "Nije uspelo traženje imena"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
-msgstr "Traženje imena neuspelo: %s"
+msgstr "Nije uspelo traženje imena: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "Usklađivanje poruka u fascikli ’%s‘ sa diskom"
+msgstr "Usklađujem poruke iz fascikle „%s“ na disk"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "Nije moguć unos u dnevnik za fasciklu „%s“: %s"
+msgstr "Ne mogu da zapišem van mrežni unos u dnevnik za fasciklu „%s“: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "Ponuđač elektronske pošte sa virtuelnom fasciklom"
+msgstr "Dostavljač virtuelne fascikle e-pošte"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za čitanje pošte kao upita drugog skupa fascikli"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Nije moguće učitati %s: ovaj sistem ne podržava učitavanje modula."
+msgstr "Ne mogu da učitam „%s“: ovaj sistem ne podržava učitavanje modula."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
-msgstr "Nije moguće učitati %s: %s"
+msgstr "Ne mogu da učitam „%s“: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr "Nije moguće učitati %s: nema koda za pokretanje u modulu."
+msgstr "Ne mogu da učitam „%s“: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "Nema dostupnog ponuđača za protokol „%s“"
+msgstr "Nema dostupnog dostavljača za protokol „%s“"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Ova opcija će povezati na server korišćenjem anonimne prijave."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
-msgstr "Neuspela autentifikacija."
+msgstr "Potvrđivanje identiteta nije uspelo."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neispravan podatak o poreklu elektronske adrese:\n"
+"Neispravan podatak o poreklu adrese e-pošte:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1919,7 +2197,7 @@ msgstr ""
 "Neispravan podatak o složenom poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1928,579 +2206,533 @@ msgstr ""
 "Neispravan podatak o poreklu:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "Ova opcija će povezati na server korišćenjem sigurnosne CRAM-MD5 lozinke, ako je server podržava."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Ova opcija će povezati na server korišćenjem sigurnosne CRAM-MD5 lozinke, ako "
+"je server podržava."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "Ova opcija će povezati na server korišćenjem sigurnosne DIGEST-MD5 lozinke, ako je server podržava."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Ova opcija će povezati na server korišćenjem sigurnosne DIGEST-MD5 lozinke, "
+"ako je server podržava."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "Upit na server suviše dug (>2048 okteta)"
+msgstr "Upit servera je suviše dug (>2048 okteta)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
-msgstr "Upit na server neispravan\n"
+msgstr "Upit servera je neispravan\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Upit na server je sadržao neispravan „Kvalitet zaštite“ unos"
+msgstr "Upit servera je sadržao neispravan unos „Kvalitet zaštite“"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
-msgstr "Odgovor servera nije sadržao podatke o autorizaciji"
+msgstr "Odgovor servera nije sadržao podatke o ovlašćenju"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Odgovor servera je sadržao nekompletne podatke o autorizaciji"
+msgstr "Odgovor servera je sadržao nekompletne podatke o ovlašćenju"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Odgovor servera se ne slaže"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "Ova opcija će povezati na server korišćenjem Kerberos 5 prijave."
+msgstr ""
+"Ova opcija će povezati na server korišćenjem Kerberos 5 potvrđivanja "
+"identiteta."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "Izabrani mehanizam ponuđeni metod ne podržava, ili ga primenjen metod nije prepoznao."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"Izabrani mehanizam ponuđeni metod ne podržava, ili ga primenjen metod nije "
+"prepoznao."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
-msgstr "Ponuđeni parametar target_name nije pravilno oblikovan."
+msgstr "Ponuđeni parametar ciljnog imena (target_name) nije pravilno oblikovan."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Ponuđeni parametar target_name je sadržao neispravan ili nepodržan tip imena."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Ponuđeni parametar ciljnog imena (target_name) je sadržao neispravan ili "
+"nepodržan tip imena."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "input_token sadrži različita vezivanja za kanale od onih određenih preko parametra input_chan_bindings."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"Upit unosa (input_token) sadrži različita vezivanja kanala od onih određenih "
+"preko parametra vezice lanca unosa (input_chan_bindings)."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "input_token sadrži neispravnu strukturu, ili potpis nije mogao biti proveren."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Upit unosa (input_token) sadrži neispravnu strukturu, ili potpis nije mogao "
+"biti proveren."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "Pružena uveravanja nisu bila ispravna za otpočinjanje procesa, ili je nosač uverenja došao bez njih."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"Pružena uveravanja nisu bila ispravna za otpočinjanje procesa, ili je nosač "
+"uverenja došao bez njih."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "Pružen nosač sadržaja nije upućivao na ispravan sadržaj."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Neuspele provere celovitosti na input_token."
+msgstr "Nisu uspele provere celovitosti na upitu unosa (input_token)."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "Neuspele provere celovitosti na uverenjima."
+msgstr "Nisu uspele provere celovitosti na uverenjima."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "Važenje traženih uverenja je isteklo."
 
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
-msgstr "Loš odgovor na autentifikaciju od servera."
+msgstr "Loš odgovor potvrđivanja identiteta sa servera."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Nepodržan sigurnosni sloj."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ova opcija će povezati na server korišćenjem Kerberos 4 prijave."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Nije moguće dobiti Kerberos kartu:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Prijava"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Ova opcija će povezati na server korišćenjem obične lozinke."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
-msgstr "Nepoznato stanje autentifikacije."
+msgstr "Nepoznato stanje potvrđivanja identiteta."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "Ova opcija će povezati na Windows server korišćenjem NTLM / Sigurnosne provere lozinke."
+#: ../camel/camel-sasl-ntlm.c:39
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ova opcija će povezati na Vindouz server korišćenjem NTML / Sigurnosne "
+"provere lozinke."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "OBIČNO"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP pre SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ova opcija će odobriti POP vezu a zatim pokušati SMTP"
+msgstr "Ova opcija će odobriti POP vezu pre pokušaja SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP izvorna adresa"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP pre SMTP auth korišćenjem nepoznatog transporta"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "POP pre SMTP provere korišćenjem nepoznatog transporta"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP pre SMTP auth korišćenjem izvora koji nije pop"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "POP pre SMTP provere korišćenjem ne-POP izvora"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Neuspelo prevođenje regularnog izraza: %s: %s"
+msgstr "Nije uspelo prevođenje regularnog izraza: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:87
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr "Adresa ’%s‘ traži deo sa korisničkim imenom"
+msgstr "Adresa „%s“ traži deo sa korisničkim imenom"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:91
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "Adresa ’%s‘ traži deo sa imenom domaćina"
+msgstr "Adresa „%s“ traži deo sa imenom domaćina"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:95
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr "Adresa ’%s‘ traži deo sa putanjom"
+msgstr "Adresa „%s“ traži deo sa putanjom"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Nije moguće napraviti direktorijum %s:\n"
+"Ne mogu da napravim direktorijum „%s“:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Unesite %s lozinku za %s na domaćinu %s."
-
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel sesija ne podržava prosleđivanje poruke."
+msgstr "Unesite „%s“ lozinku za „%s“ na domaćinu „%s“."
 
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Nije moguće nalaženje sertifikata za ’%s‘"
+msgstr "Ne mogu da nađem uverenje za „%s“"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
-msgstr "Nije moguće napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
-msgstr "Nije moguće potpisivanje CMS podataka"
+msgstr "Ne mogu da napravim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
-msgstr "Nije moguće priložiti potpisane CMS podatke"
+msgstr "Ne mogu da priložim CMS potpisane podatke"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
-msgstr "Nije moguće priložiti CMS podatke"
+msgstr "Ne mogu da priložim CMS podatke"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
-msgstr "Nije moguće pravljenje podataka o CMS potpisniku"
+msgstr "Ne mogu da napravim podatak CMS potpisnika"
 
 # bug: s/cert/certificate/
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
-msgstr "Nije moguće nalaženje lanca sertifikata"
+msgstr "Ne mogu da nađem lanac uverenja"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
-msgstr "Nije moguće dodavanje vremena CMS potpisa"
+msgstr "Ne mogu da dodam vreme CMS potpisa"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "Sertifikat za šifrovanje ’%s‘ ne postoji"
+msgstr "Uverenje šifrovanja „%s“ ne postoji"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguće dodavanje atributa SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut SMIME postavki ključa šifrovanja"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Nije moguće dodavanje atributa MS SMIMEEncKeyPrefs"
+msgstr "Ne mogu da dodam atribut MS SMIME postavki ključa šifrovanja"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
-msgstr "Nije moguće dodavanje sertifikata za šifrovanje"
+msgstr "Ne mogu da dodam uverenje šifrovanja"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
-msgstr "Nije moguće dodavanje podatka o CMS potpisniku"
-
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "Nije moguće napraviti kontekst za šifrovanje."
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "Neuspelo dodavanje podataka u CMS enkoder"
+msgstr "Ne mogu da dodam podatak CMS potpisnika"
 
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "Neuspelo kodiranje podataka"
-
-#: ../camel/camel-smime-context.c:697
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
-msgstr "Neprovereno"
+msgstr "Neproveren"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Dobar potpis"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "Loš potpis"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "Sadržaj je izmenjen ili oštećen pri prenosu"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
-msgstr "Sertifikat potpisa nije nađen"
+msgstr "Uverenje potpisa nije nađeno"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
-msgstr "Sertifikat potpisa nije poverljiv"
+msgstr "Uverenje potpisa nije poverljivo"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Algoritam potpisa je nepoznat"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
-msgstr "Algoritam potpisa je nepodržan"
+msgstr "Algoritam potpisa nije podržan"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Neispravan potpis"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "Greška pri obradi"
 
 # hm, hm...
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
-msgstr "Nema potpisanog podatka u potpisu"
+msgstr "Nema naznačenog podatka u potpisu"
 
 # hm, može to i bolje od „okruženih“...
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Nedostaju zbirke iz okruženih podataka"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
-msgstr "Nije moguće izračunati zbirke"
+msgstr "Ne mogu da izračunam zbirke"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "Nije moguće postaviti zbirke poruka"
+msgstr "Ne mogu da postavim zbirke poruka"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
-msgstr "Neuspeo uvoz sertifikata"
+msgstr "Nije uspeo uvoz uverenja"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Poruka ima samo sertifikat, nije moguća provera sertifikata"
+msgstr "Uverenje je jedina poruka, ne mogu da proverim uverenje"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Poruka ima samo sertifikat, sertifikati uvezeni i provereni"
+msgstr "Uverenje je jedina poruka, uverenja su uvežena i proverena"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
-msgstr "Nije moguće naći zbirke potpisa"
+msgstr "Ne mogu da nađem zbirke potpisa"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "Ne mogu da napravim kontekst šifrovanja."
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "Nisam uspeo da dodam podatak u CMS šifrer"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "Nisam uspeo da šifrujem podatke"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
-msgstr "Neuspelo dekodiranje"
+msgstr "Nisam uspeo da dešifrujem"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
-msgstr "Nije moguće naći opšti algoritam za šifrovanje gomile"
+msgstr "Ne mogu da nađem opšti algoritam za šifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Nije moguće dodeliti mesto ključu za šifrovanje gomile"
+msgstr "Ne mogu da dodelim mesto ključu za šifrovanje grupe"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
-msgstr "Nije moguće napraviti CMS poruku"
+msgstr "Ne mogu da napravim CMS poruku"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
-msgstr "Nije moguće pravljenje CMS Enveloped data"
+msgstr "Ne mogu da napravim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Nije moguće prilaganje CMS Enveloped data"
+msgstr "Ne mogu da priložim CMS obavijene podatke"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
-msgstr "Nije moguće prilaganje objekta sa CMS podacima"
+msgstr "Ne mogu da priložim objekat CMS podataka"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
-msgstr "Nije moguće pravljenje CMS podatka o primaocu"
+msgstr "Ne mogu da napravim podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
-msgstr "Nije moguće dodati podatak o CMS primaocu"
+msgstr "Ne mogu da dodam podatak CMS primaoca"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
-msgstr "Neuspelo dodavanje podataka u enkoder"
+msgstr "Nisam uspeo da dodam podatke u šifrer"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dešifrovanje: nisu nađeni šifrovani podaci"
 
-#: ../camel/camel-smime-context.c:1199
-msgid "import keys: unimplemented"
-msgstr "uvoz ključeva: neizvedeno"
-
-#: ../camel/camel-smime-context.c:1207
-msgid "export keys: unimplemented"
-msgstr "izvoz ključeva: neizvedeno"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Nije moguće dobiti fasciklu: neispravna operacija"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2177
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "Nije moguće napraviti fasciklu „%s“: fascikla postoji"
-
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Nije moguće napraviti fasciklu: neispravna operacija"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Nije moguće napraviti fasciklu: %s: fascikla postoji"
-
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Nije moguće obrisati fasciklu: %s: neispravna operacija"
-
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nije moguće preimenovati fasciklu: %s: neispravna operacija"
+msgstr "Ne mogu da napravim fasciklu „%s“: fascikla postoji"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2368 ../camel/camel-store.c:2378
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Smeće"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Đubre"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "Nije moguće dobijanje sertifikata izdavača"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "Nije moguće dobiti listu povučenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "Nije moguće dešifrovanje potpisa sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Nije moguće dešifrovanje potpisa za listu povučenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "Nije moguće dešifrovati javni ključ izdavača"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Neuspeo potpis sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Neuspeo potpis za listu povučenih sertifikata"
-
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Sertifikat još nije važeći"
-
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Sertifikat je istekao"
-
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL još nije važeći"
+#: ../camel/camel-store.c:2825
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Ne mogu da da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL je istekao"
+#: ../camel/camel-store.c:2952 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Greška u CRL"
+#: ../camel/camel-store.c:3093 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:700
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Nema više memorije"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "Domaćin posrednik ne podržava SOCKS4"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Samopotpisani sertifikat je nulte veličine"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "Domaćin posrednik je odbio naš zahtev: kôd „%d“"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Samopotpisani sertifikat u lancu"
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Domaćin posrednik ne podržava SOCKS5"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "Nije moguće lokalno dobiti izdavačev sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ne mogu da pronađem odgovarajući tip potvrđivanja identiteta: kod 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "Nije moguće dobiti potpis lista"
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "Neuspeh opšteg SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "Lanac sertifikata je predugačak"
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Pravila SOCKS servera ne dozvoljavaju vezu"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Povučen sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "Mreža je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neispravan izdavač sertifikata (CA)"
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Domaćin je nedostupan sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "Premašena dužina putanje"
+#: ../camel/camel-tcp-stream-raw.c:895
+msgid "Connection refused"
+msgstr "Veza je odbijena"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Neispravna svrha"
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "Vreme života je isteklo"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Nepoverljiv sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS server ne podržava naredbu"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Odbijen sertifikat"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS server ne podržava vrstu adrese"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "Naslov/izdavač neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "Unknown error from SOCKS server"
+msgstr "Nepoznata greška sa SOKCS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Dobih nepoznatu vrstu adrese sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/izdavač serijsko neslaganje"
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "Nepotpun odgovor sa SOCKS servera"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "Upotreba ključa ne podržava potpis sertifikatom"
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ime domaćina je predugo (najviše 255 znakova)"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Greška pri proveri programa"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Neispravan odgovor servera posrednika"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2513,37 +2745,16 @@ msgstr ""
 "Otisak:       %s\n"
 "Potpis:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "DOBRO"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "LOŠE"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Loš sertifikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Želite li ipak da prihvatite?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2552,413 +2763,363 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
-"Provera SSL sertifikata za %s:\n"
+"Provera SSL uverenja za „%s“:\n"
 "\n"
 "%s\n"
 "\n"
 "Želite li da prihvatite?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
-"Problem sa sertifikatom: %s\n"
+"Problem sa uverenjem: %s\n"
 "Izdavač: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Loš domen sertifikata: %s\n"
+"Loš domen uverenja: %s\n"
 "Izdavač: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekao sertifikat: %s\n"
+"Isteklo uverenje: %s\n"
 "Izdavač: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Istekla lista povučenih sertifikata: %s\n"
+"Istekao je spisak povučenih uverenja: %s\n"
 "Izdavač: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
-msgstr "Nije moguće pročitati adresu „%s“"
+msgstr "Ne mogu da analiziram adresu „%s“"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1263 ../camel/camel-vee-folder.c:1426
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Greška pri smeštanju „%s“: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ne mogu da umnožim ili premestim poruke u virtuelnu fasciklu"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1299
 #, c-format
 msgid "No such message %s in %s"
-msgstr "Nema takve poruke %s u %s"
+msgstr "Nema takve poruke „%s“ u „%s“"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Nije moguće umnožiti ili premestiti poruke u virtuelnu fasciklu"
+#: ../camel/camel-vee-folder.c:1367
+#, c-format
+msgid "Error storing '%s': "
+msgstr "Greška pri smeštanju „%s“:"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "Nepoklopljeno"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "Nije moguće obrisati fasciklu: %s: nema takve fascikle"
+msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Nije moguće promeniti ime fascikli: %s: nema takve fascikle"
+msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Nije moguće umnožiti poruke u fasciklu za smeće"
+msgstr "Ne mogu da umnožim poruke u fasciklu za smeće"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Nije moguće umnožiti poruke u fasciklu za đubre"
+msgstr "Ne mogu da umnožim poruke u fasciklu za đubre"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nije moguće dobiti poruku: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "Nema takve poruke"
+msgid "Could not load summary for %s"
+msgstr "Ne mogu da učitam pregled za „%s“"
 
-# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Korisnik odustao"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Nije moguće dobiti poruku %s: %s"
+msgid "Checking for deleted messages %s"
+msgstr "Vršim proveru za izbrisanim porukama „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2304
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "Ova poruka nije dostupna u režimu van mreže."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "Prikupljam pregled podataka novih poruka u „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1819
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1870
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
 msgid "Could not get message"
-msgstr "Nije moguće dobijanje poruke"
+msgstr "Ne mogu da dobavim poruku"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:892
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "Nije moguće učitavanje pregleda za %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "Ne mogu da dodam poruku u fasciklu „%s“: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1152
-msgid "Trash Folder Full. Please Empty."
-msgstr "Fascikla za smeće je puna. Ispraznite je."
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "Ne mogu da napravim poruku: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1361
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Prikupljanje pregleda podataka za nove poruke u %s"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ne mogu da dobavim poruku: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:332
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Nema takve poruke"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2158
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:462
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "Nije moguće dodati poruku u fasciklu „%s“: %s"
+msgid "Cannot get message %s: "
+msgstr "Ne mogu da nabavim poruku „%s“: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2189
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "Nije moguće pravljenje poruke: %s"
+msgid "This message is not available in offline mode."
+msgstr "Ova poruka nije dostupna u režimu van mreže."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
-msgstr "Nije moguće dobiti sadržaj fascikle %s"
+msgstr "Ne mogu da nabavim sadržaj fascikle „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Nije moguće dodati poruku u režimu van mreže: nedostupna ostava"
+msgstr "Ne mogu da priložim poruku u režimu van mreže: nedostupna ostava"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Nije moguće dodavati poruku u režimu van mreže: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+msgid "Cannot append message in offline mode: "
+msgstr "Ne mogu da priložim poruku u režimu van mreže: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
-msgstr "Proveravanje za novom poštom"
+msgstr "Vršim proveru za novom poštom"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "Pro_veri za nove poruke u svim fasciklama"
+msgstr "P_otraži nove poruke u svim fasciklama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Opcije"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Primeni filtere na nove poruke u Sandučetu na ovom serveru"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Proveri da nema đ_ubreta među novim porukama"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Proveri da nema đubreta samo u fascikli SAN_DUČE"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "Automatski u_skladi nalog lokalno"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP podešavanja"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Port SOAP posrednika za poštu:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+msgstr "Novel GroupVajz"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
-msgstr "Za pristupanje Novell Groupwise serverima"
+msgstr "Za pristup Novel GroupVajz serverima"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "Ova opcija će povezati na GroupWise server korišćenjem lozinke u običnom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
+msgid ""
+"This option will connect to the GroupWise server using a plaintext password."
+msgstr ""
+"Ova opcija će povezati na GroupVajz server korišćenjem lozinke u običnom "
+"tekstu."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
-msgstr "Domaćin ili korisnik u adresi nisu dostupni"
+msgstr "Domaćin ili korisnik nisu dostupni u adresi"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "Niste uneli lozinku."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Neke opcije možda neće ispravno raditi na trenutnoj verziji servera"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
-msgstr "Nema takve fascikle %s"
+msgstr "Nema takve fascikle „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Nije moguće pravljenje GroupWise fascikli u režimu van mreže."
+msgstr "Ne mogu da napravim GroupVajz fascikle u režimu van mreže."
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ne mogu da napravim posebnu fasciklu sistema"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr "Glavna fascikla ne može sadržati fascikle u sebi"
+msgstr "Glavna fascikla ne može da sadrži druge fascikle"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "Nije moguće preimenovati GroupWise fasciklu „%s“ u „%s“"
+msgstr "Ne mogu da preimenujem GroupVajz fasciklu „%s“ u „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise server %s"
+msgstr "GroupVajz server „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "GroupWise servis za %s na %s"
+msgstr "GroupVajz servis za „%s“ na „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
-msgstr "GroupWise dostava pošte preko %s"
+msgstr "GroupVajz dostava pošte preko „%s“"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
-msgstr "Slanje poruke"
-
-#: ../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:107
 #, c-format
-msgid "Could not send message: %s"
-msgstr "Nije moguće slanje poruke: %s"
-
-#: ../camel/providers/hula/camel-hula-provider.c:49
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Proveravanje za novom poštom"
-
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "Povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "_Koristi prilagođenu komandu za povezivanje na server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "Komanda:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
-msgid "_Show only subscribed folders"
-msgstr "Prik_aži samo prijavljene fascikle"
-
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-msgid "O_verride server-supplied folder namespace"
-msgstr "P_remosti oblik imena fascikle koje daje server"
-
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Oblik imena"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ne mogu da dobavim fasciklu: neispravna operacija"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Za pristupanje Hula serverima"
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
+msgid ""
+"You have exceeded this account's storage limit. Your messages are queued in "
+"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
+"of your mail.\n"
+msgstr ""
+"Premašili ste smeštajno ograničenje za ovaj nalog. Vaše poruke biće odlagane "
+"u odlaznoj pošti. Pošaljite ih ponovo pritiskom na dugme „Pošalji/Primi“ nakon "
+"što uklonite ili arhivirate vašu poštu.\n"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "Ova mogućnost obezbeđuje povezvanje na Hula server korišćenjem lozinke u običnom tekstu."
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Ne mogu da pošaljem poruku: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "Bez izlaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "Bez ulaznog toka"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
-msgstr "Operacija otkazana"
+msgstr "Operacija je otkazana"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %s"
 
 #. for imap ALERT codes, account user@host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2967,1194 +3128,1009 @@ msgstr ""
 "Upozorenje od IMAP servera %s@%s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "Neočekivan odgovor od IMAP servera: %s"
+msgstr "Neočekivan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "Neuspela IMAP komanda: %s"
+msgstr "Neuspela IMAP naredba: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Odgovor servera je prerano završen."
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "Odgovor IMAP servera nije sadržao %s podatak"
+msgstr "Odgovor IMAP servera nije sadržao „%s“ podatak"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Neočekivan U redu odgovor od IMAP servera: %s"
+msgstr "Neočekivan potvrdan odgovor IMAP servera: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
-msgstr "Uvek proveri za nove poruke u ovoj fascikli"
+msgstr "Uvek proveri nove poruke u ovoj fascikli"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Nije moguće napraviti direktorijum %s: %s"
+msgstr "Ne mogu da napravim direktorijum „%s“: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Pretraga za izmenjenim porukama u %s"
+msgstr "Pregledam izmenjene poruke 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"
-
-#: ../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:3369
+msgid "Unable to retrieve message: "
+msgstr "Ne mogu da dovučem poruku: %s"
 
-#: ../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:2877
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5211
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Nije moguće dobiti poruku sa IB %s: %s"
+msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5212
 msgid "No such message available."
 msgstr "Nema takve poruke."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Nepotpun odgovor servera: podaci nisu dati za poruku %d"
+msgstr "Nepotpun odgovor servera: nisu dati podaci za poruku „%d“"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Nepotpun odgovor servera: JIB nije dat za poruku %d"
+msgstr "Nepotpun odgovor servera: JIB nije dat za poruku „%d“"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
-msgstr "Nije moguće pronaći telo poruke u FETCH odgovoru."
+msgstr "Ne mogu da pronađem telo poruke u DOVUCI odgovoru."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nije moguće otvoriti direktorijum ostave: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Ne mogu da otvorim direktorijum ostave: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Neuspelo privremeno čuvanje poruke %s: %s"
+msgstr "Nisam uspeo privremeno da sačuvam poruku „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Neuspelo privremeno čuvanje %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Nisam uspeo privremeno da sačuvam poruku „%s“: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Nisam uspeo privremeno da sačuvam „%s“: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Vršim proveru za novom poštom"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Oblik imena:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Povezivanje na server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Pri_meni filtere na nove poruke u SANDUČETU ovog servera"
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Koristi prilagođenu komandu za povezivanje na server"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Naredba:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "Prik_aži samo prijavljene fascikle"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "P_remosti oblik imena fascikle koje daje server"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Oblik _imena:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
-msgstr "Proveri da nema đ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."
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
+msgstr ""
+"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Nije moguće povezivanje na %s: %s"
+msgstr "Ne mogu da se povežem na „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL nije dostupan"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Povezivanje otkazano"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ne mogu da se povežem na „%s“: "
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Neuspelo povezivanje na IMAP server %s u sigurnosnom modu: %s"
+msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS nije podržano"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "SSL nije dostupan u ovoj verziji"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Nije moguće povezivanje komandom „%s“: %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "Sanduče"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Priprema"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Poslato"
+msgid "Connection cancelled"
+msgstr "Povezivanje je otkazano"
 
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Šabloni"
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Ne mogu da se povežem sa naredbom „%s“: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP server %s ne podržava traženi tip prijave %s"
+msgstr "IMAP server „%s“ ne podržava traženi tip prijavljivanja identiteta „%s“"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
-msgstr "Nema podrške za tip prijave %s"
+msgstr "Nema podrške za tip potvrđivanja identiteta „%s“"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Nije moguća autentifikacija na IMAP server.\n"
+"Ne mogu da potvrdim identitet na IMAP server.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“"
-
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "Nije moguće napraviti fasciklu „%s“: fascikla postoji."
-
-#: ../camel/providers/imap/camel-imap-store.c:2253
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Nepoznata glavna fascikla: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:686
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočekivan odgovor od IMAP4 servera %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Neočekivan pozdrav od IMAP servera: %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Nije moguće izabrati fasciklu „%s“: neispravno ime sandučeta"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Nije moguće izabrati fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "servis nije dostupan"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP4 serverom %s je neočekivano prekinuta: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "Omogućavanje otkrivanja dopisne liste je potrebno nekim filterima i pravilima za vFascikle"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Isticanje zapamćenih poruka koje nisu pročitane za X sekundi"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "Isticanje zapamćenih porukastarijih od X sekundi"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Nije moguće pristupiti fascikli „%s“: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Nije moguće uskladiti oznake za fasciklu „%s“: nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Nije moguće uskladiti oznake za fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Nije moguće isprazniti fasciklu „%s“: nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Nije moguće isprazniti fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Nije moguće dobiti poruku %s iz fascikle „%s“: nema takve poruke"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Nije moguće dobiti poruku %s iz fascikle „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Nije moguće dodati poruku u fasciklu „%s“: fascikla je samo za čitanje"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Nije moguće dodati poruku u fasciklu „%s“: nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Nije moguće dodati poruku u fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguće premestiti poruku iz fascikle „%s“ u fasciklu „%s“: nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Nije moguće umnožiti poruke iz fascikle „%s“ u fasciklu „%s“: nepoznata greška"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguće premestiti poruke iz fascikle „%s“ u fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Nije moguće umnožiti poruku iz fascikle „%s“ u fasciklu „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Proveri da nema _đubreta među novim porukama"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Proveri da nema đubreta samo u fascikli SANDUČE"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Za čitanje i smeštanje pošte na IMAPv4rev1 servere."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ova opcija će povezati na IMAPv4rev1 server korišćenjem lozinke u običnom tekstu."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Povezivanje otkazano"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Neuspelo povezivanje na IMAP server %s u bezbednosnom režimu: server ne podržava STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "TLS pregovori nisu uspeli"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Nije moguća prijava na IMAP server %s pomoću mehanizma prijave %s"
+msgid "IMAP server %s"
+msgstr "IMAP server „%s“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:538
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, 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."
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za „%s“ na „%s"
 
-#: ../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"
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:434
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:701
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Sanduče"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
-msgid "Cannot 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"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime fascikle „%s“ nije ispravno jer sadrži znak „%c“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Nije moguće napraviti fasciklu „%s“: neispravno ime sandučeta"
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Ne mogu da napravim fasciklu „%s“: fascikla postoji."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Nije moguće napraviti fasciklu „%s“: loša naredba"
+msgid "Unknown parent folder: %s"
+msgstr "Nepoznata glavna fascikla: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Nije moguće obrisati fasciklu „%s“: specijalna fascikla"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Nije moguće brisanje IMAP fascikli u režimu van mreže."
+msgid "Server unexpectedly disconnected"
+msgstr "Veza sa serverom je neočekivano isključena"
 
-#: ../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/imap/camel-imap-store.c:3140
+msgid "Server unexpectedly disconnected: "
+msgstr "Veza sa serverom je neočekivano isključena: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Nije moguće obrisati fasciklu „%s“: loša naredba"
+msgid "Could not create folder summary for %s"
+msgstr "Ne mogu da napravim sažetak fascikle za „%s“"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Nije moguće preimenovati fasciklu „%s“ u „%s“: specijalna fascikla"
+msgid "Could not create cache for %s: "
+msgstr "Ne mogu da napravim ostavu za „%s“: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Nije moguće preimenovanje IMAP fascikli u režimu van mreže."
+#: ../camel/providers/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-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"
+#: ../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"
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Nije moguće dobiti podatke %s za obrazac „%s“ sa IMAP servera %s: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Naredba:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Nije moguća prijava na IMAP fascikle u režimu van mreže."
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Broj veza iz _ostave za korišćenje"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Nije moguća prijava na fasciklu „%s“: neispravno ime sandučeta"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Oblik imena:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Nije moguća prijava na fasciklu „%s“: loša naredba"
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Nije moguće odjavljivanje sa IMAP fascikli u režimu van mreže."
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+msgid "Error writing to cache stream: "
+msgstr "Greška prilikom upisa u tok ostave:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Nije moguća odjava sa fascikle „%s“: neispravno ime sandučeta"
+msgid "Not authenticated"
+msgstr "Nepotvrđenog identiteta"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Nije moguća odjava sa fascikle „%s“: loša naredba"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Pretraga za izmenjenim porukama"
+msgid "Could not connect to %s (port %s): "
+msgstr "Ne mogu da se povežem na „%s“ (port %s): "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP server %s nije usklađen."
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+msgid "Closing tmp stream failed: "
+msgstr "Zatvaranje privremenog toka nije uspelo:"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "Pribavljanje omota za nove poruke"
+#: ../camel/providers/imapx/camel-imapx-server.c:5357
+#: ../camel/providers/imapx/camel-imapx-server.c:5372
+msgid "Cannot create spool file: "
+msgstr "Ne mogu da napravim datoteku pripreme: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, 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"
+msgid "No such folder: %s"
+msgstr "Nema takve fascikle: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+msgid "Source stream returned no data"
+msgstr "Odgovor izvornog toka je bez podataka"
 
-#: ../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
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Nije moguće povezivanje na %s (port %s): %s"
+msgid "Source stream unavailable"
+msgstr "Tok izvora je nedostupan"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Nije moguće povezivanje na POP server %s"
-
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "Popiši sadržaje poruka"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "poštansko sanduče:%s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "Popiši sadržaje poruka"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ne mogu da dobavim poruku „%s“ iz fascikle „%s“\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "_Koristite pregled fascikle „.folders“ (exmh)"
+msgstr "_Koristi pregled fascikle „.folders“ (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH-oblikovani direktorijumi pošte"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za smeštanje lokalne pošte u direktorijume pošte nalik MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Lokalna dostava"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Za dovlačenje (premeštanje) lokalne pošte iz mbox oblika u fascikle kojim upravlja Evolucija."
+#: ../camel/providers/local/camel-local-provider.c:70
+msgid ""
+"For retrieving (moving) local mail from standard mbox-formatted spools into "
+"folders managed by Evolution."
+msgstr ""
+"Za dovlačenje (premeštanje) lokalne pošte iz standardne mboks formatirane "
+"pripreme u fascikle kojima upravlja Evolucija."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Primeni filtere na nove poruke u SANDUČETU"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
-msgstr "Direktorijumi pošte u Maildir obliku"
+msgstr "Direktorijumi pošte u Mejldir obliku"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "Za smeštanje lokalne pošte u maildir direktorijume."
+msgstr "Za smeštanje lokalne pošte u mejldir direktorijume."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "_Smesti zaglavlja o statusu u formatu Elm/Pine/Mutt"
+msgstr "_Smesti zaglavlja stanja u Elm/Pine/Mut formatu"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "Standardna Unix mbox spool datoteka"
+msgstr "Standardna Uniks mboks datoteka pripreme"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za čitanje i smeštanje lokalne pošte u spoljne standardne mbox spool datoteke.\n"
-"Takođe se može koristiti za čitanje stabla fascikli u Elm, Pine, ili Mutt stilu."
+"Za čitanje i smeštanje lokalne pošte u spoljne standardne mboks datoteke "
+"pripreme.\n"
+"Takođe se može koristiti za čitanje stabla fascikli u Elm, Pine ili Mut stilu."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
-msgstr "Standardni Unix mbox spool direktorijum"
+msgstr "Standardni Uniks mboks direktorijum pripreme"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Ostava root %s nije apsolutna putanja"
+msgstr "Administratorska ostava „%s“ nije apsolutna putanja"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Ostava root %s nije regularan direktorijum"
+msgstr "Administratorska ostava „%s“ nije regularan direktorijum"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "Nije moguće dobiti fasciklu: %s: %s"
+msgstr "Ne mogu da dobavim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduče"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
-msgstr "Lokalna datoteka pošte %s"
+msgstr "Lokalna datoteka pošte „%s“"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr "Nije moguće preimenovati fasciklu %s u %s: %s"
+msgstr "Ne mogu da preimenujem fasciklu „%s“ u „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Nije moguće preimenovati ’%s‘: %s"
+msgstr "Ne mogu da preimenujem „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
-msgstr "Nije moguće obrisati indeks datoteku fascikle „%s“: %s"
+msgstr "Ne mogu da obrišem indeksnu datoteku fascikle „%s“: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
-msgstr "Nije moguće obrisati meta datoteku fascikle „%s“: %s"
+msgstr "Ne mogu da obrišem meta datoteku fascikle „%s“: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Nije moguće dodati poruku pregledu: nepoznat razlog"
-
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "Prododata maildir poruka poništena"
-
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Nije moguće dodati poruku u maildir fasciklu: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+msgstr "Ne mogu da dodam poruku pregledu: nepoznat razlog"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Ne mogu da dodam poruku u fasciklu direktorijuma pošte: %s: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Ne mogu da dobavim poruku „%s“ iz fascikle „%s“: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr ""
-"Nije moguće dobiti poruku: %s iz fascikle %s\n"
-"  %s"
+"Ne mogu da napravim fasciklu „%s“: naziv fascikle ne može da sadrži tačku."
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Neispravan sadržaj poruke"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:718
+#, c-format
+msgid "Folder %s already exists"
+msgstr "Fascikla „%s“ već postoji"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "Nije moguće napraviti fasciklu „%s“: %s"
+msgstr "Ne mogu da napravim fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "Nije moguće preuzeti fasciklu „%s“: %s"
+msgstr "Ne mogu da preuzmem fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "Nije moguće preuzeti fasciklu „%s“: fascikla ne postoji."
+msgstr "Ne mogu da preuzmem fasciklu „%s“: fascikla ne postoji."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Nije moguće dobiti fasciklu „%s“: nije maildir direktorijum."
+msgstr "Ne mogu da preuzmem fasciklu „%s“: nije direktorijum pošte."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "Nije moguće obrisati fasciklu „%s“: %s"
+msgstr "Ne mogu da obrišem fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
-msgstr "nije maildir direktorijum"
+msgstr "nije direktorijum pošte"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:866
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Nije moguće pretražiti fasciklu „%s“: %s"
+msgstr "Ne mogu da pretražim fasciklu „%s“: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:709
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr ""
+"Ne mogu da preimenujem fasciklu „%s“: naziv fascikle ne može da sadrži tačku."
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Nije moguće otvaranje putanje maildir direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju direktorijuma pošte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
-msgstr "Proveravanje celovitosti fascikle"
+msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
-msgstr "Proveravanje za nove poruke"
+msgstr "Vršim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:699
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
-msgstr "Smeštanje fascikle"
+msgstr "Smeštam fasciklu"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Nije moguće zaključati fasciklu %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:220
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Nije moguće otvoriti poštansko sanduče: %s: %s\n"
+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:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Nije moguće dodavanje poruke u mbox datoteku: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ne mogu da dodam poruku u mboks datoteku: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Fascikla izgleda nepopravljivo oštećena."
+msgstr "Fascikla izgleda da je nepopravljivo oštećena."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "Sastavljanje poruke neuspelo."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Ne mogu da zaključam fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Nije moguće napraviti fasciklu ovog imena."
+msgstr "Ne mogu da napravim fasciklu ovog imena."
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "Nije moguće dobiti fasciklu „%s“: nije obična datoteka."
+msgstr "Ne mogu da dobavim fasciklu „%s“: nije obična datoteka."
+
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Ne mogu da napravim direktorijum „%s“: %s."
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ne mogu da napravim fasciklu: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Fascikla već postoji"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguće obrisati fasciklu „%s“:\n"
+"Ne mogu da obrišem fasciklu „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "„%s“ nije obična datoteka."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Fascikla „%s“ nije prazna. Nije obrisana."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
-msgstr "Nije moguće obrisati pregled fascikle „%s“: %s"
+msgstr "Ne mogu da obrišem pregled fascikle „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Nije moguće napraviti direktorijum „%s“: %s."
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Nije moguće napraviti fasciklu: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "Fascikla već postoji"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "Novo ime fascikle je neispravno."
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
-msgstr "Nije moguće preimenovati „%s“: „%s“: %s"
+msgstr "Ne mogu da preimenujem „%s“: „%s“: %s"
 
 # bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Nije moguće preimenovati ’%s‘ u %s: %s"
+msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "Nije moguće otvoriti fasciklu: %s: %s"
+msgstr "Ne mogu da otvorim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:539
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Kobna greška pri čitanju pošte na mestu %ld u fascikli %s"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Kobna greška pri čitanju pošte na mestu %s u fascikli „%s“"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Nije moguće proveriti fasciklu: %s: %s"
+msgstr "Ne mogu da proverim fasciklu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:708
+#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr "Nije moguće otvoriti datoteku: %s: %s"
+msgstr "Ne mogu da otvorim datoteku: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr "Nije moguće otvaranje privremenog poštanskog sandučeta: %s"
+msgstr "Ne mogu da otvorim privremeno poštansko sanduče: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:964
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "Nije moguće zatvaranje izvorne fascikle %s: %s"
+msgstr "Ne mogu da zatvorim izvornu fasciklu „%s“: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "Nije moguće zatvaranje privremene fascikle: %s"
+msgstr "Ne mogu da zatvorim privremenu fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:767
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "Nije moguće preimenovati fasciklu: %s"
+msgstr "Ne mogu da preimenujem fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:862
+#: ../camel/providers/local/camel-mbox-summary.c:1129
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "Nije moguće čuvanje fascikle: %s"
+msgstr "Ne mogu da sačuvam fasciklu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c: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:901
+#: ../camel/providers/local/camel-mbox-summary.c:1160
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOKS datoteka je oštećena, popravite je. (Očekivano je „Iz reda“, ali nisam "
+"dobio.)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:910
+#: ../camel/providers/local/camel-mbox-summary.c:1169
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Neslaganje pregleda i fascikle, čak i nakon usklađivanja"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nepoznata greška: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1239
+#: ../camel/providers/local/camel-mbox-summary.c:1269
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
-msgstr "Neuspelo pisanje u privremeno poštansko sanduče: %s"
+msgstr "Nisam uspeo da zapišem u privremeno poštansko sanduče: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1258
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
-msgstr "Neuspelo pisanje u privremeno poštansko sanduče: %s: %s"
+msgstr "Nisam uspeo da zapišem 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"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Nije moguće dodati poruku u mh fasciklu: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Ne mogu da dodam poruku u mh fasciklu: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "Nije moguće napraviti fasciklu „%s“: %s"
+msgstr "Ne mogu da napravim fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Nije moguće dobiti fasciklu „%s“: nije direktorijum."
+msgstr "Ne mogu da dobavim fasciklu „%s“: nije direktorijum."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Nije moguće otvoriti putanju MH direktorijuma: %s: %s"
+msgstr "Ne mogu da otvorim putanju MH direktorijuma: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "Priprema „%s“ ne može se otvoriti: %s"
+msgstr "Ne mogu da otvorim pripremu „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Priprema „%s“ nije regularna datoteka ili direktorijum"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "Pripremna datoteka pošte „%s“"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "Stablo fascikle za pripremu „%s“"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Fascikla „%s/%s“ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguće otvoriti fasciklu „%s“:\n"
+"Ne mogu da otvorim fasciklu „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Fascikla „%s“ ne postoji."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Nije moguće napraviti fasciklu „%s“:\n"
+"Ne mogu da napravim fasciklu „%s“:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "„%s“ nije datoteka sandučeta."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Ostava ne podržava SANDUČE"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Pripremna datoteka pošte %s"
+msgid "Spool folders cannot be deleted"
+msgstr "Fascikle za pripremu ne mogu biti obrisane"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "Stablo fascikli za pripremu %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "Fascikle za pripremu ne mogu biti preimenovane"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "Fascikle za pripremu ne mogu biti obrisane"
-
+#: ../camel/providers/local/camel-spool-summary.c:169
 #: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:201
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Nije moguće uskladiti privremenu fasciklu %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "Ne mogu da uskladim privremenu fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:217
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Nije moguće uskladiti fasciklu za pripremu %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "Ne mogu da uskladim fasciklu za pripremu „%s“: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:248
-#: ../camel/providers/local/camel-spool-summary.c:265
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Nije moguće uskladiti fasciklu za pripremu %s: %s\n"
+"Ne mogu da uskladim fasciklu za pripremu „%s“: %s\n"
 "Fascikla je možda oštećena, umnožite sačuvano u „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
 #: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Unutrašnja greška: JIB u neispravnom obliku: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:376
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:713
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ne mogu da dobavim poruku „%s“: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Neuspela pošiljka: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "Neuspela pošiljka: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Ne možete poslati NNTP poruke ako niste povezani!"
+msgstr "Ne možete da pošaljete NNTP poruke ako niste povezani!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Ne možete umnožiti poruke iz NNTP fascikle!"
+msgstr "Ne možete da umnožite poruke iz NNTP fascikle!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "_Prikaži fascikle u kratkom zapisu (npr. c.o.linux umesto comp.os.linux)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid ""
+"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"_Prikaži fascikle u kratkom zapisu (npr. „c.o.linux“ umesto „comp.os.linux“)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "U p_rozorčetu za prijavu, prikaži relativna imena fascikli"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
-msgstr "USENET vesti"
+msgstr "JUZNET vesti"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "Ovo je ponuđač za čitanje i slanje na USENET grupe vesti."
+msgstr "Ovo je dostavljač za čitanje i slanje na JUZNET grupe vesti."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Ova opcija će prijaviti na NNTP server korišćenjem lozinke u običnom tekstu."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "Potrebno je potvrđivanje identiteta ali korisničko ime nije uneto"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "Ova opcija će prijaviti na NNTP server korišćenjem lozinke u običnom tekstu."
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Ne mogu da potvrdim identitet na serveru: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Nije moguće čitanje pozdrava od %s: %s"
+msgid "Could not read greeting from %s: "
+msgstr "Ne mogu da pročitam pozdrav sa „%s“: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
+msgstr "NNTP server „%s“ je vratio kod greške „%d“: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
-msgstr "USENET vesti preko %s"
+msgstr "JUZNET vesti preko „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:815
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,606 +4141,677 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:909
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
-"Ne možete se prijaviti na ovu grupu vesti:\n"
+"Ne možete da se prijavite na ovu grupu vesti:\n"
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadređena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:941
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
-"Ne možete se odjaviti sa ove grupe vesti:\n"
+"Ne možete da se odjavite sa ove grupe vesti:\n"
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:966
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Ne možete napraviti fasciklu u ostavi vesti: prijavite se umesto toga."
+msgstr ""
+"Ne možete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:974
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, 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:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "Ne možete ukloniti fasciklu u ostavi vesti: odjavite se umesto toga."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1171
-msgid "Authentication requested but no username provided"
-msgstr "Potrebna autentifikacija ali korisničko ime nije uneto"
+msgstr ""
+"Ne možete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1183
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Nije moguća autentifikacija na server: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda neuspela: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1360
 msgid "Not connected."
 msgstr "Nepovezano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1413
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve fascikle: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: pretraživanje novih poruka"
+msgstr "%s: pretražujem nove poruke"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Neočekivan odgovor xover-a: %s"
+msgstr "Neočekivan odgovor ksovera: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Neočekivan odgovor head-a: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "Koristite odustani"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:282
+#: ../camel/providers/pop3/camel-pop3-folder.c:341
+#, c-format
+msgid "No message with UID %s"
+msgstr "Nema poruke sa JIB %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Dovlačim POP poruku %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:454
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Retrieving POP summary"
-msgstr "Preuzimanje POP pregleda"
+msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:518
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Nije moguće dobiti POP pregled: %s"
+msgstr "Ne mogu da dobavim POP pregled: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Expunging old messages"
-msgstr "Izbacivanje starih poruka"
+msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:590
 msgid "Expunging deleted messages"
-msgstr "Izbacivanje obrisanih poruka"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Nema poruka sa JIB %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Dovlačenje POP poruke %d"
+msgstr "Izbacujem obrisane poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "Ostava za poruke"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Ostavi poruke na serveru"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "O_briši nakon %s dana"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "Obriši _izbačeno iz lokalne „Dolazno“"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "Isključi _podršku za sva POP3 proširenja"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Za povezivanje i preuzimanje pošte sa POP servera."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "Ova opcija će povezati na POP server korišćenjem lozinke u običnom tekstu. Ovo je jedina opcija koju podržavaju mnogi POP serveri."
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"Ova opcija će povezati na POP server korišćenjem lozinke u običnom tekstu. "
+"Ovo je jedina opcija koju podržavaju mnogi POP serveri."
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Ova opcija će povezati na POP server korišćenjem lozinke preko APOP "
+"protokola. Ovo možda neće raditi svim korisnicima čak i na serverima koji "
+"tvrde da to podržavaju."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
-msgstr "Ova opcija će povezati na POP server korišćenjem lozinke preko APOP protokola. Ovo možda neće raditi svim korisnicima čak i na serverima koji tvrde da to podržavaju."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Neuspelo čitanje ispravnog pozdrava POP servera %s"
+msgstr "Neuspelo čitanje ispravnog pozdrava POP servera „%s“"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nije moguće povezivanje na POP server %s u sigurnosnom režimu %s"
+msgstr "Nisam uspeo da se povežem na POP server „%s“ u bezbednom režimu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "Server ne podržava STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "Nisam uspeo da se povežem na POP server „%s“ u bezbednom režimu%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "TLS pregovori nisu uspeli"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "TLS nije dostupan u ovom izdanju"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, 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
-#, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "Nije moguće povezivanje na POP server %s: traženi mehanizam autentifikacije nije podržan."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"Ne mogu da se povežem na POP server „%s“: traženi način potvrđivanja "
+"identiteta nije podržan."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "Neuspela SASL prijava „%s“ na POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "Nije uspela SASL prijava „%s“ na POP server %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Nije moguća prijava na POP server %s: greška SASL protokola"
+msgstr "Ne mogu da se prijavim na POP server „%s“: greška SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Nije moguća autentifikacija na POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Nisam uspeo da potvrdim identitet na POP serveru „%s“: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Nije moguće povezivanje na POP server %s: primljen \tInvalid APOP IB. Moguć napad zamenom identiteta. Obratite se adminu."
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"Ne mogu da se povežem na POP server „%s“: primih Neispravan APOP IB. Moguć "
+"je napad zamenom identiteta. Obratite se adminu."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-"Nije moguće povezivanje na POP server %s.\n"
+"Ne mogu da se povežem na POP server „%s“.\n"
 "Greška pri slanju lozinke: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%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 korisničkog imena%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"Ne mogu da se povežem na POP server „%s“.\n"
+"Greška pri slanju lozinke%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 server „%s“"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 server za „%s“ na „%s“"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ne mogu da se povežem na POP server „%s“"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:721
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle „%s“."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:738
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ostava nema hijerarhiju fascikli"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Za dostavu pošte prosleđivanjem „sendmail“ programu na lokalnom sistemu."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Za dostavu pošte prosleđivanjem „sendmail“ programu na lokalnom sistemu."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Dostava pošte preko programa sendmejl"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
-msgstr "Nije moguće čitanje liste primalaca"
+msgstr "Ne mogu da analiziram spisak primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nije moguće napraviti vezu ka sendmail-u: %s: pošta nije poslata"
+msgstr "Ne mogu da napravim vezu ka sendmejlu: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Nije moguće podeliti sendmail: %s: pošta nije poslata"
+msgstr "Ne mogu da podelim sendmejl: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "Ne mogu da pošaljem poruku: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail je završio signalom %s: pošta nije poslata."
+msgstr "sendmejl je završio signalom „“%s: pošta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Nije moguće izvršiti %s: pošta nije poslata."
+msgstr "Ne mogu da izvršim „%s“: pošta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail je završio sa statusom %d: pošta nije poslata."
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "Dostava pošte preko programa sendmail"
+msgstr "sendmejl je završio sa statusom „%d“: pošta nije poslata."
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Za dostavu pošte povezivanjem na prosleđivač pošte u mreži korišćenjem SMTP."
+msgstr ""
+"Za dostavu pošte povezivanjem na prosleđivač pošte u mreži korišćenjem SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Greška odgovora dobrodošlice: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Ne mogu da se povežem na SMTP server „%s“ u sigurnosnom režimu: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "Neuspela STARTTLS naredba: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP server „%s“"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP dostava pošte preko „%s“"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP server „%s“ ne podržava traženi tip potvrđivanja identiteta „%s“."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Ne mogu da potvrdim identitet na SMTP serveru.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Ne mogu da pošaljem poruku: servis nije povezan."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "Ne mogu da pošaljem poruku: adresa pošiljaoca nije ispravna."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "Slanje poruke"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Ne mogu da pošaljem poruku: nisu određeni primaoci."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Ne mogu da pošaljem poruku: jedan ili više neispravnih primalaca"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
-msgstr "Greška u sintaksi, komanda nije prepoznata"
+msgstr "Greška u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "Greška u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
-msgstr "Komanda nije podržana"
+msgstr "Naredba nije podržana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
-msgstr "Parametar komande nije podržan"
+msgstr "Parametar naredbe nije podržan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "Status sistema, ili odgovor na pomoć"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "Poruka o pomoći"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
-msgstr "Servis spreman"
+msgstr "Servis je spreman"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "Servis zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
-msgstr "Servis nije dostupan, zatvaranje kanala prenosa"
+msgstr "Servis nije dostupan, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
-msgstr "Tražena radnja za poštu u redu, završeno"
+msgstr "Tražena radnja za poštu je u redu, završeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "Korisnik nije lokalan; biće prosleđeno na <putanja-prosleđivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Tražena radnja za poštu nije preduzeta: nedostupno poštansko sanduče"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
-msgstr "Tražena radnja nije preduzeta: nedostupno poštansko sanduče"
+msgstr "Tražena radnja nije preduzeta: poštansko sanduče je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "Tražena radnja nije preduzeta: greška pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokušajte <putanja-prosleđivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Tražena radnja nije preduzeta: nedovoljno prostora na sistemu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Odustato od tražene radnje za poštu: premašen dodeljen prostor"
+msgstr "Prekinuta je tražena radnja za poštu: premašen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Tražena radnja nije preduzeta: ime poštanskog sandučeta nije dozvoljeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Počinje unos pošte; završava sa <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "Neuspeo prenos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
-msgstr "Mehanizam autentifikacije je preslab"
+msgstr "Mehanizam potvrđivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
-msgstr "Neophodno šifrovanje za traženi mehanizam autentifikacije"
+msgstr "Neophodno je šifrovanje za traženi mehanizam potvrđivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
-msgstr "Neuspela privremena autentifikacija"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Greška kod odgovora dobrodošlice"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Nije moguće povezivanje na SMTP server %s u sigurnosnom režimu: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Neuspela STARTTLS komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Neuspela STARTTLS komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP server %s ne podržava traženi tip autentifikacije %s."
+msgstr "Nije uspelo privremeno potvrđivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Nije moguća autentifikacija na SMTP server.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP dostava pošte preko %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "Nije moguće slanje poruke: servis nije povezan."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "Nije moguće slanje poruke: adresa pošiljaoca nije ispravna."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "Slanje poruke"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "Nije moguće slanje poruke: nisu određeni primaoci."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Nije moguće slanje poruke: jedan ili više neispravnih primalaca"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Neuspela HELO komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "Neuspela HELO komanda"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "Neuspela naredba „HELO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
-msgstr "SMTP autentifikacija"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "Greška pri pravljenju objekta SASL autentifikacije."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Neuspela AUTH komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Neuspela AUTH komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "Loš odgovor na autentifikaciju od servera.\n"
+msgstr "SMTP potvrđivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Neuspela MAIL FROM komanda: %s: pošta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Neuspela MAIL FROM komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Neuspela RCPT TO komanda: %s: pošta nije poslata"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> neuspelo"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Neuspela DATA komanda: %s: pošta nije poslata"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Neuspela DATA komanda"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Neuspela RSET komanda: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Neuspela RSET komanda"
+msgid "Error creating SASL authentication object."
+msgstr "Greška pri pravljenju objekta SASL potvrđivanja identiteta."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "Neuspela naredba „AUTH“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "Neuspela naredba „MAIL FROM“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "Neuspela naredba „RCPT TO“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> nije uspelo"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "Neuspela naredba „DATA“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "Neuspela naredba „RSET“: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "Neuspela naredba „QUIT“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Neuspela QUIT komanda: %s"
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Godišnjica"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Neuspela QUIT komanda"
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "Rođendan"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "Posao"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "Nadmetanje"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "Pokloni"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "Ciljevi/zadaci"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "Praznik"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "Čestitke"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "Važni kontakti"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "Ideje"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "Međunarodno"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "Važna mušterija"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "Lično"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "Telefonski pozivi"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "Status"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "Strategije"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "Dobavljači"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "Vreme i izdaci"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "Čekanje"
 
@@ -4772,8 +4819,7 @@ msgstr "Čekanje"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -4781,8 +4827,7 @@ msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4790,8 +4835,7 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -4799,83 +4843,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:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y. %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d. %m. %Y. %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d. %m. %Y. %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d. %m. %Y. %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d. %m. %Y. %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d. %m. %Y. %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%d. %m. %Y. %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y. %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707
-#: ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834
-#: ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838
-#: ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4883,200 +4922,199 @@ 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:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1875
 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:673
 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:435
 msgid "Failed to authenticate.\n"
-msgstr "Neuspela autentifikacija.\n"
+msgstr "Nisam uspeo da potvrdim identitet.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "U podešavanju već postoji kategorija ’%s‘. Izaberite drugo ime"
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Osobine kategorije"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "Ikona"
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "I_me kategorije"
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "Kategorija"
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "_Ikonica kategorije"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
-msgstr "Ikona kategorije"
+msgstr "Ikonica kategorije"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "Osobine kategorije"
+#: ../libedataserverui/e-categories-dialog.c:191
+msgid "_No Image"
+msgstr "_Bez slike"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_Ikona kategorije"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "I_me kategorije"
+#: ../libedataserverui/e-categories-dialog.c:406
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "U podešavanju već postoji kategorija „%s“. Izaberite drugo ime"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Predmet(i) pripada(ju) ovim _kategorijama:"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "Trenutno _korišćene kategorije:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "kategorije"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Ikonica"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Kategorija"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:294
 #, 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:176
+msgid "Show Contacts"
+msgstr "Prikaži kontakte"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "Izaberite kontakte iz adresara"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "A_dresar:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "Katego_rija:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "_Ukloni"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_Pretraži:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>Ko_ntakti</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Prikaži kontakte</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "Ko_ntakti"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "A_dresar:"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Pretraga"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "_Adresar"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.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.c:295
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "Pretraga"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Izaberite kontakte iz adresara"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_Pretraži:"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "Greška prilikom učitavanja adresara: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Prostri %s unutar"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "U_množi %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "I_seci %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
-msgstr "_Ukloni %s"
+msgstr "_Ukloni „%s“"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ključ priveska nije upotrebljiv: nema korisnika niti domaćina"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 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:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -5085,329 +5123,855 @@ 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:170
 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/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Unesite lozinku"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "Neispravan odgovor servera"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "Vlasnik"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "Nema odgovora servera"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "Uređivač za objavljivanje"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "Loš parametar"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "Uređivač"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "„%s“ u knjizi pre „%s“"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "Autor za objavljivanje"
+#~ msgid "book busy"
+#~ msgstr "knjiga zauzeta"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "Autor"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA izuzetak pri pozivu „%s“"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "Autor koji ne uređuje"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: nema trenutne operacije"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "Recenzent"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "„%s“ na knjizi posle „%s“"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "Saradnik"
+# 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:891
-msgid "None"
-msgstr "Ništa"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: nema dostupne proizvodnje za adresu ’%s'"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Prilagođeno"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: nije moguće pravljenje EBookListener"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Opšta greška"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: nema sopstveni JIB kontakta smešten u gconf"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "Fascikla istog imena već postoji"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "Nije moguće da napraviti niz za pribavljanje delti"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Naveden tip fascikle nije ispravan"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "Rad van mreže nije dostupan"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "I/O greška"
+#~ msgid "Verifying message"
+#~ msgstr "Proveravanje poruke"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "Nema dovoljno prostora za pravljenje fascikle"
+#~ msgid "Cannot open message"
+#~ msgstr "Nije moguće otvoriti poruku"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "Fascikla nije prazna"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Nepodržana operacija: priključenje poruke: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "Navedena fascikla nije pronađena"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Funkcija nije primenjena u ovoj ostavi"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Nepodržana operacija: prebrojavanje po izrazu: za %s"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "Operacija nije podržana"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Nepodržana operacija: pretraga po JIB: za %s"
 
-#: ../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 "Learning junk"
+#~ msgstr "Učenje šta je đubre"
 
-#: ../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 "Learning non-junk"
+#~ msgstr "Učenje šta nije đubre"
 
-#: ../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 "Canceled."
+#~ msgstr "Odustato."
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "Nije moguće napraviti fasciklu toga imena"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: ../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 "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "Nije moguća provera potpisa poruke: nije moguće napraviti privremenu "
+#~ "datoteku: %s"
 
-#. 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 "Unable to parse message content"
+#~ msgstr "Nije moguće pročitati sadržaj poruke"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "Lične fascikle"
+#~ msgid "cannot create thread"
+#~ msgstr "nije moguće pravljenje niza"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "Omiljene javne fascikle"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Sve javne fascikle"
+#~ 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: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Globalna lista adresa"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nije moguće dobiti Kerberos kartu:\n"
+#~ "%s"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Obrisani predmeti"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel sesija ne podržava prosleđivanje poruke."
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "uvoz ključeva: neizvedeno"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Beleške"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "izvoz ključeva: neizvedeno"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Odlazna"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "Nije moguće napraviti fasciklu: neispravna operacija"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslati predmeti"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Nije moguće dobijanje sertifikata izdavača"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Zaduženja"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Nije moguće dobiti listu povučenih sertifikata"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Neispravno povezivanje"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Nije moguće dešifrovanje potpisa sertifikata"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Neispravan odgovor servera"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Nije moguće dešifrovanje potpisa za listu povučenih sertifikata"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "Nema odgovora servera"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Nije moguće dešifrovati javni ključ izdavača"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Loš parametar"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Neuspeo potpis sertifikata"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Podrška datoteke adresara za Evoluciju"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Neuspeo potpis za listu povučenih sertifikata"
 
-#: ../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 "Certificate not yet valid"
+#~ msgstr "Sertifikat još nije važeći"
 
-#: ../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 "Certificate has expired"
+#~ msgstr "Sertifikat je istekao"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servis za prijavu Servera podataka Evolucije"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL još nije važeći"
 
-#. 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 "CRL has expired"
+#~ msgstr "CRL je istekao"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Greška u CRL"
+
+#~ msgid "Out of memory"
+#~ msgstr "Nema više memorije"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Samopotpisani sertifikat je nulte veličine"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Samopotpisani sertifikat u lancu"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Nije moguće lokalno dobiti izdavačev sertifikat"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Nije moguće dobiti potpis lista"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "Lanac sertifikata je predugačak"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "Povučen sertifikat"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Neispravan izdavač sertifikata (CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "Premašena dužina putanje"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Neispravna svrha"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Nepoverljiv sertifikat"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Odbijen sertifikat"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Naslov/izdavač neslaganje"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID neslaganje"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/izdavač serijsko neslaganje"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Upotreba ključa ne podržava potpis sertifikatom"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Greška pri proveri programa"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Loš sertifikat od %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Želite li ipak da prihvatite?"
+
+# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
+#~ msgid "User canceled"
+#~ msgstr "Korisnik odustao"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "Fascikla za smeće je puna. Ispraznite je."
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Za pristupanje Hula serverima"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Ova mogućnost obezbeđuje povezvanje na Hula server korišćenjem lozinke u "
+#~ "običnom tekstu."
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "Neočekivani status odgovora „%s„“ nakon naredbe APPEND"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "Nema odziva nakon naredbe APPEND"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Nepoznata greška se javila tokom naredbe APPEND!"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "Pri_meni filtere na nove poruke u SANDUČETU ovog servera"
+
+#~ msgid "Drafts"
+#~ msgstr "Priprema"
+
+#~ msgid "Sent"
+#~ msgstr "Poslato"
+
+#~ msgid "Templates"
+#~ msgstr "Šabloni"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje komande IMAP serveru %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Neočekivan odgovor od IMAP4 servera %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Neočekivan pozdrav od IMAP servera: %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "Nije moguće izabrati fasciklu „%s“: neispravno ime sandučeta"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Nije moguće izabrati fasciklu „%s“: loša naredba"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Neuspelo slanje naredbe IMAP serveru %s: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "Veza sa IMAP4 serverom %s je neočekivano prekinuta: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Omogućavanje otkrivanja dopisne liste je potrebno nekim filterima i "
+#~ "pravilima za vFascikle"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Isticanje zapamćenih poruka koje nisu pročitane za X sekundi"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Isticanje zapamćenih porukastarijih od X sekundi"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Nije moguće pristupiti fascikli „%s“: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "Nije moguće uskladiti oznake za fasciklu „%s“: nepoznata greška"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "Nije moguće uskladiti oznake za fasciklu „%s“: loša naredba"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Nije moguće isprazniti fasciklu „%s“: nepoznata greška"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Nije moguće isprazniti fasciklu „%s“: loša naredba"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "Nije moguće dobiti poruku %s iz fascikle „%s“: nema takve poruke"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "Nije moguće dobiti poruku %s iz fascikle „%s“: loša naredba"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Nije moguće dodati poruku u fasciklu „%s“: fascikla je samo za čitanje"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "Nije moguće dodati poruku u fasciklu „%s“: nepoznata greška"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "Nije moguće dodati poruku u fasciklu „%s“: loša naredba"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguće premestiti poruku iz fascikle „%s“ u fasciklu „%s“: nepoznata "
+#~ "greška"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Nije moguće umnožiti poruke iz fascikle „%s“ u fasciklu „%s“: nepoznata "
+#~ "greška"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguće premestiti poruke iz fascikle „%s“ u fasciklu „%s“: loša "
+#~ "naredba"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Nije moguće umnožiti poruku iz fascikle „%s“ u fasciklu „%s“: loša naredba"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Proveri da nema _đubreta među novim porukama"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Proveri da nema đubreta samo u fascikli SANDUČE"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
+
+#~ 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 "categories"
+#~ msgstr "kategorije"
+
+#~ msgid "Color Info"
+#~ msgstr "Podaci o bojama"
+
+#~ msgid "The color to render"
+#~ msgstr "Boja za obradu"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>Ko_ntakti</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Prikaži kontakte</b>"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "Unesite lozinku za %s"
+
+#~ msgid "Enter password"
+#~ msgstr "Unesite lozinku"
+
+#~ msgid "Owner"
+#~ msgstr "Vlasnik"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "Uređivač za objavljivanje"
+
+#~ msgid "Editor"
+#~ msgstr "Uređivač"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Autor za objavljivanje"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "Autor koji ne uređuje"
+
+#~ msgid "Reviewer"
+#~ msgstr "Recenzent"
+
+#~ msgid "Contributor"
+#~ msgstr "Saradnik"
+
+#~ msgid "None"
+#~ msgstr "Ništa"
+
+#~ msgid "Custom"
+#~ msgstr "Prilagođeno"
+
+#~ msgid "Generic error"
+#~ msgstr "Opšta greška"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Fascikla istog imena već postoji"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Naveden tip fascikle nije ispravan"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Nema dovoljno prostora za pravljenje fascikle"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Fascikla nije prazna"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Navedena fascikla nije pronađena"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija nije primenjena u ovoj ostavi"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operacija nije podržana"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Navedeni tip u ovoj ostavi nije podržan"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Navedena fascikla ne može biti izmenjena niti uklonjena"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Nije moguće napraviti fasciklu tako da se nalazi u njoj samoj"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Nije moguće napraviti fasciklu toga imena"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Ova operacija ne može biti izvedena u režimu van mreže."
+
+#~ msgid "%s's Folders"
+#~ msgstr "Fascikle čiji je vlasnik %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "Lične fascikle"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Omiljene javne fascikle"
+
+#~ msgid "All Public Folders"
+#~ msgstr "Sve javne fascikle"
+
+#~ msgid "Global Address List"
+#~ msgstr "Globalna lista adresa"
+
+#~ msgid "Deleted Items"
+#~ msgstr "Obrisani predmeti"
+
+#~ msgid "Journal"
+#~ msgstr "Dnevnik"
+
+#~ msgid "Notes"
+#~ msgstr "Beleške"
+
+#~ msgid "Outbox"
+#~ msgstr "Odlazna"
+
+#~ msgid "Sent Items"
+#~ msgstr "Poslati predmeti"
+
+#~ msgid "Tasks"
+#~ msgstr "Zaduženja"
+
+#~ msgid "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 +5989,17 @@ msgstr "Došlo je do višestrukih prekoračenja segmenata; nije moguće prikazat
 #~ "imena (npr. „DOMEN\\korisnik\").\n"
 #~ "Ili ste možda samo pogrešno ukucali lozinku.\n"
 #~ "\n"
+
 #~ msgid "Mailbox for %s is not on this server."
 #~ msgstr "Mailbox za %s nije na ovom serveru."
+
 #~ msgid ""
 #~ "The server '%s' is running Exchange 5.5 and is\n"
 #~ "therefore not compatible with Ximian Connector"
 #~ msgstr ""
 #~ "Server '%s' koristi Exchange 5.5 i stoga\n"
 #~ "nije kompatibilan sa Ximian Connector-om"
+
 #~ msgid ""
 #~ "Could not find Exchange Web Storage System at %s.\n"
 #~ "If OWA is running on a different path, you must specify that in the\n"
@@ -5441,26 +6008,37 @@ msgstr "Došlo je do višestrukih prekoračenja segmenata; nije moguće prikazat
 #~ "Nije moguće pronaći Exchange Web Storage System na %s.\n"
 #~ "Ukoliko OWA radi na drugoj putanji, morate je navesti u\n"
 #~ "podešavanju naloga."
+
 #~ msgid "No mailbox for user %s on %s.\n"
 #~ msgstr "Nema mailbox-a za korisnika %s na %s.\n"
+
 #~ msgid "Could not connect to server %s: %s"
 #~ msgstr "Nije moguće povezivanje na server %s: %s"
+
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Nije moguće povezivanje na domaćina"
+
 #~ msgid "Network error"
 #~ msgstr "Greška na mreži"
+
 #~ msgid "Folder Name"
 #~ msgstr "Ime fascikle"
+
 #~ msgid "Folder Size"
 #~ msgstr "Veličina fascikle"
+
 #~ msgid "Groupwise server %s"
 #~ msgstr "GroupWise server %s"
+
 #~ msgid "e_book_open: cancelled"
 #~ msgstr "e_book_open: otkazan"
+
 #~ msgid "e_book_load_uri: no factories available for uri `%s'"
 #~ msgstr "e_book_load_uri: nema dostupnih tvornica za adresu „%s“"
+
 #~ msgid "File As"
 #~ msgstr "Zavedi kao"
+
 #~ msgid ""
 #~ "Failed to GPG %s: %s\n"
 #~ "\n"
@@ -5469,108 +6047,153 @@ msgstr "Došlo je do višestrukih prekoračenja segmenata; nije moguće prikazat
 #~ "Nisam mogao da primenim GPG %s: %s\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Failed to GPG %s: %s\n"
 #~ msgstr "Nisam mogao da primenim GPG %s: %s\n"
+
 #~ msgid "Address Book and Calendar"
 #~ msgstr "Adresar i kalendar"
+
 #~ msgid "Post Office Agent:"
 #~ msgstr "Agent za poštu:"
+
 #~ msgid "Use Secure Connection (SSL)"
 #~ msgstr "Koristi bezbednu vezu (SSL)"
+
 #~ msgid "Checklist"
 #~ msgstr "Spisak za overu"
+
 #~ msgid "Server rejected username"
 #~ msgstr "Server je odbio korisnika"
+
 #~ msgid "Failed to send username to server"
 #~ msgstr "Neuspešno slanje korisničkog imena serveru"
+
 #~ msgid "Server rejected username/password"
 #~ msgstr "Server je odbio korisnika/lozinku"
+
 #~ msgid "Could not get group list from server."
 #~ msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
+
 #~ msgid "Unable to load grouplist file for %s: %s"
 #~ msgstr "Ne mogu da učitam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "Ne mogu da sačuvam datoteku sa spiskom grupa za %s: %s"
+
 #~ msgid "Evolution Addressbook file and LDAP backend"
 #~ msgstr "Datoteka adresara i LDAP podrška za Evoluciju"
+
 #~ msgid "uid? expects 1 argument"
 #~ msgstr "uid? očekuje 1 argument"
+
 #~ msgid "uid? expects argument 1 to be a string"
 #~ msgstr "uid? očekuje 1 argument da bude niska"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_add_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::addContact call"
 #~ msgstr "Corba izuzetak poziva Book::addContact"
+
 #~ msgid "e_book_commit_contact called on book before e_book_load_uri"
 #~ msgstr "pozvan je e_book_commit_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::modifyContact call"
 #~ msgstr "Corba izuzetak poziva Book::modifyContact"
+
 #~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_fields na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedFields call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedFields"
+
 #~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
 #~ msgstr "e_book_get_supported_auth_methods na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getSupportedAuthMethods call"
 #~ msgstr "Corba izuzetak poziva Book::getSupportedAuthMethods"
+
 #~ msgid "e_book_authenticate_user on book before e_book_load_uri"
 #~ msgstr "e_book_authenticate_user na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::authenticateUser call"
 #~ msgstr "Corba izuzetak poziva Book::authenticateUser"
+
 #~ msgid "e_book_get_contact on book before e_book_load_uri"
 #~ msgstr "e_book_get_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContact call"
 #~ msgstr "Corba izuzetak poziva Book::getContact"
+
 #~ msgid "e_book_remove_contact on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contact na imeniku pre e_book_load_uri"
+
 #~ msgid "e_book_remove_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_remove_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::removeContacts call"
 #~ msgstr "Corba izuzetak poziva Book::removeContacts"
+
 #~ msgid "e_book_get_book_view on book before e_book_load_uri"
 #~ msgstr "e_book_get_book_view na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getBookView call"
 #~ msgstr "Corba izuzetak poziva Book::getBookView"
+
 #~ msgid "e_book_get_contacts on book before e_book_load_uri"
 #~ msgstr "e_book_get_contacts na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getContactList call"
 #~ msgstr "Corba izuzetak poziva Book::getContactList"
+
 #~ msgid "e_book_get_changes on book before e_book_load_uri"
 #~ msgstr "e_book_get_changes na imeniku pre e_book_load_uri"
+
 #~ msgid "Corba exception making Book::getChanges call"
 #~ msgstr "Corba izuzetak poziva Book::getChanges"
+
 #~ msgid "Corba exception making Book::cancelOperation call"
 #~ msgstr "Corba izuzetak poziva Book::cancelOperation"
+
 #~ msgid "e_book_remove on book before e_book_load_uri"
 #~ msgstr "e_book_remove na imeniku pre e_book_load_uri"
+
 #~ msgid "time-now expects 0 arguments"
 #~ msgstr "vreme-sada očekuje 0 argumenata"
+
 #~ msgid "make-time expects argument 1 to be a string"
 #~ msgstr "unesi-vreme očekuje da argument 1 bude niz"
+
 #~ msgid "time-add-day expects 2 arguments"
 #~ msgstr "dodaj-vreme očekuje 2 argumenta"
+
 #~ msgid "time-day-begin expects 1 argument"
 #~ msgstr "vreme-početka-dana očekuje 1 argument"
+
 #~ msgid "time-day-begin expects argument 1 to be a time_t"
 #~ msgstr "vreme-početka-dana očekuje da argument 1 bude time_t"
+
 #~ msgid "time-day-end expects 1 argument"
 #~ msgstr "vreme-kraja-dana očekuje 1 argument"
+
 #~ msgid "occur-in-time-range? expects 2 arguments"
 #~ msgstr "desi-se-u-periodu? očekuje 2 argumenta"
+
 #~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
 #~ msgstr "desi-se-u-periodu? očekuje da argument 1 bude time_t"
+
 #~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
 #~ msgstr "desi-se-u-periodu? očekuje da argument 2 bude time_t"
+
 #~ msgid "has-recurrences? expects no arguments"
 #~ msgstr "ponavlja-se? ne očekuje argumente"
+
 #~ msgid "is-completed? expects 0 arguments"
 #~ msgstr "je-gotov? očekuje 0 argumenata"
+
 #~ msgid "completed-before? expects 1 argument"
 #~ msgstr "gotov-pre? očekuje 1 argument"
+
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "gotov-pre? očekuje da argument 1 bude time_t"
-
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "Na ovom računaru"
author	Мирослав Николић <miroslavnikolic@rocketmail.com>	2011-06-24 20:41:21 +0200
committer	Милош Поповић <gpopac@gmail.com>	2011-06-24 20:41:21 +0200
commit	e5a8bfb519888fe9b27c95ad67d223362a27d296 (patch)
tree	e0e258a2f3259bdf9f068542d5b90d9cdd69ff38
parent	75c691d7d3d0baf860dc55026dc4ae2916d170d7 (diff)
download	evolution-data-server-e5a8bfb519888fe9b27c95ad67d223362a27d296.tar.gz