[evolution-data-server] Updated Serbian translation

[Мирослав Николић <mirosnik src gnome org>]

commit 1afcc7fdd0a9cbe030c125e041d0e9be6d299b06
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Mon Feb 22 08:45:58 2016 +0100

    Updated Serbian translation

 po/sr.po       | 1383 ++++++++++++++++++++---------------
 po/sr latin po | 2222 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2086 insertions(+), 1519 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index a1bf710..14452eb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,28 +1,26 @@
 # Serbian translation of evolution-data-server
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution-data-server package.
 # Данило Шеган <dsegan gmx net>
 # Игор Несторовић <igor prevod org>, 2005.
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2015.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2016.
 # Милош Поповић <gpopac gmail com>, 2015.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2015-09-22 06:37+0000\n"
-"PO-Revision-Date: 2015-09-22 14:05+0200\n"
-"Last-Translator: Милош Поповић <gpopac gmail com>\n"
-"Language-Team: српски <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: 2016-02-21 06:13+0000\n"
+"PO-Revision-Date: 2016-02-22 08:43+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
@@ -112,64 +110,64 @@ msgstr "Нисам успео да преименујем стару базу п
 #: ../addressbook/libebook/e-book-client.c:3424
 #: ../addressbook/libebook/e-book-client.c:3642
 #: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:585
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:670
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:701
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
 #: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3492
-#: ../calendar/libecal/e-cal-client.c:3665
-#: ../calendar/libecal/e-cal-client.c:3929
-#: ../calendar/libecal/e-cal-client.c:4170
-#: ../calendar/libecal/e-cal-client.c:4360
-#: ../calendar/libecal/e-cal-client.c:4553
-#: ../calendar/libecal/e-cal-client.c:4762
-#: ../calendar/libecal/e-cal-client.c:4931
-#: ../calendar/libecal/e-cal-client.c:5134
-#: ../calendar/libecal/e-cal-client.c:5284
-#: ../calendar/libecal/e-cal-client.c:5478
-#: ../calendar/libecal/e-cal-client.c:5631
-#: ../calendar/libecal/e-cal-client.c:5848
-#: ../calendar/libecal/e-cal-client.c:6002
-#: ../calendar/libecal/e-cal-client.c:6228
-#: ../calendar/libecal/e-cal-client.c:6424
-#: ../calendar/libecal/e-cal-client.c:6787
-#: ../calendar/libecal/e-cal-client.c:7009
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
-#: ../camel/providers/imapx/camel-imapx-server.c:2950
-#: ../camel/providers/imapx/camel-imapx-server.c:2962
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:2979
+#: ../camel/providers/imapx/camel-imapx-server.c:2989
+#: ../camel/providers/imapx/camel-imapx-server.c:3001
 #: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:814
+#: ../addressbook/backends/google/e-book-backend-google.c:781
 msgid "Querying for updated contacts…"
 msgstr "Пропитујем за ажурираним контактима…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:998
+#: ../addressbook/backends/google/e-book-backend-google.c:965
 msgid "Querying for updated groups…"
 msgstr "Пропитујем за ажурираним групама…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1482
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
 msgid "The backend does not support bulk additions"
 msgstr "Позадинац не подржава групно додавање"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1949
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1604
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
 msgid "The backend does not support bulk modifications"
 msgstr "Позадинац не подржава групно уређивање"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2158
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
 msgid "The backend does not support bulk removals"
 msgstr "Позадинац не подржава групно уклањање"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2280
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
 msgid "Loading…"
 msgstr "Учитавам…"
 
@@ -205,7 +203,7 @@ msgstr "Нисам повезан"
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
 msgid "Failed to bind using either v3 or v2 binds"
-msgstr "Нисам успео да повежем користећи ни в3 ни в2 везице"
+msgstr "Нисам успео да свежем користећи ни в3 ни в2 везице"
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
 msgid "Reconnecting to LDAP server..."
@@ -225,7 +223,7 @@ msgstr "Грешка ЛДАП-а 0x%x (%s)"
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
-msgstr "%s: „NULL“ је враћено са првог уноса лдапа (ldap_first_entry)"
+msgstr "%s: „NULL“ је враћено са првог уноса лдапа"
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
@@ -267,7 +265,7 @@ msgstr "Уклањам контакт са ЛДАП сервера..."
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
 #, c-format
 msgid "Failed to get the DN for user '%s'"
-msgstr "Нисам успео да добавим ДН за корисника „%s“"
+msgstr "Нисам успео да добавим назив домена за корисника „%s“"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
 #: ../calendar/backends/http/e-cal-backend-http.c:512
@@ -298,22 +296,22 @@ msgstr "Учитавам контакте (%d%%)"
 msgid "Cannot transform SoupURI to string"
 msgstr "Не могу да преобратим Соуп адресу у ниску"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1533
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Није успело стварање ресурса „%s“ са ХТТП стањем %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1635
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
 msgid "Contact on server changed -> not modifying"
 msgstr "Измењен је контакт на серверу —> не мењам"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1643
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Измена контакта није успела са ХТТП стањем %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1736
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1752
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "Није успело брисање (DELETE) са ХТТП стањем %d"
@@ -325,7 +323,7 @@ msgstr "Нема таквог адресара"
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
 #: ../addressbook/libedata-book/e-data-book.c:384
 msgid "Contact not found"
-msgstr "Contact not found"
+msgstr "Нисам нашао контакт"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
 #: ../addressbook/libedata-book/e-data-book.c:385
@@ -382,19 +380,19 @@ msgstr "Надимак"
 #. Email fields
 #: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
-msgstr "1° електронска адреса"
+msgstr "1. ел. пошта"
 
 #: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
-msgstr "2° електронска адреса"
+msgstr "2. ел. пошта"
 
 #: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
-msgstr "3° електронска адреса"
+msgstr "3. ел. пошта"
 
 #: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
-msgstr "4° електронска адреса"
+msgstr "4. ел. пошта"
 
 #: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
@@ -403,15 +401,15 @@ msgstr "Пошиљалац"
 #. Address Labels
 #: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
-msgstr "Ознака кућне адресе"
+msgstr "Натпис кућне адресе"
 
 #: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
-msgstr "Ознака адресе на послу"
+msgstr "Натпис адресе на послу"
 
 #: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
-msgstr "Ознака друге адресе"
+msgstr "Натпис друге адресе"
 
 #. Phone fields
 #: ../addressbook/libebook-contacts/e-contact.c:162
@@ -424,7 +422,7 @@ msgstr "Телефон на послу"
 
 #: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
-msgstr "2° телефон на послу"
+msgstr "2. телефон на послу"
 
 #: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
@@ -448,7 +446,7 @@ msgstr "Кућни телефон"
 
 #: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
-msgstr "2° кућни телефон"
+msgstr "2. кућни телефон"
 
 #: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
@@ -489,7 +487,7 @@ msgstr "Телекс"
 #. To translators: TTY is Teletypewriter
 #: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
-msgstr "ТТВ"
+msgstr "Конзола"
 
 #. Organizational fields
 #: ../addressbook/libebook-contacts/e-contact.c:184
@@ -506,7 +504,7 @@ msgstr "Канцеларија"
 
 #: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
-msgstr "Титула"
+msgstr "Звање"
 
 #: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
@@ -523,7 +521,7 @@ msgstr "Помоћник"
 #. Web fields
 #: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
-msgstr "Лична страница"
+msgstr "Почетна страница"
 
 #: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
@@ -537,7 +535,7 @@ msgstr "Категорије"
 #. Collaboration fields
 #: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
-msgstr "Адреса календара"
+msgstr "Путања календара"
 
 #: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
@@ -746,7 +744,7 @@ msgstr "Слика"
 
 #: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
-msgstr "Лого"
+msgstr "Логотип"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
@@ -818,7 +816,6 @@ msgid "X.509 Certificate"
 msgstr "X.509 уверење"
 
 #: ../addressbook/libebook-contacts/e-contact.c:297
-#| msgid "X.509 Certificate"
 msgid "PGP Certificate"
 msgstr "ПГП уверење"
 
@@ -977,7 +974,7 @@ msgstr "Не могу да изменим вредност својства ад
 msgid "Unable to connect to '%s': "
 msgstr "Не могу да се повежем на „%s“: "
 
-#: ../addressbook/libebook/e-book-client-view.c:868
+#: ../addressbook/libebook/e-book-client-view.c:870
 #: ../calendar/libecal/e-cal-client-view.c:681
 #, c-format
 msgid "Client disappeared"
@@ -995,7 +992,7 @@ msgid "Error parsing regular expression"
 msgstr "Грешка обраде регуларног израза"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:721
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
 #, c-format
 msgid "Insufficient memory"
 msgstr "Недовољно меморије"
@@ -1012,7 +1009,7 @@ msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
-"Поље контакта „%s“ „%s“ врсте је наведено у сажетку. али су подржане само "
+"Поље контакта „%s“ „%s“ врсте је наведено у сажетку, али су подржане само "
 "врсте поља логичке вредности, ниске и списка ниске"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
@@ -1161,12 +1158,12 @@ msgstr "Приступ је одбијен"
 #: ../addressbook/libedata-book/e-data-book.c:386
 #: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
-msgstr "Неуспела аутентификација"
+msgstr "Потврђивање идентитета није успело"
 
 #: ../addressbook/libedata-book/e-data-book.c:387
 #: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
-msgstr "Потребна је пријава"
+msgstr "Потребно је потврђивање идентитета"
 
 #: ../addressbook/libedata-book/e-data-book.c:388
 #: ../calendar/libedata-cal/e-data-cal.c:419
@@ -1176,7 +1173,7 @@ msgstr "Неподржано поље"
 #: ../addressbook/libedata-book/e-data-book.c:389
 #: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
 msgid "Unsupported authentication method"
-msgstr "Неподржан начин аутентификације"
+msgstr "Неподржан начин потврђивања идентитета"
 
 #: ../addressbook/libedata-book/e-data-book.c:390
 #: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
@@ -1199,12 +1196,12 @@ msgstr "Није доступно у режиму ван мреже"
 #: ../addressbook/libedata-book/e-data-book.c:394
 #: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
 msgid "Search size limit exceeded"
-msgstr "Премашена величина претраге"
+msgstr "Премашена је величина претраге"
 
 #: ../addressbook/libedata-book/e-data-book.c:395
 #: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
 msgid "Search time limit exceeded"
-msgstr "Истекло време за претрагу"
+msgstr "Истекло је време за претрагу"
 
 #: ../addressbook/libedata-book/e-data-book.c:397
 #: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
@@ -1221,7 +1218,7 @@ msgstr "Не могу да откажем"
 #: ../addressbook/libedata-book/e-data-book.c:400
 #: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
-msgstr "Неисправна верзија сервера"
+msgstr "Неисправно издање сервера"
 
 #: ../addressbook/libedata-book/e-data-book.c:402
 #: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
@@ -1236,7 +1233,7 @@ msgstr "Неисправан аргумент"
 #: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
 #, c-format
 msgid "Not supported"
-msgstr "Није подржан"
+msgstr "Није подржано"
 
 #: ../addressbook/libedata-book/e-data-book.c:405
 #: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
@@ -1271,7 +1268,7 @@ msgstr "Не могу да освежим адресар: "
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:1497
 msgid "Cannot get contact: "
-msgstr "Не могу да добијем контакт: "
+msgstr "Не могу да добавим контакт: "
 
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:1546
@@ -1322,36 +1319,37 @@ msgstr "Ван прегледа усаглашавања приликом пре
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "Азбучни индекс је подешен за неисправан језик"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:668
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Сервер је недоступан (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:699
 #, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "Нисам успео да се повежем на сервер користећи ССЛ: %s"
+#| msgid "Failed to connect to a server using SSL: %s"
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "Нисам успео да се повежем на сервер користећи ССЛ/ТЛС: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:715
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Враћен је неочекивани код „%d“ ХТТП стања (%s) за путању: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:651
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:736
 msgid "CalDAV backend is not loaded yet"
 msgstr "Позадинац КолДАВ-а још увек није учитан"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1100
-#: ../libedataserver/e-webdav-discover.c:146
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1173
+#: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Неисправна адреса преусмеравања"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2926
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3030
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Не могу да направим фасциклу месне оставе „%s“"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3006
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3113
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1360,27 +1358,27 @@ msgstr ""
 "Сервер је недоступан, календар је отворен у режиму само за читање.\n"
 "Порука грешке: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4208
 msgid "CalDAV does not support bulk additions"
 msgstr "КолДАВ не подржава групно додавање"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4197
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4311
 msgid "CalDAV does not support bulk modifications"
 msgstr "КолДАВ не подржава групно уређивање"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4478
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4592
 msgid "CalDAV does not support bulk removals"
 msgstr "КолДАВ не подржава групно уклањање"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5160
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5274
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Календар не подржава Слободно / Заузето"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5169
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5283
 msgid "Schedule outbox url not found"
 msgstr "Није пронађена адреса отпремног сандучета распореда"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5380
 msgid "Unexpected result in schedule-response"
 msgstr "Неочекиван резултат у распореду-одговору"
 
@@ -1400,7 +1398,7 @@ msgstr "Годишњица: %s"
 
 #: ../calendar/backends/file/e-cal-backend-file.c:245
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "Не могу да сачувам податак из календара: лоша адреса."
+msgstr "Не могу да сачувам податак из календара: лоша путања."
 
 #: ../calendar/backends/file/e-cal-backend-file.c:252
 #: ../calendar/backends/file/e-cal-backend-file.c:258
@@ -1410,7 +1408,7 @@ msgstr "Не могу да сачувам податке календара"
 #: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Redirected to Invalid URI"
-msgstr "Преусмерено на неисправну адресу"
+msgstr "Преусмерено на неисправну путању"
 
 #: ../calendar/backends/http/e-cal-backend-http.c:640
 #, c-format
@@ -1497,7 +1495,7 @@ msgstr "Прогноза"
 
 #: ../calendar/libecal/e-cal.c:2306
 msgid "Repository is offline"
-msgstr "Складиште није на мрежи"
+msgstr "Складиште је ван мреже"
 
 #: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
 msgid "No such calendar"
@@ -1506,7 +1504,7 @@ msgstr "Нема таквог календара"
 #: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
 #: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
-msgstr "Објекат није нађен"
+msgstr "Нисам нашао објекат"
 
 #: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
 #: ../calendar/libedata-cal/e-data-cal.c:415
@@ -1515,11 +1513,11 @@ msgstr "Неисправан објекат"
 
 #: ../calendar/libecal/e-cal.c:2314
 msgid "URI not loaded"
-msgstr "Адреса није учитана"
+msgstr "Путања није учитана"
 
 #: ../calendar/libecal/e-cal.c:2316
 msgid "URI already loaded"
-msgstr "Адреса је већ учитана"
+msgstr "Путања је већ учитана"
 
 #: ../calendar/libecal/e-cal.c:2320
 msgid "Unknown User"
@@ -1536,25 +1534,25 @@ msgstr "Протокол није подржан"
 
 #: ../calendar/libecal/e-cal.c:2326
 msgid "Operation has been canceled"
-msgstr "Операција је отказана"
+msgstr "Радња је отказана"
 
 #: ../calendar/libecal/e-cal.c:2328
 msgid "Could not cancel operation"
-msgstr "Не могу да откажем операцију"
+msgstr "Не могу да откажем радњу"
 
 #: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
 msgid "Authentication failed"
 msgstr "Потврђивање идентитета није успело"
 
 #: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
 #: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "Потребно је потврђивање идентитета"
 
 #: ../calendar/libecal/e-cal.c:2334
 msgid "A D-Bus exception has occurred"
-msgstr "Дошло је до изузетка Д-баса"
+msgstr "Дошло је до изузетка Д-сабирнице"
 
 #: ../calendar/libecal/e-cal.c:2338
 msgid "No error"
@@ -1580,131 +1578,131 @@ msgstr "Непознато својство календара „%s“"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Не могу да изменим вредност својства календара „%s“"
 
-#: ../calendar/libecal/e-cal-component.c:1349
+#: ../calendar/libecal/e-cal-component.c:1357
 msgid "Untitled appointment"
 msgstr "Неименовани заказани састанак"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4744
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4745
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4746
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4747
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4748
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4749
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4750
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4751
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4752
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4753
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4754
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4755
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4756
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4757
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4758
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4759
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4760
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4761
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4762
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4763
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4764
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4765
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4766
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4767
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4768
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4769
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4072
+#: ../calendar/libecal/e-cal-recur.c:4770
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4073
+#: ../calendar/libecal/e-cal-recur.c:4771
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4074
+#: ../calendar/libecal/e-cal-recur.c:4772
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4075
+#: ../calendar/libecal/e-cal-recur.c:4773
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4076
+#: ../calendar/libecal/e-cal-recur.c:4774
 msgid "31st"
 msgstr "31."
 
@@ -1761,7 +1759,7 @@ msgstr "„%s“ очекује два или три аргумента"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "„%s“ очекује да први аргумент буде time_t"
+msgstr "„%s“ очекује да први аргумент буде „time_t“"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
@@ -1769,7 +1767,7 @@ msgstr "„%s“ очекује да први аргумент буде time_t"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "„%s“ очекује да други аргумент буде time_t"
+msgstr "„%s“ очекује да други аргумент буде „time_t“"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, c-format
@@ -1918,35 +1916,35 @@ msgstr "Не могу да преузмем временску зону кале
 msgid "Could not add calendar time zone: "
 msgstr "Не могу да додам временску зону календара: "
 
-#: ../camel/camel-cipher-context.c:199
+#: ../camel/camel-cipher-context.c:204
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава потписивање"
 
-#: ../camel/camel-cipher-context.c:212
+#: ../camel/camel-cipher-context.c:217
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава проверу"
 
-#: ../camel/camel-cipher-context.c:228
+#: ../camel/camel-cipher-context.c:233
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава шифровање"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:247
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Употребљени алгоритам не подржава дешифровање"
 
-#: ../camel/camel-cipher-context.c:358
+#: ../camel/camel-cipher-context.c:363
 msgid "Signing message"
 msgstr "Потписивање поруке"
 
-#: ../camel/camel-cipher-context.c:648
+#: ../camel/camel-cipher-context.c:653
 msgid "Encrypting message"
 msgstr "Шифровање поруке"
 
-#: ../camel/camel-cipher-context.c:820
+#: ../camel/camel-cipher-context.c:825
 msgid "Decrypting message"
 msgstr "Дешифровање поруке"
 
@@ -1962,81 +1960,87 @@ msgstr "Празна датотека оставе"
 #: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "Није могуће уклонити унос из оставе: %s: %s"
+msgstr "Не могу да уклоним унос из оставе: %s: %s"
+
+# bug: quotes on the other one as well
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Не могу да преименујем „%s“ у „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:798
+#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Нисам успео да направим садржани процес „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:962
+#: ../camel/camel-filter-driver.c:982
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Неисправан низ порука примљен од „%s“: %s"
+msgstr "Неисправан ток порука примљен од „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
 msgid "Syncing folders"
 msgstr "Усклађујем фасцикле"
 
-#: ../camel/camel-filter-driver.c:1276
+#: ../camel/camel-filter-driver.c:1296
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Грешка приликом читања филтера: %s: %s"
+msgstr "Грешка обраде филтера: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Грешка приликом примене филтера: %s: %s"
+msgstr "Грешка примене филтера: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1403
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Не могу да отворим фасциклу припреме"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Не могу да обрадим фасциклу припреме"
 
-#: ../camel/camel-filter-driver.c:1418
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Примам поруку %d (%d%%)"
+msgstr "Добављам поруку %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
 #, c-format
 msgid "Failed on message %d"
-msgstr "Грешка код поруке %d"
+msgstr "Нисам успео на %d. поруци"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
 msgid "Syncing folder"
 msgstr "Усклађујем фасциклу"
 
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
 msgid "Complete"
 msgstr "Завршено"
 
-#: ../camel/camel-filter-driver.c:1536
+#: ../camel/camel-filter-driver.c:1556
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Примам поруку %d од %d"
+msgstr "Добављам %d. поруку од %d"
 
-#: ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1574
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "Грешка код поруке %d од %d"
+msgstr "Грешка код %d. поруке од %d"
 
-#: ../camel/camel-filter-driver.c:1749 ../camel/camel-filter-driver.c:1776
+#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Није успело извршавање пропусника „%s“: "
 
-#: ../camel/camel-filter-driver.c:1766
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Грешка обраде пропусника „%s“: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1785
+#: ../camel/camel-filter-driver.c:1805
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Грешка извршавања пропусника „%s“: %s: %s"
@@ -2062,7 +2066,7 @@ msgstr "Неисправни аргументи за (место-поруке)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка у примени филтера за претрагу: %s: %s"
 
-#: ../camel/camel-folder.c:321
+#: ../camel/camel-folder.c:326
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -2071,7 +2075,7 @@ msgstr[1] "Учим нове спам поруке у „%s“"
 msgstr[2] "Учим нове спам поруке у „%s“"
 msgstr[3] "Учим нову спам поруку у „%s“"
 
-#: ../camel/camel-folder.c:361
+#: ../camel/camel-folder.c:366
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -2080,50 +2084,50 @@ msgstr[1] "Учим нове хам поруке у „%s“"
 msgstr[2] "Учим нове хам поруке у „%s“"
 msgstr[3] "Учим нову хам поруку у „%s“"
 
-#: ../camel/camel-folder.c:409
+#: ../camel/camel-folder.c:414
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "Филтрирам нову поруку у „%s“"
-msgstr[1] "Филтрирам нове поруке у „%s“"
-msgstr[2] "Филтрирам нове поруке у „%s“"
+msgstr[0] "Издвајам нову поруку у „%s“"
+msgstr[1] "Издвајам нове поруке у „%s“"
+msgstr[2] "Издвајам нове поруке у „%s“"
 msgstr[3] "Филтрирам нову поруку у „%s“"
 
-#: ../camel/camel-folder.c:1015
+#: ../camel/camel-folder.c:1020
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Премештам поруке"
 
-#: ../camel/camel-folder.c:1018
+#: ../camel/camel-folder.c:1023
 msgid "Copying messages"
 msgstr "Умножавам поруке"
 
-#: ../camel/camel-folder.c:1060
+#: ../camel/camel-folder.c:1065
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Обавештење о количини није подржано за фасциклу „%s“"
 
-#: ../camel/camel-folder.c:1152
+#: ../camel/camel-folder.c:1160
 #, c-format
 msgid "Filtering folder '%s'"
-msgstr "Издвајам фасциклу „%s“"
+msgstr "Пробирам фасциклу „%s“"
 
-#: ../camel/camel-folder.c:2878
+#: ../camel/camel-folder.c:2896
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Празним фасциклу „%s“"
 
-#: ../camel/camel-folder.c:3009
+#: ../camel/camel-folder.c:3027
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Довлачим поруку „%s“ у %s"
 
-#: ../camel/camel-folder.c:3200
+#: ../camel/camel-folder.c:3218
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Довлачим обавештење о количини за „%s“"
 
-#: ../camel/camel-folder.c:3497
+#: ../camel/camel-folder.c:3515
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Освежавам фасциклу „%s“"
@@ -2158,7 +2162,7 @@ msgstr "(%s) очекује низ као резултат"
 msgid "(%s) requires the folder set"
 msgstr "(%s) захтева скуп фасцикли"
 
-#: ../camel/camel-folder-search.c:1962 ../camel/camel-folder-search.c:2131
+#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2167,7 +2171,7 @@ msgstr ""
 "Не могу да анализирам израз претраге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1974 ../camel/camel-folder-search.c:2143
+#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2176,28 +2180,28 @@ msgstr ""
 "Грешка приликом извршавања израза претраге: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2139
+#: ../camel/camel-folder-summary.c:2156
 #, c-format
 msgid "Release unused memory for folder '%s'"
 msgstr "Отпуштам некоришћену меморију за фасциклу „%s“"
 
-#: ../camel/camel-folder-summary.c:2351
+#: ../camel/camel-folder-summary.c:2368
 #, c-format
 msgid "Update preview data for folder '%s'"
-msgstr "Ажурирам податке претпрегледа за фасциклу „%s“"
+msgstr "Ажурирам податке прегледа за фасциклу „%s“"
 
-#: ../camel/camel-gpg-context.c:728 ../camel/camel-gpg-context.c:733
-#: ../camel/camel-gpg-context.c:1400
+#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:1442
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Нисам успео да извршим гчп: %s"
 
-#: ../camel/camel-gpg-context.c:733
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/camel-gpg-context.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1130
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../camel/camel-gpg-context.c:798
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2208,17 +2212,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:876
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Нисам успео да анализирам подсетник гчп иб-а корисника."
 
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Нисам успео да анализирам захтев за гчп лозинком."
 
-#: ../camel/camel-gpg-context.c:895
+#: ../camel/camel-gpg-context.c:937
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2227,7 +2231,7 @@ msgstr ""
 "Потребан вам је ПИН да откључате кључ\n"
 "Паметне картице: „%s“"
 
-#: ../camel/camel-gpg-context.c:899
+#: ../camel/camel-gpg-context.c:941
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2236,12 +2240,12 @@ msgstr ""
 "Потребна вам је лозинка да откључате кључ\n"
 "корисника: „%s“"
 
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:947
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Неочекиван захтев ГнуЧП-а за „%s“"
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:959
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2249,75 +2253,74 @@ msgstr ""
 "Знајте да шифровани садржај не садржи податке о примаоцу, тако да ће бити "
 "постављен упит за лозинку за сваки сачувани лични кључ."
 
-#: ../camel/camel-gpg-context.c:948 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
 #: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: ../camel/camel-gpg-context.c:969
+#: ../camel/camel-gpg-context.c:1011
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Нисам успео да откључам тајни кључ: унете су 3 погрешне лозинке."
 
-#: ../camel/camel-gpg-context.c:982
+#: ../camel/camel-gpg-context.c:1024
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочекиван одговор ГнуЧП-а: %s"
 
-#: ../camel/camel-gpg-context.c:1120
+#: ../camel/camel-gpg-context.c:1162
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Нисам успео да шифрујем: нису означени исправни примаоци."
 
-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-smime-context.c:843
+#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "Не могу да направим податке за потписивање: "
 
-#: ../camel/camel-gpg-context.c:1725 ../camel/camel-gpg-context.c:1937
-#: ../camel/camel-gpg-context.c:2047 ../camel/camel-gpg-context.c:2198
+#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
 msgid "Failed to execute gpg."
 msgstr "Нисам успео да извршим гчп."
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-gpg-context.c:1816
-#: ../camel/camel-gpg-context.c:1824 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
+#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
 #: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
 #: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не могу да проверим потпис поруке: неисправан облик поруке"
 
-#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:2000
 msgid "Cannot verify message signature: "
 msgstr "Не могу да проверим потпис поруке: "
 
-#: ../camel/camel-gpg-context.c:2013
+#: ../camel/camel-gpg-context.c:2128
 msgid "Could not generate encrypting data: "
 msgstr "Не могу да направим податке за шифровање: "
 
-#: ../camel/camel-gpg-context.c:2066
+#: ../camel/camel-gpg-context.c:2203
 msgid "This is a digitally encrypted message part"
 msgstr "Ово је дигитално шифрован део поруке"
 
-#: ../camel/camel-gpg-context.c:2122 ../camel/camel-gpg-context.c:2131
-#: ../camel/camel-gpg-context.c:2154
+#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
+#: ../camel/camel-gpg-context.c:2294
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Не могу да дешифрујем поруку: неисправан облик поруке"
 
-#: ../camel/camel-gpg-context.c:2142
+#: ../camel/camel-gpg-context.c:2282
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Нисам успео да дешифрујем МИМЕ део: грешка у протоколу"
 
-#: ../camel/camel-gpg-context.c:2208
+#: ../camel/camel-gpg-context.c:2348
 #, c-format
-#| msgid "Failed to decrypt MIME part: protocol error"
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "Не могу да дешифрујем МИМЕ део: Није пронађен тајни кључ"
 
-#: ../camel/camel-gpg-context.c:2244 ../camel/camel-smime-context.c:1288
+#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "Шифрован садржај"
 
@@ -2334,7 +2337,7 @@ msgstr "Не могу да направим закључану датотеку
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
-"Истекло је време приликом покушаја да прибавим закључану датотеку на „%s“. "
+"Истекло је време док сам покушао да прибавим закључану датотеку на „%s“. "
 "Покушајте касније."
 
 #: ../camel/camel-lock.c:215
@@ -2436,23 +2439,23 @@ msgstr "Нема доступног потписа"
 msgid "parse error"
 msgstr "грешка обраде"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:708
 #, c-format
 msgid "Resolving: %s"
-msgstr "Налазим: %s"
+msgstr "Решавам: %s"
 
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:733
 msgid "Host lookup failed"
 msgstr "Није успело тражење домаћина"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:739
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr ""
 "Није успело тражење домаћина „%s“. Проверите назив вашег домаћина за "
 "грешкама у писању."
 
-#: ../camel/camel-net-utils.c:741
+#: ../camel/camel-net-utils.c:743
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "Није успело тражење домаћина „%s“: %s"
@@ -2464,27 +2467,26 @@ msgstr "Преузимам нове поруке за рад ван мреже 
 
 #: ../camel/camel-offline-folder.c:160
 #, c-format
-#| msgid "Syncing messages in folder '%s' to disk"
 msgid "Storing changes in folder '%s'"
 msgstr "Чувам измене у фасциклу „%s“"
 
-#: ../camel/camel-offline-folder.c:259
+#: ../camel/camel-offline-folder.c:262
 #, c-format
 msgid "Checking download of new messages for offline in '%s'"
 msgstr "Проверавам преузимање нових порука за рад ван мреже у „%s“"
 
-#: ../camel/camel-offline-folder.c:372
+#: ../camel/camel-offline-folder.c:375
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Усклађујем поруке из фасцикле „%s“ на диск"
 
-#: ../camel/camel-offline-folder.c:435
+#: ../camel/camel-offline-folder.c:438
 msgid "Copy folder content locally for _offline operation"
 msgstr "Локално умножи садржај фасцикле за рад _ван мреже"
 
 #: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
-msgstr "Достављач виртуелне фасцикле е-поште"
+msgstr "Достављач виртуелне фасцикле ел. поште"
 
 #: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
@@ -2530,7 +2532,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Неисправан податак о пореклу адресе е-поште:\n"
+"Неисправан податак о пореклу адресе ел. поште:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:92
@@ -2598,7 +2600,7 @@ msgstr "Одговор сервера није садржао податке о
 #: ../camel/camel-sasl-digest-md5.c:927
 #, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Одговор сервера је садржао некомплетне податке о овлашћењу"
+msgstr "Одговор сервера је садржао непотпуне податке о овлашћењу"
 
 #: ../camel/camel-sasl-digest-md5.c:940
 #, c-format
@@ -2682,7 +2684,7 @@ msgstr "Важење тражених уверења је истекло."
 
 #: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
 #: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Лош одговор потврђивања идентитета са сервера."
@@ -2723,22 +2725,22 @@ msgstr "ОБИЧНО"
 
 #: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
-msgstr "ПОП пре СМТП"
+msgstr "ПОП пре СМТП-а"
 
 #: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ова опција ће одобрити ПОП везу пре покушаја СМТП"
+msgstr "Ова опција ће одобрити ПОП везу пре покушаја СМТП-а"
 
-#: ../camel/camel-sasl-popb4smtp.c:81
+#: ../camel/camel-sasl-popb4smtp.c:83
 msgid "POP Source UID"
 msgstr "ПОП изворни КИБ"
 
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ПОП пре СМТП провере коришћењем непознатог транспорта"
 
-#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ПОП пре СМТП потврђивање идентитета је покушано са „%s“ услугом"
@@ -2754,13 +2756,13 @@ msgid "Invalid GType registered for protocol '%s'"
 msgstr "Неисправна Гврста регистрована за протокол „%s“"
 
 #: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2892
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
 #: ../camel/providers/pop3/camel-pop3-store.c:308
 #: ../camel/providers/pop3/camel-pop3-store.c:786
-#: ../camel/providers/smtp/camel-smtp-transport.c:627
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
-msgstr "Нема подршке за „%s“ потврђивања идентитета"
+msgstr "Нема подршке за „%s“ потврђивање идентитета"
 
 #: ../camel/camel-session.c:514
 #, c-format
@@ -2897,7 +2899,7 @@ msgstr "Уверење је једина порука, не могу да про
 #: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Уверење је једина порука, уверења су увежена и проверена"
+msgstr "Уверење је једина порука, уверења су увезена и проверена"
 
 #: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
@@ -2964,47 +2966,47 @@ msgstr "Нисам успео да додам податке у шифрер"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "С/МИМЕ дешифровање: нису нађени шифровани подаци"
 
-#: ../camel/camel-store.c:1248
+#: ../camel/camel-store.c:1280
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Отварам фасциклу „%s“"
 
-#: ../camel/camel-store.c:1539
+#: ../camel/camel-store.c:1571
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Претражујем фасцикле у „%s“"
 
-#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
 #: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
 #: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Ђубре"
 
-#: ../camel/camel-store.c:2230
+#: ../camel/camel-store.c:2262
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не могу да направим фасциклу: %s: фасцикла постоји"
 
-#: ../camel/camel-store.c:2237
+#: ../camel/camel-store.c:2269
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Стварам фасциклу „%s“"
 
-#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем фасциклу: %s: неисправна операција"
 
-#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
 #: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Не могу да преименујем фасциклу: %s: неисправна операција"
+msgstr "Не могу да преименујем фасциклу: %s: неисправна радња"
 
 #: ../camel/camel-stream.c:168
 msgid "Cannot write with no base stream"
@@ -3024,6 +3026,7 @@ msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Само враћање на почетак је подржано Камеловим Хттп током"
 
 #: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "Connection cancelled"
 msgstr "Повезивање је отказано"
@@ -3068,7 +3071,7 @@ msgstr "Нема такве поруке „%s“ у „%s“"
 msgid "Error storing '%s': "
 msgstr "Грешка при смештању „%s“: "
 
-#: ../camel/camel-vee-folder.c:1191
+#: ../camel/camel-vee-folder.c:1193
 msgid "Automatically _update on change in source folders"
 msgstr "Сам _ажурирај ори измени у изворним фасциклама"
 
@@ -3086,13 +3089,13 @@ msgstr "Не могу да обришем фасциклу: %s: нема так
 #: ../camel/camel-vee-store.c:471
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Не могу да променим име фасцикле: %s: нема такве фасцикле"
+msgstr "Не могу да променим назив фасцикле: %s: нема такве фасцикле"
 
 #: ../camel/camel-vee-store.c:533
 msgid "Enable _Unmatched folder"
 msgstr "Укључи _непоклопљене фасцикле"
 
-#: ../camel/camel-vee-store.c:1025
+#: ../camel/camel-vee-store.c:1030
 msgid "Updating Unmatched search folder"
 msgstr "Освежавам непоклопљену фасциклу претраге"
 
@@ -3104,37 +3107,42 @@ msgstr "Не могу да умножим поруке у фасциклу за
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не могу да умножим поруке у фасциклу за ђубре"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:769
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
-msgstr "Морате да будете на мрежи да бисте завршили ову операцију (%s)"
-
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:777
-#: ../camel/providers/nntp/camel-nntp-store.c:1256
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:822
-#: ../camel/providers/pop3/camel-pop3-folder.c:1032
+msgstr "Морате да будете на мрежи да бисте завршили ову радњу (%s)"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
+#: ../camel/providers/imapx/camel-imapx-server.c:3060
+#: ../camel/providers/nntp/camel-nntp-store.c:349
+#: ../camel/providers/nntp/camel-nntp-store.c:1291
+#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2243
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
 #: ../camel/providers/pop3/camel-pop3-store.c:296
 #: ../camel/providers/pop3/camel-pop3-store.c:529
 #: ../camel/providers/pop3/camel-pop3-store.c:577
 #: ../camel/providers/pop3/camel-pop3-store.c:672
 #: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
 #, c-format
 msgid "You must be working online to complete this operation"
-msgstr "Морате да будете на мрежи да бисте завршили ову операцију"
+msgstr "Морате да будете на мрежи да бисте завршили ову радњу"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1270
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1358
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
 #, c-format
 msgid "No destination folder specified"
 msgstr "Није наведена фасцикла одредишта"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1297
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
 msgid "Unable to move junk messages"
 msgstr "Не могу да преместим непожељне поруке"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1392
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
 msgid "Unable to move deleted messages"
 msgstr "Не могу да преместим обрисане поруке"
 
@@ -3178,7 +3186,7 @@ msgstr "Вршим проверу за новом поштом"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
-msgstr "П_отражи нове поруке у свим фасциклама"
+msgstr "_Потражи нове поруке у свим фасциклама"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3186,7 +3194,7 @@ msgstr "Про_вери за нове поруке у пријављеним ф
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
-msgstr "Користи _Брзо поновно усаглашавање ако га сервер подржава"
+msgstr "Користи _брзо поновно усаглашавање ако га сервер подржава"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
@@ -3207,15 +3215,15 @@ msgstr "Фасцикле"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Show only subscribed folders"
-msgstr "Прик_ажи само пријављене фасцикле"
+msgstr "_Прикажи само пријављене фасцикле"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "O_verride server-supplied folder namespace"
-msgstr "П_ремости облик имена фасцикле које даје сервер"
+msgstr "Премости _облик назива фасцикле које даје сервер"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Namespace:"
-msgstr "Облик имена:"
+msgstr "Облик назива:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/local/camel-local-provider.c:39
@@ -3248,11 +3256,12 @@ msgstr "Усклади уд_аљену пошту месно у свим фас
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
-msgstr "Основни порт за ИМАП"
+msgstr "Основни прикључник за ИМАП"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "ИМАП преко ССЛ-а"
+#| msgid "IMAP over SSL"
+msgid "IMAP over TLS"
+msgstr "ИМАП преко ТЛС-а"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
@@ -3262,210 +3271,196 @@ msgstr "ИМАП+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на ИМАП сервере."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1116
+#: ../camel/providers/imapx/camel-imapx-server.c:1134
 msgid "Error writing to cache stream"
 msgstr "Грешка приликом уписа у ток оставе"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2730
-#: ../camel/providers/imapx/camel-imapx-server.c:2804
-#: ../camel/providers/imapx/camel-imapx-server.c:3039
-#| msgid "Failed to store mail in temp file %s: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:2745
+#: ../camel/providers/imapx/camel-imapx-server.c:2832
+#: ../camel/providers/imapx/camel-imapx-server.c:3093
 msgid "Failed to get capabilities"
 msgstr "Не могу да добије могућности"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2744
+#: ../camel/providers/imapx/camel-imapx-server.c:2764
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2745
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
+#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
 msgstr "СТАРТТЛС није подржан"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2751
+#: ../camel/providers/imapx/camel-imapx-server.c:2773
 msgid "Failed to issue STARTTLS"
 msgstr "Грешка у издавању поруке STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2795
+#: ../camel/providers/imapx/camel-imapx-server.c:2821
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Нисам успео да се повежем на ИМАП сервер „%s“ у безбедном режиму: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2881
+#: ../camel/providers/imapx/camel-imapx-server.c:2915
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
-msgstr "ИМАП сервер „%s“ не подржава „%s“ пријављивање идентитета"
+msgstr "ИМАП сервер „%s“ не подржава „%s“ потврђивање идентитета"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2910
-#: ../camel/providers/nntp/camel-nntp-store.c:393
-#: ../camel/providers/nntp/camel-nntp-store.c:535
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/nntp/camel-nntp-store.c:400
+#: ../camel/providers/nntp/camel-nntp-store.c:542
 msgid "Cannot authenticate without a username"
 msgstr "Не могу да потврдим идентитет без корисничког имена"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2919
-#: ../camel/providers/nntp/camel-nntp-store.c:544
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:551
 #: ../camel/providers/pop3/camel-pop3-store.c:690
 #: ../camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "Лозинка потврђивања идентитета није доступна"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#| msgid "Not authenticated"
+#: ../camel/providers/imapx/camel-imapx-server.c:2963
 msgid "Failed to authenticate"
-msgstr "Не могу да се пријавим"
+msgstr "Нисам успео да потврдим идентитет"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imapx/camel-imapx-server.c:3115
 msgid "Failed to issue NAMESPACE"
-msgstr "Не могу да издам поруку NAMESPACE"
+msgstr "Нисам успео да издам поруку „NAMESPACE“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3070
-#| msgid "Failed to encode data"
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
 msgid "Failed to enable QResync"
-msgstr "Не могу да омогућим QResync"
+msgstr "Нисам успео да омогућим „QResync“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3098
-#| msgid "Failed on message %d"
+#: ../camel/providers/imapx/camel-imapx-server.c:3165
 msgid "Failed to issue NOTIFY"
-msgstr "Не могу да издам поруку NOTIFY"
+msgstr "Нисам успео да издам поруку „NOTIFY“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3576
-#| msgid "Failed to execute gpg."
+#: ../camel/providers/imapx/camel-imapx-server.c:3624
 msgid "Failed to select mailbox"
-msgstr "Не могу да изаберем сандуче (mailbox)"
+msgstr "Нисам успео да изаберем сандуче"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3674
+#: ../camel/providers/imapx/camel-imapx-server.c:3722
 msgid "Cannot issue command, no stream available"
 msgstr "Не могу да издам наредбу, јер није доступан ток"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3925
+#: ../camel/providers/imapx/camel-imapx-server.c:3985
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "Не могу да набавим поруку са ИБ „%s“: %s"
+msgstr "Не могу да набавим поруку са ИБ-ом „%s“: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3926
+#: ../camel/providers/imapx/camel-imapx-server.c:3986
 msgid "No such message available."
 msgstr "Нема такве поруке."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3960
-#: ../camel/providers/imapx/camel-imapx-server.c:3985
-#: ../camel/providers/imapx/camel-imapx-server.c:4004
+#: ../camel/providers/imapx/camel-imapx-server.c:4022
+#: ../camel/providers/imapx/camel-imapx-server.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:4066
 msgid "Error fetching message"
-msgstr "Грешка приликом преузимања поруке"
+msgstr "Грешка преузимања поруке"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3997
+#: ../camel/providers/imapx/camel-imapx-server.c:4059
 msgid "Failed to close the tmp stream"
 msgstr "Нисам успео да затворим привремену датотеку"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4028
+#: ../camel/providers/imapx/camel-imapx-server.c:4090
 msgid "Failed to copy the tmp file"
 msgstr "Нисам успео да умножим привремену датотеку"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4187
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error moving messages"
 msgstr "Грешка премештања порука"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4187
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error copying messages"
 msgstr "Грешка умножавања порука"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4367
-#: ../camel/providers/imapx/camel-imapx-server.c:4388
+#: ../camel/providers/imapx/camel-imapx-server.c:4437
+#: ../camel/providers/imapx/camel-imapx-server.c:4458
 msgid "Cannot create spool file: "
 msgstr "Не могу да направим датотеку припреме: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4479
+#: ../camel/providers/imapx/camel-imapx-server.c:4549
 msgid "Error appending message"
 msgstr "Грешка прикачињања порука"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4569
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
 msgid "Error performing NOOP"
-msgstr "Грешка у извршењу поруке NOOP"
+msgstr "Грешка у извршењу поруке „NOOP“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4717
+#: ../camel/providers/imapx/camel-imapx-server.c:4787
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "Прегледам измењене поруке у „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4720
-#| msgid "Error syncing changes"
+#: ../camel/providers/imapx/camel-imapx-server.c:4790
 msgid "Error scanning changes"
-msgstr "Грешка приликом скенирања измена"
+msgstr "Грешка скенирања измена"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4738
+#: ../camel/providers/imapx/camel-imapx-server.c:4808
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Прикупљам преглед података нових порука у „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4755
-#| msgid "Error fetching message"
+#: ../camel/providers/imapx/camel-imapx-server.c:4825
 msgid "Error fetching message info"
-msgstr "Грешка приликом преузимања података о поруци"
+msgstr "Грешка преузимања података о поруци"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4817
+#: ../camel/providers/imapx/camel-imapx-server.c:4887
 msgid "Error running STATUS"
-msgstr "Грешка у покретању поруке STATUS"
+msgstr "Грешка у покретању поруке „STATUS“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5300
-#: ../camel/providers/imapx/camel-imapx-server.c:5352
+#: ../camel/providers/imapx/camel-imapx-server.c:5370
+#: ../camel/providers/imapx/camel-imapx-server.c:5422
 msgid "Error syncing changes"
-msgstr "Грешка приликом усклађивања измена"
+msgstr "Грешка усклађивања измена"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5463
+#: ../camel/providers/imapx/camel-imapx-server.c:5533
 msgid "Error expunging message"
-msgstr "Грешка приликом избацивања поруке"
+msgstr "Грешка избацивања поруке"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5533
+#: ../camel/providers/imapx/camel-imapx-server.c:5603
 msgid "Error fetching folders"
-msgstr "Грешка приликом преузимања фасцикле"
+msgstr "Грешка преузимања фасцикле"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5544
-#| msgid "Error fetching folders"
+#: ../camel/providers/imapx/camel-imapx-server.c:5614
 msgid "Error fetching subscribed folders"
-msgstr "Грешка приликом преузимања пријављених фасцикли"
+msgstr "Грешка преузимања пријављених фасцикли"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5566
+#: ../camel/providers/imapx/camel-imapx-server.c:5636
 msgid "Error creating folder"
-msgstr "Грешка приликом стварања фасцикле"
+msgstr "Грешка стварања фасцикле"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5622
+#: ../camel/providers/imapx/camel-imapx-server.c:5692
 msgid "Error deleting folder"
-msgstr "Грешка приликом брисања фасцикле"
+msgstr "Грешка брисања фасцикле"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5668
+#: ../camel/providers/imapx/camel-imapx-server.c:5738
 msgid "Error renaming folder"
-msgstr "Грешка приликом преименовања фасцикле"
+msgstr "Грешка преименовања фасцикле"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5700
+#: ../camel/providers/imapx/camel-imapx-server.c:5770
 msgid "Error subscribing to folder"
-msgstr "Грешка приликом пријављивања на фасциклу"
+msgstr "Грешка пријављивања на фасциклу"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5736
+#: ../camel/providers/imapx/camel-imapx-server.c:5806
 msgid "Error unsubscribing from folder"
 msgstr "Грешка одјављивања са фасцикле"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5772
+#: ../camel/providers/imapx/camel-imapx-server.c:5846
 msgid "IMAP server does not support quotas"
 msgstr "ИМАП сервер не подржава количине"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5782
+#: ../camel/providers/imapx/camel-imapx-server.c:5858
 msgid "Error retrieving quota information"
 msgstr "Грешка довлачења обавештења о количини"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5829
+#: ../camel/providers/imapx/camel-imapx-server.c:5905
 msgid "Search failed"
 msgstr "Претрага није успела"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:5940
-#| msgid "Error performing IDLE"
+#: ../camel/providers/imapx/camel-imapx-server.c:6023
 msgid "Error running IDLE"
-msgstr "Грешка у покретању поруке IDLE"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:6132
-#| msgid "Failed on message %d"
-msgid "Failed to issue DONE"
-msgstr "Грешка у издавању поруке DONE"
+msgstr "Грешка у покретању поруке „IDLE“"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imapx/camel-imapx-store.c:224
@@ -3486,7 +3481,7 @@ msgstr "ИМАП сервер „%s“"
 #: ../camel/providers/imapx/camel-imapx-store.c:768
 #, c-format
 msgid "IMAP service for %s on %s"
-msgstr "ИМАП сервис за „%s“ на „%s"
+msgstr "ИМАП услуга за „%s“ на „%s"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:836
 msgid "No IMAPx connection object provided"
@@ -3514,16 +3509,104 @@ msgid "No IMAP namespace for folder path '%s'"
 msgstr "Нема ИМАП простора назива за путању фасцикле „%s“"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:1614
-#: ../camel/providers/imapx/camel-imapx-store.c:1847
+#: ../camel/providers/imapx/camel-imapx-store.c:1848
 #, c-format
 msgid "Retrieving folder list for '%s'"
 msgstr "Довлачим списак фасцикле за „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2063
+#: ../camel/providers/imapx/camel-imapx-store.c:2065
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Име фасцикле „%s“ није исправно јер садржи знак „%c“"
+msgstr "Назив фасцикле „%s“ није исправан јер садржи знак „%c“"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2374
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Гпошта]/Нацрти"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2375
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Нацрти"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2376
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Нацрт"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2379
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "Шаблони"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2382
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Архива"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2385
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Гпошта]/Послата пошта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2386
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "Послата"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2387
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "Послате ставке"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2390
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Гпошта]/Спам"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2391
+#| msgid "Junk"
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "Ђубре"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2392
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "Непожељна ел. пошта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2393
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "Непожељна ел. пошта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2394
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Спам"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2395
+#| msgid "Mail"
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "Групна пошта"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2398
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Гпошта]/Смеће"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2399
+#| msgid "Trash"
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Смеће"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2400
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Обрисане ставке"
 
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
@@ -3534,7 +3617,7 @@ msgstr "~%s (%s)"
 #: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
-msgstr "поштанско сандуче:%s (%s)"
+msgstr "сандуче: %s (%s)"
 
 #: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
@@ -3564,7 +3647,7 @@ msgstr "МХ-обликовани директоријуми поште"
 
 #: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
-msgstr "За смештање локалне поште у директоријуме поште налик МХ."
+msgstr "За смештање локалне поште у директоријуме поште налик МХ-у."
 
 #: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
@@ -3630,12 +3713,12 @@ msgstr "Локална датотека поште %s"
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Администраторска остава „%s“ није апсолутна путања"
+msgstr "Корена остава „%s“ није апсолутна путања"
 
 #: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Администраторска остава „%s“ није регуларан директоријум"
+msgstr "Корена остава „%s“ није регуларан директоријум"
 
 #: ../camel/providers/local/camel-local-store.c:234
 #: ../camel/providers/local/camel-local-store.c:244
@@ -3705,7 +3788,7 @@ msgstr "Не могу да направим фасциклу која садрж
 #: ../camel/providers/local/camel-maildir-store.c:923
 #, c-format
 msgid "Folder %s already exists"
-msgstr "Фасцикла „%s“ већ постоји"
+msgstr "Већ постоји фасцикла „%s“"
 
 #: ../camel/providers/local/camel-maildir-store.c:266
 #: ../camel/providers/local/camel-maildir-store.c:297
@@ -3753,21 +3836,21 @@ msgstr "није директоријум поште"
 msgid "Could not scan folder '%s': %s"
 msgstr "Не могу да претражим фасциклу „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:465
-#: ../camel/providers/local/camel-maildir-summary.c:605
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не могу да отворим путању директоријума поште: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:596
+#: ../camel/providers/local/camel-maildir-summary.c:607
 msgid "Checking folder consistency"
 msgstr "Проверавам целовитост фасцикле"
 
-#: ../camel/providers/local/camel-maildir-summary.c:696
+#: ../camel/providers/local/camel-maildir-summary.c:707
 msgid "Checking for new messages"
 msgstr "Вршим проверу за новим порукама"
 
-#: ../camel/providers/local/camel-maildir-summary.c:799
+#: ../camel/providers/local/camel-maildir-summary.c:810
 #: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:687
 #: ../camel/providers/local/camel-mbox-summary.c:836
@@ -3799,7 +3882,7 @@ msgstr "Не могу да закључам фасциклу „%s“: %s"
 #: ../camel/providers/local/camel-mbox-store.c:580
 #, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Не могу да направим фасциклу овог имена."
+msgstr "Не могу да направим фасциклу овог назива."
 
 #: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
@@ -3850,19 +3933,13 @@ msgstr "Не могу да обришем преглед фасцикле „%s
 #: ../camel/providers/local/camel-mbox-store.c:806
 #, c-format
 msgid "The new folder name is illegal."
-msgstr "Ново име фасцикле је неисправно."
+msgstr "Нови назив фасцикле је неисправан."
 
 #: ../camel/providers/local/camel-mbox-store.c:822
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Не могу да преименујем „%s“: „%s“: %s"
 
-# bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:906
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Не могу да преименујем „%s“ у „%s“: %s"
-
 #: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -4064,19 +4141,19 @@ msgstr "Унутрашња грешка: КИБ у неисправном обл
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:297
 #: ../camel/providers/nntp/camel-nntp-folder.c:302
-#: ../camel/providers/pop3/camel-pop3-folder.c:572
-#: ../camel/providers/pop3/camel-pop3-folder.c:990
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не могу да добавим поруку „%s“: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:309
 #: ../camel/providers/nntp/camel-nntp-folder.c:629
-#: ../camel/providers/pop3/camel-pop3-folder.c:477
-#: ../camel/providers/pop3/camel-pop3-folder.c:508
-#: ../camel/providers/pop3/camel-pop3-folder.c:540
-#: ../camel/providers/pop3/camel-pop3-folder.c:562
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Не могу да добавим поруку „%s“: "
@@ -4085,11 +4162,11 @@ msgstr "Не могу да добавим поруку „%s“: "
 #: ../camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Posting failed: %s"
-msgstr "Неуспела пошиљка: %s"
+msgstr "Објављивање није успело: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:508
 msgid "Posting failed: "
-msgstr "Неуспела пошиљка: "
+msgstr "Објављивање није успело: "
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:618
 #, c-format
@@ -4109,15 +4186,16 @@ msgstr ""
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
-msgstr "У п_розорчету за пријаву, прикажи релативна имена фасцикли"
+msgstr "У _прозорчету за пријаву, прикажи релативне називе фасцикли"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
-msgstr "Основни порт ННТП-а"
+msgstr "Основни прикључник ННТП-а"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:55
-msgid "NNTP over SSL"
-msgstr "ННТП преко ССЛ-а"
+#| msgid "NNTP over SSL"
+msgid "NNTP over TLS"
+msgstr "ННТП преко ТЛС-а"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
@@ -4141,50 +4219,49 @@ msgid ""
 msgstr ""
 "Ова опција ће пријавити на ННТП сервер коришћењем лозинке у обичном тексту."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:377
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Не могу да прочитам поздрав са „%s“: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:378
+#: ../camel/providers/nntp/camel-nntp-store.c:385
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "ННТП сервер „%s“ је вратио код грешке „%d“: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "USENET News via %s"
 msgstr "ЈУЗНЕТ вести преко „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1157
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"Грешка при довлачењу група вести:\n"
+"Грешка довлачења група вести:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1273
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Не можете да направите фасциклу у остави вести: пријавите се уместо тога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
+#: ../camel/providers/nntp/camel-nntp-store.c:1324
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Не можете да преименујете фасциклу у остави вести."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1312
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Не можете да уклоните фасциклу у остави вести: одјавите се уместо тога."
+msgstr "Не можете да уклоните фасциклу у остави вести: одјавите се уместо тога."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1522
+#: ../camel/providers/nntp/camel-nntp-store.c:1557
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4195,7 +4272,7 @@ msgstr ""
 "\n"
 "Нема такве групе. Изабрана ставка је вероватно надређена фасцикла."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1589
+#: ../camel/providers/nntp/camel-nntp-store.c:1624
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4206,16 +4283,16 @@ msgstr ""
 "\n"
 "група не постоји!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2015
+#: ../camel/providers/nntp/camel-nntp-store.c:2050
 msgid "NNTP Command failed: "
 msgstr "ННТП наредба није успела: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2113
+#: ../camel/providers/nntp/camel-nntp-store.c:2155
 #, c-format
 msgid "Not connected."
 msgstr "Нисам повезан."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2207
+#: ../camel/providers/nntp/camel-nntp-store.c:2257
 #, c-format
 msgid "No such folder: %s"
 msgstr "Нема такве фасцикле: %s"
@@ -4229,50 +4306,50 @@ msgstr "%s: претражујем нове поруке"
 #: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Неочекиван одговор ксовера: %s"
+msgstr "Неочекиван одговор иксовера: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "Неочекиван одговор head-а: %s"
+msgstr "Неочекиван одговор сервера из заглавља: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
-msgstr "Неуспела операција: %s"
+msgstr "Радња није успела: %s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
 #, c-format
 msgid "No message with UID %s"
 msgstr "Нема поруке са КИБ-ом %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:456
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Довлачим ПОП поруку %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:573
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
 msgid "Retrieving POP summary"
 msgstr "Преузимам ПОП преглед"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:691
-#: ../camel/providers/pop3/camel-pop3-folder.c:694
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-#: ../camel/providers/pop3/camel-pop3-folder.c:720
-#: ../camel/providers/pop3/camel-pop3-folder.c:734
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
 msgid "Cannot get POP summary: "
 msgstr "Не могу да добавим ПОП преглед: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:799
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
 msgid "Expunging old messages"
 msgstr "Избацујем старе поруке"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:827
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
 msgid "Expunging deleted messages"
 msgstr "Избацујем обрисане поруке"
 
@@ -4289,7 +4366,7 @@ msgstr "_Остави поруке на серверу"
 #: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
-msgstr "О_бриши након %s дана"
+msgstr "_Обриши након %s дана"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
@@ -4301,11 +4378,12 @@ msgstr "Искључи _подршку за сва ПОП3 проширења"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
-msgstr "Основни ПОП3 порт"
+msgstr "Основни ПОП3 прикључник"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:53
-msgid "POP3 over SSL"
-msgstr "ПОП3 преко ССЛ-а"
+#| msgid "POP3 over SSL"
+msgid "POP3 over TLS"
+msgstr "ПОП3 преко ТЛС-а"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
@@ -4341,7 +4419,7 @@ msgstr ": "
 #: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Неуспело читање исправног поздрава ПОП сервера „%s“"
+msgstr "Нисам успео да прочитам исправни поздрав ПОП сервера „%s“"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:177
 #, c-format
@@ -4393,7 +4471,7 @@ msgid ""
 "Error sending password: "
 msgstr ""
 "Не могу да се повежем на ПОП сервер „%s“.\n"
-"Грешка при слању лозинке: "
+"Грешка слања лозинке: "
 
 #: ../camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
@@ -4434,8 +4512,7 @@ msgstr "Сендмејл"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"За доставу поште прослеђивањем „sendmail“ програму на локалном систему."
+msgstr "За доставу поште прослеђивањем „sendmail“ програму на локалном систему."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
@@ -4458,7 +4535,7 @@ msgstr "Слање поруке у режиму ван мреже је искљ
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
 msgid "Could not parse recipient list"
-msgstr "Не могу да анализирам списак прималаца"
+msgstr "Не могу да обрадим списак прималаца"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:199
 #, c-format
@@ -4473,7 +4550,7 @@ msgstr "Не могу да направим спојку ка „%s“: %s: по
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
-msgstr "Не могу да поделим „%s“: %s: пошта није послата"
+msgstr "Не могу да исцепим „%s“: %s: пошта није послата"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:304
 msgid "Could not send message: "
@@ -4496,15 +4573,16 @@ msgstr "„%s“ је завршио стањем „%d“: пошта није
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
-msgstr "Основни СМТП порт"
+msgstr "Основни СМТП прикључник"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:40
-msgid "SMTP over SSL"
-msgstr "СМТП преко ССЛ-а"
+#| msgid "SMTP over SSL"
+msgid "SMTP over TLS"
+msgstr "СМТП преко ТЛС-а"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
-msgstr "Порт подношења поруке"
+msgstr "Прикључник подношења поруке"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
@@ -4515,223 +4593,222 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "За доставу поште повезивањем на прослеђивач поште у мрежи коришћењем СМТП."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:227
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "Welcome response error: "
 msgstr "Грешка одговора добродошлице: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:270
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Не могу да се повежем на СМТП сервер „%s“ у сигурносном режиму: %s"
+msgstr "Не могу да се повежем на СМТП сервер „%s“ у безбедном режиму: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:279
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
-#: ../camel/providers/smtp/camel-smtp-transport.c:299
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
 msgid "STARTTLS command failed: "
-msgstr "Неуспела СТАРТТЛС наредба: "
+msgstr "СТАРТТЛС наредба није успела: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:318
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
-msgstr "Не могу да се повежем на СМТП сервер „%s“ у сигурносном режиму: "
+msgstr "Не могу да се повежем на СМТП сервер „%s“ у безбедном режиму: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:429
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 #, c-format
 msgid "SMTP server %s"
 msgstr "СМТП сервер „%s“"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:432
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "СМТП достава поште преко „%s“"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "СМТП сервер „%s“ не подржава „%s“ потврђивање идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:618
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Није наведен САСЛ механизам"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
-#| msgid "AUTH command failed: "
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
 msgid "AUTH command failed: Not connected."
-msgstr "Није успела наредба AUTH: Нисте повезани."
+msgstr "Није успела наредба потврђивања: Нисте повезани."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:661
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
-#: ../camel/providers/smtp/camel-smtp-transport.c:683
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "AUTH command failed: "
-msgstr "Неуспела наредба „AUTH“: "
+msgstr "Неуспела наредба потврђивања: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:888
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "Не могу да пошаљем поруку: сервис није повезан."
+msgstr "Не могу да пошаљем поруку: услуга није повезана."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:848
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Не могу да пошаљем поруку: адреса пошиљаоца није исправна."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:852
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Sending message"
 msgstr "Слање поруке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:930
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Не могу да пошаљем поруку: нису одређени примаоци."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:896
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Не могу да пошаљем поруку: један или више неисправних прималаца"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
 msgid "Syntax error, command unrecognized"
 msgstr "Грешка у синтакси, наредба није препозната"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "Syntax error in parameters or arguments"
 msgstr "Грешка у синтакси у параметрима или аргументима"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1032
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "Command not implemented"
 msgstr "Наредба није подржана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1034
+#: ../camel/providers/smtp/camel-smtp-transport.c:1083
 msgid "Command parameter not implemented"
 msgstr "Параметар наредбе није подржан"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1036
+#: ../camel/providers/smtp/camel-smtp-transport.c:1085
 msgid "System status, or system help reply"
-msgstr "Статус система, или одговор на помоћ"
+msgstr "Стање система, или одговор на помоћ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1038
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
 msgid "Help message"
 msgstr "Порука о помоћи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1040
+#: ../camel/providers/smtp/camel-smtp-transport.c:1089
 msgid "Service ready"
-msgstr "Сервис је спреман"
+msgstr "Услуга је спремна"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1042
+#: ../camel/providers/smtp/camel-smtp-transport.c:1091
 msgid "Service closing transmission channel"
-msgstr "Сервис затвара канал преноса"
+msgstr "Услуга затвара канал преноса"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1044
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "Service not available, closing transmission channel"
-msgstr "Сервис није доступан, затварам канал преноса"
+msgstr "Услуга није доступна, затварам канал преноса"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1046
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "Requested mail action okay, completed"
 msgstr "Тражена радња за пошту је у реду, завршено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
 msgid "User not local; will forward to <forward-path>"
-msgstr "Корисник није локалан; биће прослеђено на <путања-прослеђивања>"
+msgstr "Корисник није локалан; биће прослеђено на <путању-прослеђивања>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Тражена радња за пошту није предузета: недоступно поштанско сандуче"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Тражена радња није предузета: поштанско сандуче је недоступно"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1054
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
 msgid "Requested action aborted: error in processing"
 msgstr "Тражена радња није предузета: грешка при обради"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1056
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "User not local; please try <forward-path>"
 msgstr "Корисник није локалан; покушајте <путања-прослеђивања>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1058
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Тражена радња није предузета: недовољно простора на систему"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Прекинута је тражена радња за пошту: премашен је додељен простор"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1062
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Тражена радња није предузета: име поштанског сандучета није дозвољено"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1064
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Почиње унос поште; завршава са <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1066
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
 msgid "Transaction failed"
-msgstr "Неуспео пренос"
+msgstr "Пренос није успео"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "A password transition is needed"
 msgstr "Потребно је слање лозинке"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1072
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Authentication mechanism is too weak"
 msgstr "Механизам потврђивања идентитета је преслаб"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1123
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Неопходно је шифровање за тражени механизам потврђивања идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1076
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "Temporary authentication failure"
 msgstr "Није успело привремено потврђивање идентитета"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1415
 msgid "SMTP Greeting"
 msgstr "СМТП поздрав"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1375
-#: ../camel/providers/smtp/camel-smtp-transport.c:1388
-#: ../camel/providers/smtp/camel-smtp-transport.c:1395
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 msgid "HELO command failed: "
 msgstr "Неуспела наредба „HELO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1471
-#: ../camel/providers/smtp/camel-smtp-transport.c:1485
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
 msgid "MAIL FROM command failed: "
 msgstr "Неуспела наредба „MAIL FROM“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1522
+#: ../camel/providers/smtp/camel-smtp-transport.c:1571
 msgid "RCPT TO command failed: "
 msgstr "Неуспела наредба „RCPT TO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1538
-#: ../camel/providers/smtp/camel-smtp-transport.c:1547
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1596
 #, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> није успело: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1619
-#: ../camel/providers/smtp/camel-smtp-transport.c:1630
-#: ../camel/providers/smtp/camel-smtp-transport.c:1641
-#: ../camel/providers/smtp/camel-smtp-transport.c:1703
-#: ../camel/providers/smtp/camel-smtp-transport.c:1721
-#: ../camel/providers/smtp/camel-smtp-transport.c:1734
-#: ../camel/providers/smtp/camel-smtp-transport.c:1742
+msgstr "„RCPT TO“ <%s> није успело: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1668
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1690
+#: ../camel/providers/smtp/camel-smtp-transport.c:1752
+#: ../camel/providers/smtp/camel-smtp-transport.c:1770
+#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+#: ../camel/providers/smtp/camel-smtp-transport.c:1791
 msgid "DATA command failed: "
 msgstr "Неуспела наредба „DATA“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1768
-#: ../camel/providers/smtp/camel-smtp-transport.c:1782
-#: ../camel/providers/smtp/camel-smtp-transport.c:1790
+#: ../camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+#: ../camel/providers/smtp/camel-smtp-transport.c:1839
 msgid "RSET command failed: "
 msgstr "Неуспела наредба „RSET“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1816
-#: ../camel/providers/smtp/camel-smtp-transport.c:1828
-#: ../camel/providers/smtp/camel-smtp-transport.c:1834
+#: ../camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../camel/providers/smtp/camel-smtp-transport.c:1877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1883
 msgid "QUIT command failed: "
 msgstr "Неуспела наредба „QUIT“: "
 
@@ -4768,7 +4845,19 @@ msgstr ""
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
-msgstr "Да ли је превођење старих подешавања већ обављено"
+msgstr "Да ли је премештање старих подешавања већ обављено"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "Апсолутна путања гчп (или гчп2) извршни је"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+"Један пример је „/usr/bin/gpg“; ако није доживео неуспех, или ако не "
+"постоји, онда се тражи. Промена захтева поновно покретање програма."
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -4842,7 +4931,7 @@ msgstr "„%s“ не подржава стварање удаљених изв
 msgid "%s does not support deleting remote resources"
 msgstr "„%s“ не подржава брисање удаљених изворишта"
 
-#: ../libebackend/e-data-factory.c:1292
+#: ../libebackend/e-data-factory.c:1294
 #, c-format
 msgid "Backend factory for source '%s' and extension '%s' cannot be found."
 msgstr "Не могу да нађем позадинску производњу за извор „%s“ и проширење „%s“."
@@ -4853,9 +4942,8 @@ msgid "Data source is missing a [%s] group"
 msgstr "Извору података недостаје [%s] група"
 
 #: ../libebackend/e-server-side-source.c:466
-#| msgid "Failed to get lock using fcntl(2): %s"
 msgid "Failed to lookup credentials: "
-msgstr "Не могу да нађем уверења: "
+msgstr "Нисам успео да нађем уверења: "
 
 #: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
 #, c-format
@@ -4882,7 +4970,7 @@ msgstr ""
 "Извор података „%s“ нема позадинца збирке да би обрисао удаљено извориште"
 
 #: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1046
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "Извор података „%s“ не подржава ОАут 2.0 потврђивање идентитета"
@@ -4993,7 +5081,7 @@ msgstr "Телефонски позиви"
 #: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
-msgstr "Статус"
+msgstr "Стање"
 
 #: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
@@ -5037,7 +5125,7 @@ msgstr "Рад ван мреже није доступан"
 
 #: ../libedataserver/e-client.c:181
 msgid "D-Bus error"
-msgstr "Грешка у Д-магистрали"
+msgstr "Грешка у Д-сабирници"
 
 #: ../libedataserver/e-client.c:2023
 msgid "Timeout was reached"
@@ -5056,7 +5144,7 @@ msgstr "Извор података „%s“ се не може уклонити
 #: ../libedataserver/e-source.c:1498
 #, c-format
 msgid "Data source '%s' is not writable"
-msgstr "Извор подтака „%s“ није уписив"
+msgstr "Извор података „%s“ није уписив"
 
 #: ../libedataserver/e-source.c:2194
 msgid "Unnamed"
@@ -5074,6 +5162,26 @@ msgstr "Смештање уверења није подржано"
 msgid "Credentials delete is not supported"
 msgstr "Брисање уверења није подржано"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
+#| msgid "Credentials store is not supported"
+msgid "Google authentication is not supported"
+msgstr "Гуглово потврђивање идентитета није подржано"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#, c-format
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "Извор „%s“ (%s) није исправан извор Гугла"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#| msgid "Object not found"
+msgid "Google secret not found"
+msgstr "Нисам нашао Гуглову тајну"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
 msgstr "Нисам пронашао лозинку"
@@ -5217,110 +5325,214 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/e-webdav-discover.c:468
-#: ../libedataserver/e-webdav-discover.c:477
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "ХТТП грешка: %s"
 
-#: ../libedataserver/e-webdav-discover.c:507
-#| msgid "Could not parse arguments"
+#: ../libedataserver/e-webdav-discover.c:523
 msgid "Could not parse response"
 msgstr "Не могу да обрадим одговор"
 
-#: ../libedataserver/e-webdav-discover.c:516
+#: ../libedataserver/e-webdav-discover.c:532
 msgid "Empty response"
 msgstr "Празан одговор"
 
-#: ../libedataserver/e-webdav-discover.c:524
-#| msgid "Code: %u - Unexpected response from server"
+#: ../libedataserver/e-webdav-discover.c:540
 msgid "Unexpected reply from server"
 msgstr "Неочекивани одговор са сервера"
 
-#: ../libedataserverui/e-credentials-prompter.c:259
-#: ../libedataserverui/e-credentials-prompter.c:1561
-#: ../libedataserverui/e-credentials-prompter.c:1605
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1563
+#: ../libedataserverui/e-credentials-prompter.c:1607
 msgid "Credentials prompt was cancelled"
 msgstr "Упит уверења је отказан"
 
-#: ../libedataserverui/e-credentials-prompter.c:663
+#: ../libedataserverui/e-credentials-prompter.c:664
 #, c-format
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Извор „%s“ не подржава упит за уверењима"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#, c-format
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr ""
+"Нисам успео да добијем чин приступа са адресе „%s“. Шифра грешке је %d (%s)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+msgid "Requesting access token, please wait..."
+msgstr "Захтевам чин приступа, сачекајте..."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
+#| msgid "Address book authentication request"
+msgid "Google Address book authentication request"
+msgstr "Захтев за пријаву на адресар Гугла"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
+#| msgid "Calendar authentication request"
+msgid "Google Calendar authentication request"
+msgstr "Захтев за пријаву на календар Гугла"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
+#| msgid "Mail authentication request"
+msgid "Google Memo List authentication request"
+msgstr "Захтев за пријаву на списак белешки Гугла"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#| msgid "Mail authentication request"
+msgid "Google Task List authentication request"
+msgstr "Захтев за пријаву на списак задатака Гугла"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
+#| msgid "Mail authentication request"
+msgid "Google Mail authentication request"
+msgstr "Захтев за пријаву на пошту Гугла"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
+#| msgid "Calendar authentication request"
+msgid "Google account authentication request"
+msgstr "Захтев за пријаву на налог Гугла"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем адресару „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем календару „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем налогу поште „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем преносу поште „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем списку белешки „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем списку задатака „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+"Пријавите се на ваш Гугл налог и прихватите услове како бисте приступили "
+"вашем налогу „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr "_Откажи"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
 msgid "Address book authentication request"
 msgstr "Захтев за пријаву на адресар"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
 msgid "Calendar authentication request"
 msgstr "Захтев за пријаву на календар"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
 msgid "Mail authentication request"
 msgstr "Захтев за пријаву на пошту"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
 msgid "Authentication request"
 msgstr "Захтев за пријаву"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "Унесите лозинку за адресар „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "Унесите лозинку за календар „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "Унесите лозинку за налог поште „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "Унесите лозинку за пренос поште „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "Унесите лозинку за списак белешки „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
-msgstr "Унесите лозинку за списак задужења „%s“."
+msgstr "Унесите лозинку за списак задатака „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "Унесите лозинку за налог „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
-#: ../libedataserverui/e-trust-prompt.c:114
-#: ../libedataserverui/e-webdav-discover-widget.c:1063
-msgid "_Cancel"
-msgstr "_Откажи"
-
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
 #: ../libedataserverui/e-webdav-discover-widget.c:1064
 msgid "_OK"
 msgstr "_У реду"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:340
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
 msgid "_User Name:"
 msgstr "_Корисник:"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:352
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
 msgid "_Password:"
 msgstr "_Лозинка:"
 
 #. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:368
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
 msgid "_Add this password to your keyring"
 msgstr "_Додајте ову лозинку у ваш привезак"
 
@@ -5347,8 +5559,10 @@ msgstr "Прихвати _трајно"
 #: ../libedataserverui/e-trust-prompt.c:188
 #: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "ССЛ уверење за „%s“ није од поверења. Да ли желите да га прихватите?"
+#| msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr ""
+"ССЛ/ТЛС уверење за „%s“ није од поверења. Да ли желите да га прихватите?"
 
 #: ../libedataserverui/e-trust-prompt.c:210
 #: ../modules/trust-prompt/trust-prompt-gtk.c:174
@@ -5394,18 +5608,14 @@ msgid "The certificate's algorithm is considered insecure."
 msgstr "Алгоритам уверења се сматра несигурним."
 
 #: ../libedataserverui/e-webdav-discover-widget.c:166
-#| msgctxt "CategoryName"
-#| msgid "Suppliers"
 msgid "Supports"
 msgstr "Издавачи подршке"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:177
-#| msgid "_User Name:"
 msgid "_User mail:"
-msgstr "_Е-пошта корисника:"
+msgstr "_Ел. пошта корисника:"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:523
-#| msgid "Contacts"
 msgctxt "WebDAVDiscover"
 msgid "Contacts"
 msgstr "Контакти"
@@ -5421,27 +5631,23 @@ msgid "Memos"
 msgstr "Белешке"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:526
-#| msgid "Tasks"
 msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "Задаци"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:825
-#| msgid "Invalid Redirect URL"
 msgid "Invalid URL"
 msgstr "Неисправна адреса"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:839
 msgid "User name not filled"
-msgstr "Није унето корисничко име"
+msgstr "Нисте уписали корисничко име"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:880
-#| msgid "_Cancel"
 msgid "Cancel"
 msgstr "Откажи"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:883
-#| msgid "Searching..."
 msgid "Searching server sources..."
 msgstr "Претражујем изворе на серверу..."
 
@@ -5455,7 +5661,6 @@ msgstr ""
 "са које бих добио лозинку за „%s“"
 
 #: ../modules/gnome-online-accounts/e-goa-password-based.c:273
-#| msgid "Failed to read From address"
 msgid "Failed to get password from GOA: "
 msgstr "Не могу да добијем лозинку из Налога на мрежи: "
 
@@ -5463,13 +5668,13 @@ msgstr "Не могу да добијем лозинку из Налога на
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
-msgstr "Код: %u — Неочекивани одговор са сервера"
+msgstr "Шифра: %u — Неочекивани одговор са сервера"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
-msgstr "Нисам успео да обрадим самооткривајући одговор ИксМЛ"
+msgstr "Нисам успео да обрадим самооткривајући одговор ИксМЛ-а"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:249
@@ -5509,12 +5714,12 @@ msgstr ""
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Нисам успео да добијем приступ за „%s“: "
 
-#: ../modules/google-backend/module-google-backend.c:461
+#: ../modules/google-backend/module-google-backend.c:568
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Задужења"
 
-#: ../modules/google-backend/module-google-backend.c:515
+#: ../modules/google-backend/module-google-backend.c:625
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
@@ -5533,7 +5738,7 @@ msgstr "Обједините ваше календаре"
 msgid "Integrate your contacts"
 msgstr "Обједините ваше контакте"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:273
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
 msgid "Signon service did not return a secret"
 msgstr "Услуга пријављивања није вратила тајну"
 
@@ -5565,7 +5770,7 @@ msgstr "Пошта"
 msgid "Integrate your mailboxes"
 msgstr "Обједините ваше сандучиће"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5613,13 +5818,13 @@ msgid "Yahoo! Mail"
 msgstr "Јаху! пошта"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
 #: ../services/evolution-user-prompter/evolution-user-prompter.c:32
 msgid "Keep running after the last client is closed"
 msgstr "Наставља да ради након затварања последњег клијента"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
 msgid "Wait running until at least one client is connected"
 msgstr "Чека са покретањем све док се барем један клијент не повеже"
 
@@ -5668,6 +5873,10 @@ msgstr "Не пресељавај корисничке податке из пр
 msgid "_Dismiss"
 msgstr "_Занемари"
 
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to issue DONE"
+#~ msgstr "Грешка у издавању поруке DONE"
+
 #~ msgid "Server disconnected"
 #~ msgstr "Веза са сервером је искључена"
 
diff --git a/po/sr latin po b/po/sr latin po
index eca9e87..6c52d5c 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,16 +1,17 @@
 # Serbian translation of evolution-data-server
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution-data-server package.
 # Danilo Å egan <dsegan gmx net>
 # Igor Nestorović <igor prevod org>, 2005.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2015.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2016.
+# Miloš Popović <gpopac gmail com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product";
 "=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2015-03-04 17:33+0000\n"
-"PO-Revision-Date: 2015-03-06 21:01+0200\n"
+"POT-Creation-Date: 2016-02-21 06:13+0000\n"
+"PO-Revision-Date: 2016-02-22 08:43+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -51,7 +52,7 @@ msgid "Loading..."
 msgstr "Učitavam..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:992
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4350
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4357
 msgid "Searching..."
 msgstr "Pretražujem..."
 
@@ -62,9 +63,9 @@ msgstr "Pokušah da izmenim kontakt „%s“ sa pregledom koji nije usklađen"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:1475
 #: ../addressbook/backends/file/e-book-backend-file.c:1560
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3083
-#: ../addressbook/libedata-book/e-book-sqlite.c:7270
-#: ../addressbook/libedata-book/e-book-sqlite.c:7339
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
+#: ../addressbook/libedata-book/e-book-sqlite.c:7332
+#: ../addressbook/libedata-book/e-book-sqlite.c:7401
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Kontakt „%s“ nije pronađen"
@@ -91,11 +92,11 @@ msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s"
 
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1164
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4240
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:381
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:849
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:49
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1166
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:384
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:867
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:51
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
 #: ../addressbook/libebook/e-book-client.c:2131
@@ -109,69 +110,69 @@ msgstr "Nisam uspeo da preimenujem staru bazu podataka „%s“ u „%s“: %s"
 #: ../addressbook/libebook/e-book-client.c:3424
 #: ../addressbook/libebook/e-book-client.c:3642
 #: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:584
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:632
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
-#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libecal/e-cal-client.c:3479
-#: ../calendar/libecal/e-cal-client.c:3652
-#: ../calendar/libecal/e-cal-client.c:3916
-#: ../calendar/libecal/e-cal-client.c:4157
-#: ../calendar/libecal/e-cal-client.c:4347
-#: ../calendar/libecal/e-cal-client.c:4539
-#: ../calendar/libecal/e-cal-client.c:4709
-#: ../calendar/libecal/e-cal-client.c:4878
-#: ../calendar/libecal/e-cal-client.c:5081
-#: ../calendar/libecal/e-cal-client.c:5231
-#: ../calendar/libecal/e-cal-client.c:5425
-#: ../calendar/libecal/e-cal-client.c:5578
-#: ../calendar/libecal/e-cal-client.c:5795
-#: ../calendar/libecal/e-cal-client.c:5949
-#: ../calendar/libecal/e-cal-client.c:6175
-#: ../calendar/libecal/e-cal-client.c:6371
-#: ../calendar/libecal/e-cal-client.c:6734
-#: ../calendar/libecal/e-cal-client.c:6956
-#: ../camel/providers/imapx/camel-imapx-command.c:645
-#: ../camel/providers/imapx/camel-imapx-server.c:4855
-#: ../camel/providers/imapx/camel-imapx-server.c:4864
-#: ../libebackend/e-server-side-source.c:465 ../libedataserver/e-client.c:187
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:670
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:701
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:718
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:2979
+#: ../camel/providers/imapx/camel-imapx-server.c:2989
+#: ../camel/providers/imapx/camel-imapx-server.c:3001
+#: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:818
+#: ../addressbook/backends/google/e-book-backend-google.c:781
 msgid "Querying for updated contacts…"
 msgstr "Propitujem za ažuriranim kontaktima…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1000
+#: ../addressbook/backends/google/e-book-backend-google.c:965
 msgid "Querying for updated groups…"
 msgstr "Propitujem za ažuriranim grupama…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1792
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4992
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1460
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
 msgid "The backend does not support bulk additions"
 msgstr "Pozadinac ne podržava grupno dodavanje"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1947
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1572
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
 msgid "The backend does not support bulk modifications"
 msgstr "Pozadinac ne podržava grupno uređivanje"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2154
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1672
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
 msgid "The backend does not support bulk removals"
 msgstr "Pozadinac ne podržava grupno uklanjanje"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2274
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
 msgid "Loading…"
 msgstr "Učitavam…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1631
+#: ../addressbook/backends/google/e-book-google-utils.c:1653
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -180,155 +181,161 @@ msgid "Personal"
 msgstr "Lično"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1633
+#: ../addressbook/backends/google/e-book-google-utils.c:1655
 msgid "Friends"
 msgstr "Prijatelji"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1635
+#: ../addressbook/backends/google/e-book-google-utils.c:1657
 msgid "Family"
 msgstr "Porodica"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1637
+#: ../addressbook/backends/google/e-book-google-utils.c:1659
 msgid "Coworkers"
 msgstr "Saradnici"
 
 #. 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:113
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:114
 msgid "Not connected"
 msgstr "Nisam povezan"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:892
 msgid "Failed to bind using either v3 or v2 binds"
-msgstr "Nisam uspeo da povežem koristeći ni v3 ni v2 vezice"
+msgstr "Nisam uspeo da svežem koristeći ni v3 ni v2 vezice"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1014
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1016
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovo se povezujem na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1145
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
 msgid "Invalid DN syntax"
 msgstr "Neispravna DN sintaksa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1161
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4239
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1163
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4246
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Greška LDAP-a 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1773
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1775
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2098
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
-msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa (ldap_first_entry)"
+msgstr "%s: „NULL“ je vraćeno sa prvog unosa ldapa"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2026
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2154
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2028
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2156
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: Vraćena je nepoznata vrsta rezultata %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2289
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: Vraćena je nepoznata vrsta rezultata pretrage %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4188
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4195
 msgid "Receiving LDAP search results..."
 msgstr "Primam rezultate pretrage sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4372
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4379
 msgid "Error performing search"
 msgstr "Greška tokom pretrage"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4505
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4512
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "Preuzimam kontakte (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5075
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5082
 msgid "Adding contact to LDAP server..."
 msgstr "Dodajem kontakt na LDAP server..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5150
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5157
 msgid "Modifying contact from LDAP server..."
 msgstr "Menjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5216
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5223
 msgid "Removing contact from LDAP server..."
 msgstr "Uklanjam kontakt sa LDAP servera..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5611
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5618
 #, c-format
 msgid "Failed to get the DN for user '%s'"
-msgstr "Nisam uspeo da dobavim DN za korisnika „%s“"
+msgstr "Nisam uspeo da dobavim naziv domena za korisnika „%s“"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
+#: ../calendar/backends/http/e-cal-backend-http.c:512
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "Loša adresa: %s"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "Loading Addressbook summary..."
 msgstr "Učitavam sažetak adresara..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:846
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr ""
 "Nije uspelo nalaženje svojstva (PROPFIND) na vebdavu sa HTTP stanjem %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:865
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:883
 msgid "No response body in webdav PROPFIND result"
 msgstr "Nema tela odgovora u rezultatima nalaženja svojstava vebdava"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:926
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:944
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Učitavam kontakte (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1338
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1358
 msgid "Cannot transform SoupURI to string"
 msgstr "Ne mogu da preobratim Soup adresu u nisku"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1501
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "Nije uspelo stvaranje resursa „%s“ sa HTTP stanjem %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1603
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
 msgid "Contact on server changed -> not modifying"
 msgstr "Izmenjen je kontakt na serveru —> ne menjam"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1611
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "Izmena kontakta nije uspela sa HTTP stanjem %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1720
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "Nije uspelo brisanje (DELETE) sa HTTP stanjem %d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:38
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
 msgid "No such book"
 msgstr "Nema takvog adresara"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
-#: ../addressbook/libedata-book/e-data-book.c:379
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:384
 msgid "Contact not found"
-msgstr "Kontakt nije pronađen"
+msgstr "Nisam našao kontakt"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libedata-book/e-data-book.c:385
 msgid "Contact ID already exists"
 msgstr "IB kontakta već postoji"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
 msgid "No such source"
 msgstr "Nema takvog izvora"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
-#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:48
+#: ../addressbook/libedata-book/e-data-book.c:401
 msgid "No space"
 msgstr "Nema prostora"
 
@@ -373,19 +380,19 @@ msgstr "Nadimak"
 #. Email fields
 #: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
-msgstr "1° elektronska adresa"
+msgstr "1. el. pošta"
 
 #: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
-msgstr "2° elektronska adresa"
+msgstr "2. el. pošta"
 
 #: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
-msgstr "3° elektronska adresa"
+msgstr "3. el. pošta"
 
 #: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
-msgstr "4° elektronska adresa"
+msgstr "4. el. pošta"
 
 #: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
@@ -394,15 +401,15 @@ msgstr "Pošiljalac"
 #. Address Labels
 #: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
-msgstr "Oznaka kućne adrese"
+msgstr "Natpis kućne adrese"
 
 #: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
-msgstr "Oznaka adrese na poslu"
+msgstr "Natpis adrese na poslu"
 
 #: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
-msgstr "Oznaka druge adrese"
+msgstr "Natpis druge adrese"
 
 #. Phone fields
 #: ../addressbook/libebook-contacts/e-contact.c:162
@@ -415,7 +422,7 @@ msgstr "Telefon na poslu"
 
 #: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
-msgstr "2° telefon na poslu"
+msgstr "2. telefon na poslu"
 
 #: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
@@ -439,7 +446,7 @@ msgstr "Kućni telefon"
 
 #: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
-msgstr "2° kućni telefon"
+msgstr "2. kućni telefon"
 
 #: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
@@ -480,7 +487,7 @@ msgstr "Teleks"
 #. To translators: TTY is Teletypewriter
 #: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
-msgstr "TTV"
+msgstr "Konzola"
 
 #. Organizational fields
 #: ../addressbook/libebook-contacts/e-contact.c:184
@@ -497,7 +504,7 @@ msgstr "Kancelarija"
 
 #: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
-msgstr "Titula"
+msgstr "Zvanje"
 
 #: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
@@ -514,7 +521,7 @@ msgstr "Pomoćnik"
 #. Web fields
 #: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
-msgstr "Lična stranica"
+msgstr "Početna stranica"
 
 #: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
@@ -528,7 +535,7 @@ msgstr "Kategorije"
 #. Collaboration fields
 #: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
-msgstr "Adresa kalendara"
+msgstr "Putanja kalendara"
 
 #: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
@@ -737,11 +744,12 @@ msgstr "Slika"
 
 #: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
-msgstr "Logo"
+msgstr "Logotip"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
 #: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../libedataserverui/e-webdav-discover-widget.c:153
 msgid "Name"
 msgstr "Ime"
 
@@ -798,7 +806,7 @@ msgid "Birth Date"
 msgstr "Rođendan"
 
 #: ../addressbook/libebook-contacts/e-contact.c:293
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:948
 msgid "Anniversary"
 msgstr "Godišnjica"
 
@@ -807,108 +815,112 @@ msgstr "Godišnjica"
 msgid "X.509 Certificate"
 msgstr "X.509 uverenje"
 
-#: ../addressbook/libebook-contacts/e-contact.c:298
+#: ../addressbook/libebook-contacts/e-contact.c:297
+msgid "PGP Certificate"
+msgstr "PGP uverenje"
+
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "1° kućni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 2"
 msgstr "2° kućni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Home ID 3"
 msgstr "3° kućni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 1"
 msgstr "1° poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 2"
 msgstr "2° poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu Work ID 3"
 msgstr "3° poslovni Gadu-Gadu IB"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Gadu-Gadu ID List"
 msgstr "Spisak Gadu-Gadu naloga"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
 msgstr "Geografski podaci"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/libebook-contacts/e-contact.c:311
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 1"
 msgstr "1° kućno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 2"
 msgstr "2° kućno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Home Name 3"
 msgstr "3° kućno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 1"
 msgstr "1° poslovno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 2"
 msgstr "2° poslovno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Work Name 3"
 msgstr "3° poslovno Skajp ime"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Skype Name List"
 msgstr "Spisak Skajp imena"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "SIP address"
 msgstr "SIP adresa"
 
-#: ../addressbook/libebook-contacts/e-contact.c:321
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 1"
 msgstr "1° kućno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 2"
 msgstr "2° kućno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Home Name 3"
 msgstr "3° kućno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 1"
 msgstr "1° poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 2"
 msgstr "2° poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Work Name 3"
 msgstr "3° poslovno ime Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../addressbook/libebook-contacts/e-contact.c:328
 msgid "Google Talk Name List"
 msgstr "Spisak imena Gugl razgovora"
 
-#: ../addressbook/libebook-contacts/e-contact.c:329
+#: ../addressbook/libebook-contacts/e-contact.c:330
 msgid "Twitter Name List"
 msgstr "Spisak Tviter imena"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1659
+#: ../addressbook/libebook-contacts/e-contact.c:1660
 #: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "Neimenovani spisak"
@@ -918,7 +930,6 @@ msgid "The library was built without phone number support."
 msgstr "Biblioteka je izgrađena bez podrške za telefonske brojeve."
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
-#| msgid "The phone number parser reported an yet unkown error code."
 msgid "The phone number parser reported a yet unknown error code."
 msgstr "Obrađivač telefonskog broja je prijavio još uvek nepoznat kod greške."
 
@@ -957,20 +968,20 @@ msgstr "Ne mogu da izmenim vrednost svojstva adresara „%s“"
 #: ../addressbook/libebook/e-book-client.c:1390
 #: ../addressbook/libebook/e-book-client.c:1621
 #: ../addressbook/libebook/e-book-client.c:1898
-#: ../calendar/libecal/e-cal-client.c:1714
-#: ../calendar/libecal/e-cal-client.c:1952
+#: ../calendar/libecal/e-cal-client.c:1717
+#: ../calendar/libecal/e-cal-client.c:1955
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "Ne mogu da se povežem na „%s“: "
 
-#: ../addressbook/libebook/e-book-client-view.c:892
-#: ../calendar/libecal/e-cal-client-view.c:705
+#: ../addressbook/libebook/e-book-client-view.c:870
+#: ../calendar/libecal/e-cal-client-view.c:681
 #, c-format
 msgid "Client disappeared"
 msgstr "Klijent je nestao"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../addressbook/libedata-book/e-book-sqlite.c:2212
+#: ../addressbook/libedata-book/e-book-sqlite.c:2229
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "Greška sagledavanja nepoznatog polja sažetka „%s“"
@@ -981,7 +992,7 @@ msgid "Error parsing regular expression"
 msgstr "Greška obrade regularnog izraza"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:721
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:751
 #, c-format
 msgid "Insufficient memory"
 msgstr "Nedovoljno memorije"
@@ -998,11 +1009,11 @@ msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
-"Polje kontakta „%s“ „%s“ vrste je navedeno u sažetku. ali su podržane samo "
+"Polje kontakta „%s“ „%s“ vrste je navedeno u sažetku, ali su podržane samo "
 "vrste polja logičke vrednosti, niske i spiska niske"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3071
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4167
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
@@ -1010,19 +1021,19 @@ msgstr ""
 "Čitavi kontakti_pretrage nisu uskladišteni u ostavi. v-kartice ne mogu dati "
 "odgovor."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4298
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4391
-#: ../addressbook/libedata-book/e-book-sqlite.c:5747
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../addressbook/libedata-book/e-book-sqlite.c:5807
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "Upit je sadržao nepodržane elemente"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4302
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
 #, c-format
 msgid "Invalid Query"
 msgstr "Neispravan upit"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4326
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
@@ -1031,16 +1042,16 @@ msgstr ""
 "Čitavi kontakti_pretrage nisu uskladišteni u ostavi. Otuda je podržan samo "
 "upit sažetka."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4395
-#: ../addressbook/libedata-book/e-data-book.c:391
-#: ../addressbook/libedata-book/e-data-book.c:1131
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../addressbook/libedata-book/e-data-book.c:396
+#: ../addressbook/libedata-book/e-data-book.c:1146
 #: ../calendar/libedata-cal/e-data-cal.c:428
-#: ../calendar/libedata-cal/e-data-cal.c:1410 ../libedataserver/e-client.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:1427 ../libedataserver/e-client.c:177
 #, c-format
 msgid "Invalid query"
 msgstr "Neispravan upit"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4438
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
@@ -1048,34 +1059,34 @@ msgstr ""
 "Čitave v-kartice nisu uskladištene u ostavi. Otuda je podržan samo upit "
 "sažetka."
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5261
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "Ne mogu da uklonim datoteku baze podataka: br. greške %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6048
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6448
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbKurzor podržava samo upite sažetka"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6055
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr "Za korišćenje EbSdbKurzor-a mora biti navedeno barem jedno polje ređanja"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6069
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "Ne mogu da poređam prema polju koje nije u sažetku"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6076
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "Ne mogu da poređam prema polju koje može imati više vrednosti"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6209
-#: ../addressbook/libedata-book/e-book-sqlite.c:8044
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:8106
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1083,8 +1094,8 @@ msgid ""
 msgstr ""
 "Pokušah da pomerim kurzor unazad, ali je on već na početku spiska kontakta"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6217
-#: ../addressbook/libedata-book/e-book-sqlite.c:8052
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../addressbook/libedata-book/e-book-sqlite.c:8114
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1105,194 +1116,194 @@ msgstr ""
 "Ne mogu da nadogradim bazu podataka kontakata iz stare baze podataka sa više "
 "od jednim adresarom. Obrišite prvo jedan od unosa u tabeli „fascikli“."
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5740
+#: ../addressbook/libedata-book/e-book-sqlite.c:5800
 #, c-format
 msgid "Invalid query: %s"
 msgstr "Neispravan upit: %s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5915
+#: ../addressbook/libedata-book/e-book-sqlite.c:5975
 msgid "Invalid query for EbSqlCursor"
 msgstr "Neispravan upit za EbSdbKurzor"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7866
+#: ../addressbook/libedata-book/e-book-sqlite.c:7928
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr "Za korišćenje EbSkulKurzor-a mora biti navedeno barem jedno polje ređanja"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7884
+#: ../addressbook/libedata-book/e-book-sqlite.c:7946
 msgid "Cannot sort by a field that is not a string type"
 msgstr "Ne mogu da poređam prema polju koje nije vrsta niske"
 
-#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../addressbook/libedata-book/e-data-book.c:380
 #: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "Uspešno"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:410
-#: ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:144
 msgid "Backend is busy"
 msgstr "Pozadinac je zauzet"
 
-#: ../addressbook/libedata-book/e-data-book.c:377
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:151
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:154
 msgid "Repository offline"
 msgstr "Skladište nije na mreži"
 
-#: ../addressbook/libedata-book/e-data-book.c:378
-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:412
-#: ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:161
 msgid "Permission denied"
 msgstr "Pristup je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../addressbook/libedata-book/e-data-book.c:386
 #: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
-msgstr "Neuspela autentifikacija"
+msgstr "Potvrđivanje identiteta nije uspelo"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../addressbook/libedata-book/e-data-book.c:387
 #: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
-msgstr "Potrebna je prijava"
+msgstr "Potrebno je potvrđivanje identiteta"
 
-#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../addressbook/libedata-book/e-data-book.c:388
 #: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "Nepodržano polje"
 
-#: ../addressbook/libedata-book/e-data-book.c:384
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:169
 msgid "Unsupported authentication method"
-msgstr "Nepodržan način autentifikacije"
+msgstr "Nepodržan način potvrđivanja identiteta"
 
-#: ../addressbook/libedata-book/e-data-book.c:385
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:171
 msgid "TLS not available"
 msgstr "TLS nije dostupan"
 
-#: ../addressbook/libedata-book/e-data-book.c:386
+#: ../addressbook/libedata-book/e-data-book.c:391
 msgid "Address book does not exist"
 msgstr "Adresar ne postoji"
 
-#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../addressbook/libedata-book/e-data-book.c:392
 msgid "Book removed"
 msgstr "Knjiga je uklonjena"
 
-#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../addressbook/libedata-book/e-data-book.c:393
 #: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "Nije dostupno u režimu van mreže"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:173
 msgid "Search size limit exceeded"
-msgstr "Premašena veličina pretrage"
+msgstr "Premašena je veličina pretrage"
 
-#: ../addressbook/libedata-book/e-data-book.c:390
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:175
 msgid "Search time limit exceeded"
-msgstr "Isteklo vreme za pretragu"
+msgstr "Isteklo je vreme za pretragu"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:176
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:179
 msgid "Query refused"
 msgstr "Upit je odbijen"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:398
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:165
 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:395
+#: ../addressbook/libedata-book/e-data-book.c:400
 #: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
-msgstr "Neispravna verzija servera"
+msgstr "Neispravno izdanje servera"
 
-#: ../addressbook/libedata-book/e-data-book.c:397
-#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:433
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:402
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:142
 msgid "Invalid argument"
 msgstr "Neispravan argument"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:399
+#: ../addressbook/libedata-book/e-data-book.c:404
 #: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
-#: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:164
+#: ../calendar/libecal/e-cal.c:1909 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:167
 #, c-format
 msgid "Not supported"
-msgstr "Nije podržan"
+msgstr "Nije podržano"
 
-#: ../addressbook/libedata-book/e-data-book.c:400
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:182
+#: ../addressbook/libedata-book/e-data-book.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:185
 msgid "Backend is not opened yet"
 msgstr "Pozadinac nije otvoren još uvek"
 
-#: ../addressbook/libedata-book/e-data-book.c:401
-#: ../libedataserver/e-client.c:184
+#: ../addressbook/libedata-book/e-data-book.c:406
+#: ../libedataserver/e-client.c:187
 msgid "Object is out of sync"
 msgstr "Objekat nije usklađen"
 
-#: ../addressbook/libedata-book/e-data-book.c:409
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:180
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:183
 msgid "Other error"
 msgstr "Druga greška"
 
-#: ../addressbook/libedata-book/e-data-book.c:1156
-#: ../calendar/libedata-cal/e-data-cal.c:1435
+#: ../addressbook/libedata-book/e-data-book.c:1171
+#: ../calendar/libedata-cal/e-data-cal.c:1452
 msgid "Invalid query: "
 msgstr "Neispravan upit: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1375
+#: ../addressbook/libedata-book/e-data-book.c:1420
 msgid "Cannot open book: "
 msgstr "Ne mogu da otvorim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1412
+#: ../addressbook/libedata-book/e-data-book.c:1458
 msgid "Cannot refresh address book: "
 msgstr "Ne mogu da osvežim adresar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1443
+#: ../addressbook/libedata-book/e-data-book.c:1497
 msgid "Cannot get contact: "
-msgstr "Ne mogu da dobijem kontakt: "
+msgstr "Ne mogu da dobavim kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1481
+#: ../addressbook/libedata-book/e-data-book.c:1546
 msgid "Cannot get contact list: "
 msgstr "Ne mogu da dobavim spisak kontakta: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1533
+#: ../addressbook/libedata-book/e-data-book.c:1602
 msgid "Cannot get contact list uids: "
 msgstr "Ne mogu da dobavim kib-ove spiska kontakata: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1580
+#: ../addressbook/libedata-book/e-data-book.c:1653
 msgid "Cannot add contact: "
 msgstr "Ne mogu da dodam kontakt: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1629
+#: ../addressbook/libedata-book/e-data-book.c:1706
 msgid "Cannot modify contacts: "
 msgstr "Ne mogu da izmenim kontakte: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1671
+#: ../addressbook/libedata-book/e-data-book.c:1759
 msgid "Cannot remove contacts: "
 msgstr "Ne mogu da uklonim kontakte: "
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+#: ../addressbook/libedata-book/e-data-book-cursor.c:776
 msgid "Cursor does not support setting the search expression"
 msgstr "Kurzor ne podržava podešavanje izraza pretrage"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+#: ../addressbook/libedata-book/e-data-book-cursor.c:859
 msgid "Cursor does not support step"
 msgstr "Kurzor ne podržava korak"
 
-#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+#: ../addressbook/libedata-book/e-data-book-cursor.c:942
 msgid "Cursor does not support alphabetic indexes"
 msgstr "Kurzor ne podržava azbučne indekse"
 
@@ -1308,36 +1319,37 @@ msgstr "Van pregleda usaglašavanja prilikom premeštanja kurzora"
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "Azbučni indeks je podešen za neispravan jezik"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:582
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:668
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Server je nedostupan (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:613
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:699
 #, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "Nisam uspeo da se povežem na server koristeći SSL: %s"
+#| msgid "Failed to connect to a server using SSL: %s"
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "Nisam uspeo da se povežem na server koristeći SSL/TLS: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:629
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:715
 #, c-format
-#| msgid "Unexpected HTTP status code %d returned (%s)"
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
 msgstr "Vraćen je neočekivani kod „%d“ HTTP stanja (%s) za putanju: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:650
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:736
 msgid "CalDAV backend is not loaded yet"
 msgstr "Pozadinac KolDAV-a još uvek nije učitan"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1097
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1173
+#: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "Neispravna adresa preusmeravanja"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2919
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3030
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Ne mogu da napravim fasciklu mesne ostave „%s“"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2999
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3113
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1346,355 +1358,351 @@ 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:4072
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4208
 msgid "CalDAV does not support bulk additions"
 msgstr "KolDAV ne podržava grupno dodavanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4175
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4311
 msgid "CalDAV does not support bulk modifications"
 msgstr "KolDAV ne podržava grupno uređivanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4456
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4592
 msgid "CalDAV does not support bulk removals"
 msgstr "KolDAV ne podržava grupno uklanjanje"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5138
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5274
 msgid "Calendar doesn't support Free/Busy"
 msgstr "Kalendar ne podržava Slobodno / Zauzeto"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5147
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5283
 msgid "Schedule outbox url not found"
 msgstr "Nije pronađena adresa otpremnog sandučeta rasporeda"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5244
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5380
 msgid "Unexpected result in schedule-response"
 msgstr "Neočekivan rezultat u rasporedu-odgovoru"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:950
 msgid "Birthday"
 msgstr "Rođendan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:986
 #, c-format
 msgid "Birthday: %s"
 msgstr "Rođendan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1017
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Godišnjica: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:244
+#: ../calendar/backends/file/e-cal-backend-file.c:245
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "Ne mogu da sačuvam podatak iz kalendara: loša adresa."
+msgstr "Ne mogu da sačuvam podatak iz kalendara: loša putanja."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
-#: ../calendar/backends/file/e-cal-backend-file.c:257
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
 msgid "Cannot save calendar data"
 msgstr "Ne mogu da sačuvam podatke kalendara"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:512
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "Loša adresa: %s"
-
 #: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Redirected to Invalid URI"
-msgstr "Preusmereno na neispravnu adresu"
+msgstr "Preusmereno na neispravnu putanju"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:643
+#: ../calendar/backends/http/e-cal-backend-http.c:640
 #, c-format
 msgid "Bad file format."
 msgstr "Loš oblik datoteke."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:653
+#: ../calendar/backends/http/e-cal-backend-http.c:650
 #, c-format
 msgid "Not a calendar."
 msgstr "Nije kalendar."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:955
-#: ../calendar/backends/weather/e-cal-backend-weather.c:536
+#: ../calendar/backends/http/e-cal-backend-http.c:954
+#: ../calendar/backends/weather/e-cal-backend-weather.c:709
 msgid "Could not create cache file"
 msgstr "Ne mogu da napravim datoteku za ostavu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:174
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
 msgid "Could not retrieve weather data"
 msgstr "Ne mogu da dobijem podatke o vremenu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:378
 msgid "Weather: Fog"
 msgstr "Vreme: magla"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:379
 msgid "Weather: Cloudy Night"
 msgstr "Vreme: oblačna noć"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:297
+#: ../calendar/backends/weather/e-cal-backend-weather.c:380
 msgid "Weather: Cloudy"
 msgstr "Vreme: oblačno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:298
+#: ../calendar/backends/weather/e-cal-backend-weather.c:381
 msgid "Weather: Overcast"
 msgstr "Vreme: mestimično oblačno"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:299
+#: ../calendar/backends/weather/e-cal-backend-weather.c:382
 msgid "Weather: Showers"
 msgstr "Vreme: pljusak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:300
+#: ../calendar/backends/weather/e-cal-backend-weather.c:383
 msgid "Weather: Snow"
 msgstr "Vreme: sneg"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:301
+#: ../calendar/backends/weather/e-cal-backend-weather.c:384
 msgid "Weather: Clear Night"
 msgstr "Vreme: vedra noć"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:302
+#: ../calendar/backends/weather/e-cal-backend-weather.c:385
 msgid "Weather: Sunny"
 msgstr "Vreme: sunčano"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:303
+#: ../calendar/backends/weather/e-cal-backend-weather.c:386
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
 #. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#: ../calendar/backends/weather/e-cal-backend-weather.c:412
 #, c-format
 msgid "%.1f °F"
 msgstr "%.1f °F"
 
 #. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#: ../calendar/backends/weather/e-cal-backend-weather.c:415
 #, c-format
 msgid "%.1f °C"
 msgstr "%.1f °C"
 
 #. TRANSLATOR: This is the temperature in kelvin
-#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#: ../calendar/backends/weather/e-cal-backend-weather.c:418
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#: ../calendar/backends/weather/e-cal-backend-weather.c:424
 #, c-format
 msgid "%.1f"
 msgstr "%.1f"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:452
+#: ../calendar/backends/weather/e-cal-backend-weather.c:589
+#: ../calendar/backends/weather/e-cal-backend-weather.c:617
 msgid "Forecast"
 msgstr "Prognoza"
 
-#: ../calendar/libecal/e-cal.c:2304
+#: ../calendar/libecal/e-cal.c:2306
 msgid "Repository is offline"
-msgstr "Skladište nije na mreži"
+msgstr "Skladište je van mreže"
 
-#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:266
 msgid "No such calendar"
 msgstr "Nema takvog kalendara"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:268
 #: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
-msgstr "Objekat nije nađen"
+msgstr "Nisam našao objekat"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:270
 #: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "Neispravan objekat"
 
-#: ../calendar/libecal/e-cal.c:2312
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI not loaded"
-msgstr "Adresa nije učitana"
+msgstr "Putanja nije učitana"
 
-#: ../calendar/libecal/e-cal.c:2314
+#: ../calendar/libecal/e-cal.c:2316
 msgid "URI already loaded"
-msgstr "Adresa je već učitana"
+msgstr "Putanja je već učitana"
 
-#: ../calendar/libecal/e-cal.c:2318
+#: ../calendar/libecal/e-cal.c:2320
 msgid "Unknown User"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:274
 #: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "IB objekta već postoji"
 
-#: ../calendar/libecal/e-cal.c:2322
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
-#: ../calendar/libecal/e-cal.c:2324
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Operation has been canceled"
-msgstr "Operacija je otkazana"
+msgstr "Radnja je otkazana"
 
-#: ../calendar/libecal/e-cal.c:2326
+#: ../calendar/libecal/e-cal.c:2328
 msgid "Could not cancel operation"
-msgstr "Ne mogu da otkažem operaciju"
+msgstr "Ne mogu da otkažem radnju"
 
-#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:147
+#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:150
 msgid "Authentication failed"
 msgstr "Potvrđivanje identiteta nije uspelo"
 
-#: ../calendar/libecal/e-cal.c:2330
-#: ../camel/providers/smtp/camel-smtp-transport.c:959
-#: ../libedataserver/e-client.c:149
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "Potrebno je potvrđivanje identiteta"
 
-#: ../calendar/libecal/e-cal.c:2332
+#: ../calendar/libecal/e-cal.c:2334
 msgid "A D-Bus exception has occurred"
-msgstr "Došlo je do izuzetka D-basa"
+msgstr "Došlo je do izuzetka D-sabirnice"
 
-#: ../calendar/libecal/e-cal.c:2336
+#: ../calendar/libecal/e-cal.c:2338
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../calendar/libecal/e-cal-client.c:269
+#: ../calendar/libecal/e-cal-client.c:272
 #: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "Nepoznat korisnik"
 
-#: ../calendar/libecal/e-cal-client.c:273
+#: ../calendar/libecal/e-cal-client.c:276
 #: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "Neispravan opseg"
 
-#: ../calendar/libecal/e-cal-client.c:1062
+#: ../calendar/libecal/e-cal-client.c:1065
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "Nepoznato svojstvo kalendara „%s“"
 
-#: ../calendar/libecal/e-cal-client.c:1077
+#: ../calendar/libecal/e-cal-client.c:1080
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Ne mogu da izmenim vrednost svojstva kalendara „%s“"
 
-#: ../calendar/libecal/e-cal-component.c:1349
+#: ../calendar/libecal/e-cal-component.c:1357
 msgid "Untitled appointment"
 msgstr "Neimenovani zakazani sastanak"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4744
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4745
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4746
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4747
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4748
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4749
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4750
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4751
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4752
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4753
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4754
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4755
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4756
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4757
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4758
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4759
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4760
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4761
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4762
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4763
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4764
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4765
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4766
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4767
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4768
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4769
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4770
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4771
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4772
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4773
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4774
 msgid "31st"
 msgstr "31."
 
@@ -1751,7 +1759,7 @@ msgstr "„%s“ očekuje dva ili tri argumenta"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "„%s“ očekuje da prvi argument bude time_t"
+msgstr "„%s“ očekuje da prvi argument bude „time_t“"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
@@ -1759,7 +1767,7 @@ msgstr "„%s“ očekuje da prvi argument bude time_t"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "„%s“ očekuje da drugi argument bude time_t"
+msgstr "„%s“ očekuje da drugi argument bude „time_t“"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, c-format
@@ -1839,104 +1847,104 @@ msgid "Calendar does not exist"
 msgstr "Kalendar ne postoji"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1606
+#: ../calendar/libedata-cal/e-data-cal.c:1645
 msgid "Cannot open calendar: "
 msgstr "Ne mogu da otvorim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1643
+#: ../calendar/libedata-cal/e-data-cal.c:1682
 msgid "Cannot refresh calendar: "
 msgstr "Ne mogu da osvežim kalendar: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1684
+#: ../calendar/libedata-cal/e-data-cal.c:1723
 msgid "Cannot retrieve calendar object path: "
 msgstr "Ne mogu da preuzmem putanju objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1736
+#: ../calendar/libedata-cal/e-data-cal.c:1775
 msgid "Cannot retrieve calendar object list: "
 msgstr "Ne mogu da preuzmem spisak objekta kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1787
+#: ../calendar/libedata-cal/e-data-cal.c:1832
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "Ne mogu da preuzmem spisak slobodnog/zauzetog kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1830
+#: ../calendar/libedata-cal/e-data-cal.c:1882
 msgid "Cannot create calendar object: "
 msgstr "Ne mogu da napravim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1898
+#: ../calendar/libedata-cal/e-data-cal.c:1950
 msgid "Cannot modify calendar object: "
 msgstr "Ne mogu da izmenim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1976
+#: ../calendar/libedata-cal/e-data-cal.c:2028
 msgid "Cannot remove calendar object: "
 msgstr "Ne mogu da uklonim objekat kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2062
+#: ../calendar/libedata-cal/e-data-cal.c:2114
 msgid "Cannot receive calendar objects: "
 msgstr "Ne mogu da primim objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2105
+#: ../calendar/libedata-cal/e-data-cal.c:2157
 msgid "Cannot send calendar objects: "
 msgstr "Ne mogu da pošaljem objekte kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2157
+#: ../calendar/libedata-cal/e-data-cal.c:2209
 msgid "Could not retrieve attachment uris: "
 msgstr "Ne mogu da preuzmem adrese priloga: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2202
+#: ../calendar/libedata-cal/e-data-cal.c:2254
 msgid "Could not discard reminder: "
 msgstr "Ne mogu da odbacim podsetnik: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2243
+#: ../calendar/libedata-cal/e-data-cal.c:2295
 msgid "Could not retrieve calendar time zone: "
 msgstr "Ne mogu da preuzmem vremensku zonu kalendara: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2283
+#: ../calendar/libedata-cal/e-data-cal.c:2335
 msgid "Could not add calendar time zone: "
 msgstr "Ne mogu da dodam vremensku zonu kalendara: "
 
-#: ../camel/camel-cipher-context.c:199
+#: ../camel/camel-cipher-context.c:204
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava potpisivanje"
 
-#: ../camel/camel-cipher-context.c:212
+#: ../camel/camel-cipher-context.c:217
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava proveru"
 
-#: ../camel/camel-cipher-context.c:228
+#: ../camel/camel-cipher-context.c:233
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava šifrovanje"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:247
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Upotrebljeni algoritam ne podržava dešifrovanje"
 
-#: ../camel/camel-cipher-context.c:358
+#: ../camel/camel-cipher-context.c:363
 msgid "Signing message"
 msgstr "Potpisivanje poruke"
 
-#: ../camel/camel-cipher-context.c:648
+#: ../camel/camel-cipher-context.c:653
 msgid "Encrypting message"
 msgstr "Å ifrovanje poruke"
 
-#: ../camel/camel-cipher-context.c:820
+#: ../camel/camel-cipher-context.c:825
 msgid "Decrypting message"
 msgstr "Dešifrovanje poruke"
 
@@ -1952,108 +1960,113 @@ msgstr "Prazna datoteka ostave"
 #: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "Nije moguće ukloniti unos iz ostave: %s: %s"
+msgstr "Ne mogu da uklonim unos iz ostave: %s: %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:797
+# bug: quotes on the other one as well
+#: ../camel/camel-db.c:810 ../camel/providers/local/camel-mbox-store.c:906
+#, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
+
+#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Nisam uspeo da napravim sadržani proces „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:962
+#: ../camel/camel-filter-driver.c:982
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Neispravan niz poruka primljen od „%s“: %s"
+msgstr "Neispravan tok poruka primljen od „%s“: %s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
 msgid "Syncing folders"
 msgstr "Usklađujem fascikle"
 
-#: ../camel/camel-filter-driver.c:1276
+#: ../camel/camel-filter-driver.c:1296
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "Greška prilikom čitanja filtera: %s: %s"
+msgstr "Greška obrade filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "Greška prilikom primene filtera: %s: %s"
+msgstr "Greška primene filtera: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1403
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "Ne mogu da otvorim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "Ne mogu da obradim fasciklu pripreme"
 
-#: ../camel/camel-filter-driver.c:1418
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr "Primam poruku %d (%d%%)"
+msgstr "Dobavljam poruku %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
 #, c-format
 msgid "Failed on message %d"
-msgstr "Greška kod poruke %d"
+msgstr "Nisam uspeo na %d. poruci"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
 msgid "Syncing folder"
 msgstr "Usklađujem fasciklu"
 
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
 msgid "Complete"
 msgstr "Završeno"
 
-#: ../camel/camel-filter-driver.c:1536
+#: ../camel/camel-filter-driver.c:1556
 #, c-format
 msgid "Getting message %d of %d"
-msgstr "Primam poruku %d od %d"
+msgstr "Dobavljam %d. poruku od %d"
 
-#: ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1574
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr "Greška kod poruke %d od %d"
+msgstr "Greška kod %d. poruke od %d"
 
-#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
+#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "Nije uspelo izvršavanje propusnika „%s“: "
 
-#: ../camel/camel-filter-driver.c:1767
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "Greška obrade propusnika „%s“: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1786
+#: ../camel/camel-filter-driver.c:1805
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "Greška izvršavanja propusnika „%s“: %s: %s"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:139
 msgid "Failed to retrieve message"
 msgstr "Nisam uspeo da dovučem poruku"
 
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:538
 msgid "Invalid arguments to (system-flag)"
 msgstr "Neispravni argumenti za (sistemsku-oznaku)"
 
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:556
 msgid "Invalid arguments to (user-tag)"
 msgstr "Neispravni argumenti za (korisničku-oznaku)"
 
-#: ../camel/camel-filter-search.c:1064
-#| msgid "Invalid arguments to (system-flag)"
+#: ../camel/camel-filter-search.c:1068
 msgid "Invalid arguments to (message-location)"
 msgstr "Neispravni argumenti za (mesto-poruke)"
 
-#: ../camel/camel-filter-search.c:1142 ../camel/camel-filter-search.c:1153
+#: ../camel/camel-filter-search.c:1149 ../camel/camel-filter-search.c:1160
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška u primeni filtera za pretragu: %s: %s"
 
-#: ../camel/camel-folder.c:321
+#: ../camel/camel-folder.c:326
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
@@ -2062,7 +2075,7 @@ msgstr[1] "Učim nove spam poruke u „%s“"
 msgstr[2] "Učim nove spam poruke u „%s“"
 msgstr[3] "Učim novu spam poruku u „%s“"
 
-#: ../camel/camel-folder.c:361
+#: ../camel/camel-folder.c:366
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
@@ -2071,86 +2084,85 @@ msgstr[1] "Učim nove ham poruke u „%s“"
 msgstr[2] "Učim nove ham poruke u „%s“"
 msgstr[3] "Učim novu ham poruku u „%s“"
 
-#: ../camel/camel-folder.c:409
+#: ../camel/camel-folder.c:414
 #, c-format
 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“"
+msgstr[0] "Izdvajam novu poruku u „%s“"
+msgstr[1] "Izdvajam nove poruke u „%s“"
+msgstr[2] "Izdvajam nove poruke u „%s“"
 msgstr[3] "Filtriram novu poruku u „%s“"
 
-#: ../camel/camel-folder.c:1015
+#: ../camel/camel-folder.c:1020
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "Premeštam poruke"
 
-#: ../camel/camel-folder.c:1018
+#: ../camel/camel-folder.c:1023
 msgid "Copying messages"
 msgstr "Umnožavam poruke"
 
-#: ../camel/camel-folder.c:1060
+#: ../camel/camel-folder.c:1065
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "Obaveštenje o količini nije podržano za fasciklu „%s“"
 
-#: ../camel/camel-folder.c:1152
+#: ../camel/camel-folder.c:1160
 #, c-format
-#| msgid "Opening folder '%s'"
 msgid "Filtering folder '%s'"
-msgstr "Izdvajam fasciklu „%s“"
+msgstr "Probiram fasciklu „%s“"
 
-#: ../camel/camel-folder.c:2878
+#: ../camel/camel-folder.c:2896
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Praznim fasciklu „%s“"
 
-#: ../camel/camel-folder.c:3009
+#: ../camel/camel-folder.c:3027
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Dovlačim poruku „%s“ u %s"
 
-#: ../camel/camel-folder.c:3200
+#: ../camel/camel-folder.c:3218
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Dovlačim obaveštenje o količini za „%s“"
 
-#: ../camel/camel-folder.c:3497
+#: ../camel/camel-folder.c:3515
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Osvežavam fasciklu „%s“"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
+#: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) zahteva samo jedan logički rezultat"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:976
+#: ../camel/camel-folder-search.c:992
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) nije dozvoljeno unutar %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
+#: ../camel/camel-folder-search.c:999 ../camel/camel-folder-search.c:1007
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) zahteva nisku sa tipom poklapanja"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1019
+#: ../camel/camel-folder-search.c:1035
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) očekuje niz kao rezultat"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1029
+#: ../camel/camel-folder-search.c:1045
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva skup fascikli"
 
-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
+#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2159,7 +2171,7 @@ msgstr ""
 "Ne mogu da analiziram izraz pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
+#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2168,29 +2180,28 @@ msgstr ""
 "Greška prilikom izvršavanja izraza pretrage: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2139
+#: ../camel/camel-folder-summary.c:2156
 #, c-format
 msgid "Release unused memory for folder '%s'"
 msgstr "Otpuštam nekorišćenu memoriju za fasciklu „%s“"
 
-#: ../camel/camel-folder-summary.c:2351
+#: ../camel/camel-folder-summary.c:2368
 #, c-format
-#| msgid "Updating folder '%s'"
 msgid "Update preview data for folder '%s'"
-msgstr "Ažuriram podatke pretpregleda za fasciklu „%s“"
+msgstr "Ažuriram podatke pregleda za fasciklu „%s“"
 
-#: ../camel/camel-gpg-context.c:724 ../camel/camel-gpg-context.c:729
-#: ../camel/camel-gpg-context.c:1386
+#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:1442
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam uspeo da izvršim gčp: %s"
 
-#: ../camel/camel-gpg-context.c:729
-#: ../camel/providers/smtp/camel-smtp-transport.c:962
+#: ../camel/camel-gpg-context.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1130
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../camel/camel-gpg-context.c:794
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2201,17 +2212,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:876
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam uspeo da analiziram podsetnik gčp ib-a korisnika."
 
-#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:870
+#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam uspeo da analiziram zahtev za gčp lozinkom."
 
-#: ../camel/camel-gpg-context.c:891
+#: ../camel/camel-gpg-context.c:937
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2220,7 +2231,7 @@ msgstr ""
 "Potreban vam je PIN da otključate ključ\n"
 "Pametne kartice: „%s“"
 
-#: ../camel/camel-gpg-context.c:895
+#: ../camel/camel-gpg-context.c:941
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2229,12 +2240,12 @@ msgstr ""
 "Potrebna vam je lozinka da otključate ključ\n"
 "korisnika: „%s“"
 
-#: ../camel/camel-gpg-context.c:901
+#: ../camel/camel-gpg-context.c:947
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Neočekivan zahtev GnuČP-a za „%s“"
 
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:959
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2242,69 +2253,74 @@ msgstr ""
 "Znajte da šifrovani sadržaj ne sadrži podatke o primaocu, tako da će biti "
 "postavljen upit za lozinku za svaki sačuvani lični ključ."
 
-#: ../camel/camel-gpg-context.c:944 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:160
+#: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../camel/camel-gpg-context.c:965
+#: ../camel/camel-gpg-context.c:1011
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam uspeo da otključam tajni ključ: unete su 3 pogrešne lozinke."
 
-#: ../camel/camel-gpg-context.c:978
+#: ../camel/camel-gpg-context.c:1024
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor GnuČP-a: %s"
 
-#: ../camel/camel-gpg-context.c:1109
+#: ../camel/camel-gpg-context.c:1162
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam uspeo da šifrujem: nisu označeni ispravni primaoci."
 
-#: ../camel/camel-gpg-context.c:1661 ../camel/camel-smime-context.c:843
+#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "Ne mogu da napravim podatke za potpisivanje: "
 
-#: ../camel/camel-gpg-context.c:1711 ../camel/camel-gpg-context.c:1923
-#: ../camel/camel-gpg-context.c:2033 ../camel/camel-gpg-context.c:2182
+#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
 msgid "Failed to execute gpg."
 msgstr "Nisam uspeo da izvršim gčp."
 
-#: ../camel/camel-gpg-context.c:1794 ../camel/camel-gpg-context.c:1802
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-gpg-context.c:1830
+#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
+#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
 #: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
 #: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:1876
+#: ../camel/camel-gpg-context.c:2000
 msgid "Cannot verify message signature: "
 msgstr "Ne mogu da proverim potpis poruke: "
 
-#: ../camel/camel-gpg-context.c:1999
+#: ../camel/camel-gpg-context.c:2128
 msgid "Could not generate encrypting data: "
 msgstr "Ne mogu da napravim podatke za Å¡ifrovanje: "
 
-#: ../camel/camel-gpg-context.c:2052
+#: ../camel/camel-gpg-context.c:2203
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno Å¡ifrovan deo poruke"
 
-#: ../camel/camel-gpg-context.c:2108 ../camel/camel-gpg-context.c:2117
-#: ../camel/camel-gpg-context.c:2140
+#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
+#: ../camel/camel-gpg-context.c:2294
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ne mogu da dešifrujem poruku: neispravan oblik poruke"
 
-#: ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:2282
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Nisam uspeo da dešifrujem MIME deo: greška u protokolu"
 
-#: ../camel/camel-gpg-context.c:2223 ../camel/camel-smime-context.c:1288
+#: ../camel/camel-gpg-context.c:2348
+#, c-format
+msgid "Failed to decrypt MIME part: Secret key not found"
+msgstr "Ne mogu da dešifrujem MIME deo: Nije pronađen tajni ključ"
+
+#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
@@ -2321,7 +2337,7 @@ msgstr "Ne mogu da napravim zaključanu datoteku za „%s“: %s"
 #, c-format
 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“. "
+"Isteklo je vreme dok sam pokušao da pribavim zaključanu datoteku na „%s“. "
 "Pokušajte kasnije."
 
 #: ../camel/camel-lock.c:215
@@ -2423,51 +2439,54 @@ msgstr "Nema dostupnog potpisa"
 msgid "parse error"
 msgstr "greška obrade"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:708
 #, c-format
 msgid "Resolving: %s"
-msgstr "Nalazim: %s"
+msgstr "Rešavam: %s"
 
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:733
 msgid "Host lookup failed"
 msgstr "Nije uspelo traženje domaćina"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:739
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr ""
 "Nije uspelo traženje domaćina „%s“. Proverite naziv vašeg domaćina za "
 "greškama u pisanju."
 
-#: ../camel/camel-net-utils.c:741
+#: ../camel/camel-net-utils.c:743
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "Nije uspelo traženje domaćina „%s“: %s"
 
-#: ../camel/camel-offline-folder.c:89
+#: ../camel/camel-offline-folder.c:93
 #, c-format
-#| msgid "Downloading new messages for offline mode"
 msgid "Downloading new messages for offline mode in '%s'"
 msgstr "Preuzimam nove poruke za rad van mreže u „%s“"
 
-#: ../camel/camel-offline-folder.c:155
+#: ../camel/camel-offline-folder.c:160
+#, c-format
+msgid "Storing changes in folder '%s'"
+msgstr "Čuvam izmene u fasciklu „%s“"
+
+#: ../camel/camel-offline-folder.c:262
 #, c-format
-#| msgid "Downloading new messages for offline mode"
 msgid "Checking download of new messages for offline in '%s'"
 msgstr "Proveravam preuzimanje novih poruka za rad van mreže u „%s“"
 
-#: ../camel/camel-offline-folder.c:214
+#: ../camel/camel-offline-folder.c:375
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Usklađujem poruke iz fascikle „%s“ na disk"
 
-#: ../camel/camel-offline-folder.c:271
+#: ../camel/camel-offline-folder.c:438
 msgid "Copy folder content locally for _offline operation"
 msgstr "Lokalno umnoži sadržaj fascikle za rad _van mreže"
 
 #: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
-msgstr "Dostavljač virtuelne fascikle e-pošte"
+msgstr "Dostavljač virtuelne fascikle el. pošte"
 
 #: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
@@ -2488,7 +2507,7 @@ msgstr "Ne mogu da učitam „%s“: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne mogu da učitam „%s“: nema koda za pokretanje u modulu."
 
-#: ../camel/camel-provider.c:426 ../camel/camel-session.c:424
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:421
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Nema dostupnog dostavljača za protokol „%s“"
@@ -2513,7 +2532,7 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
-"Neispravan podatak o poreklu adrese e-pošte:\n"
+"Neispravan podatak o poreklu adrese el. pošte:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:92
@@ -2581,7 +2600,7 @@ msgstr "Odgovor servera nije sadržao podatke o ovlašćenju"
 #: ../camel/camel-sasl-digest-md5.c:927
 #, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "Odgovor servera je sadržao nekompletne podatke o ovlašćenju"
+msgstr "Odgovor servera je sadržao nepotpune podatke o ovlašćenju"
 
 #: ../camel/camel-sasl-digest-md5.c:940
 #, c-format
@@ -2665,7 +2684,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 
 #: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
 #: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:658
+#: ../camel/providers/smtp/camel-smtp-transport.c:798
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor potvrđivanja identiteta sa servera."
@@ -2706,22 +2725,22 @@ msgstr "OBIÄŒNO"
 
 #: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
-msgstr "POP pre SMTP"
+msgstr "POP pre SMTP-a"
 
 #: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ova opcija će odobriti POP vezu pre pokušaja SMTP"
+msgstr "Ova opcija će odobriti POP vezu pre pokušaja SMTP-a"
 
-#: ../camel/camel-sasl-popb4smtp.c:81
+#: ../camel/camel-sasl-popb4smtp.c:83
 msgid "POP Source UID"
 msgstr "POP izvorni KIB"
 
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
 #, 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:107 ../camel/camel-sasl-popb4smtp.c:116
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP pre SMTP potvrđivanje identiteta je pokušano sa „%s“ uslugom"
@@ -2731,26 +2750,26 @@ msgstr "POP pre SMTP potvrđivanje identiteta je pokušano sa „%s“ uslugom"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nije uspelo prevođenje regularnog izraza: %s: %s"
 
-#: ../camel/camel-session.c:433
+#: ../camel/camel-session.c:430
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "Neispravna Gvrsta registrovana za protokol „%s“"
 
-#: ../camel/camel-session.c:502
-#: ../camel/providers/imapx/camel-imapx-server.c:4805
-#: ../camel/providers/pop3/camel-pop3-store.c:309
-#: ../camel/providers/pop3/camel-pop3-store.c:764
-#: ../camel/providers/smtp/camel-smtp-transport.c:544
+#: ../camel/camel-session.c:499
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#: ../camel/providers/pop3/camel-pop3-store.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
-msgstr "Nema podrške za „%s“ potvrđivanja identiteta"
+msgstr "Nema podrške za „%s“ potvrđivanje identiteta"
 
-#: ../camel/camel-session.c:517
+#: ../camel/camel-session.c:514
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrđivanje identiteta"
 
-#: ../camel/camel-session.c:586
+#: ../camel/camel-session.c:583
 msgid "Forwarding messages is not supported"
 msgstr "Prosleđivanje poruka nije podržano"
 
@@ -2880,7 +2899,7 @@ msgstr "Uverenje je jedina poruka, ne mogu da proverim uverenje"
 #: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Uverenje je jedina poruka, uverenja su uvežena i proverena"
+msgstr "Uverenje je jedina poruka, uverenja su uvezena i proverena"
 
 #: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
@@ -2947,50 +2966,49 @@ msgstr "Nisam uspeo da dodam podatke u Å¡ifrer"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dešifrovanje: nisu nađeni šifrovani podaci"
 
-#: ../camel/camel-store.c:1248
+#: ../camel/camel-store.c:1280
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaram fasciklu „%s“"
 
-#: ../camel/camel-store.c:1539
+#: ../camel/camel-store.c:1571
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Pretražujem fascikle u „%s“"
 
-#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
 #: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
 #: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "Đubre"
 
-#: ../camel/camel-store.c:2230
+#: ../camel/camel-store.c:2262
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne mogu da napravim fasciklu: %s: fascikla postoji"
 
-#: ../camel/camel-store.c:2237
+#: ../camel/camel-store.c:2269
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Stvaram fasciklu „%s“"
 
-#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem fasciklu: %s: neispravna operacija"
 
-#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
 #: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna operacija"
+msgstr "Ne mogu da preimenujem fasciklu: %s: neispravna radnja"
 
 #: ../camel/camel-stream.c:168
-#| msgid "Cannot authenticate without a username"
 msgid "Cannot write with no base stream"
 msgstr "Ne mogu da pišem bez toka osnove"
 
@@ -3008,6 +3026,7 @@ msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "Samo vraćanje na početak je podržano Kamelovim Http tokom"
 
 #: ../camel/camel-stream-process.c:278
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "Connection cancelled"
 msgstr "Povezivanje je otkazano"
@@ -3037,22 +3056,22 @@ msgstr "Ne mogu da analiziram adresu „%s“"
 msgid "Updating folder '%s'"
 msgstr "Ažuriram fasciklu „%s“"
 
-#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
+#: ../camel/camel-vee-folder.c:869 ../camel/camel-vee-folder.c:979
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da umnožim ili premestim poruke u virtuelnu fasciklu"
 
-#: ../camel/camel-vee-folder.c:884
+#: ../camel/camel-vee-folder.c:902
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke „%s“ u „%s“"
 
-#: ../camel/camel-vee-folder.c:937
+#: ../camel/camel-vee-folder.c:955
 #, c-format
 msgid "Error storing '%s': "
 msgstr "Greška pri smeštanju „%s“: "
 
-#: ../camel/camel-vee-folder.c:1173
+#: ../camel/camel-vee-folder.c:1193
 msgid "Automatically _update on change in source folders"
 msgstr "Sam _ažuriraj ori izmeni u izvornim fasciklama"
 
@@ -3070,14 +3089,13 @@ msgstr "Ne mogu da obrišem fasciklu: %s: nema takve fascikle"
 #: ../camel/camel-vee-store.c:471
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Ne mogu da promenim ime fascikle: %s: nema takve fascikle"
+msgstr "Ne mogu da promenim naziv fascikle: %s: nema takve fascikle"
 
 #: ../camel/camel-vee-store.c:533
 msgid "Enable _Unmatched folder"
 msgstr "Uključi _nepoklopljene fascikle"
 
-#: ../camel/camel-vee-store.c:1025
-#| msgid "Enable _Unmatched folder"
+#: ../camel/camel-vee-store.c:1030
 msgid "Updating Unmatched search folder"
 msgstr "Osvežavam nepoklopljenu fasciklu pretrage"
 
@@ -3089,51 +3107,75 @@ msgstr "Ne mogu da umnožim poruke u fasciklu za smeće"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne mogu da umnožim poruke u fasciklu za đubre"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:812
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
 #, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“"
+msgid "You must be working online to complete this operation (%s)"
+msgstr "Morate da budete na mreži da biste završili ovu radnju (%s)"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
+#: ../camel/providers/imapx/camel-imapx-server.c:3060
+#: ../camel/providers/nntp/camel-nntp-store.c:349
+#: ../camel/providers/nntp/camel-nntp-store.c:1291
+#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2243
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:632
+#: ../camel/providers/pop3/camel-pop3-folder.c:834
+#: ../camel/providers/pop3/camel-pop3-folder.c:1044
+#: ../camel/providers/pop3/camel-pop3-store.c:296
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:672
+#: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "Morate da budete na mreži da biste završili ovu radnju"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:952
-#: ../camel/providers/imapx/camel-imapx-folder.c:1045
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
 #, c-format
 msgid "No destination folder specified"
 msgstr "Nije navedena fascikla odredišta"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:980
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
 msgid "Unable to move junk messages"
 msgstr "Ne mogu da premestim nepoželjne poruke"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1073
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
 msgid "Unable to move deleted messages"
 msgstr "Ne mogu da premestim obrisane poruke"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1393
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
+#: ../camel/providers/imapx/camel-imapx-folder.c:702
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "Obaveštenje o količini nije dostupno za fasciklu „%s“"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:964
+#: ../camel/providers/nntp/camel-nntp-folder.c:765
 msgid "Apply message _filters to this folder"
 msgstr "Primeni _filtere poruke nad ovom fasciklom"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1404
-#| msgid "Only check for Junk messages in the IN_BOX folder"
+#: ../camel/providers/imapx/camel-imapx-folder.c:975
 msgid "Always check for _new mail in this folder"
 msgstr "Uvek proveri ima li _nove pošte u ovoj fascikli"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1515
+#: ../camel/providers/imapx/camel-imapx-folder.c:1088
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Ne mogu da napravim sažetak fascikle za „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1524
+#: ../camel/providers/imapx/camel-imapx-folder.c:1097
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Ne mogu da napravim ostavu za „%s“: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1739
+#: ../camel/providers/imapx/camel-imapx-folder.c:1295
 #, c-format
 msgid "No IMAP mailbox available for folder '%s'"
 msgstr "Nijedno IMAP sanduče nije dostupno za fasciklu „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-input-stream.c:98
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
 msgid "Source stream returned no data"
 msgstr "Odgovor izvornog toka je bez podataka"
@@ -3144,7 +3186,7 @@ msgstr "Vršim proveru za novom poštom"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
-msgstr "P_otraži nove poruke u svim fasciklama"
+msgstr "_Potraži nove poruke u svim fasciklama"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
@@ -3152,14 +3194,13 @@ msgstr "Pro_veri za nove poruke u prijavljenim fasciklama"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use _Quick Resync if the server supports it"
-msgstr "Koristi _Brzo ponovno usaglašavanje ako ga server podržava"
+msgstr "Koristi _brzo ponovno usaglašavanje ako ga server podržava"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "_Listen for server change notifications"
 msgstr "_Osluškuj za obaveštenjima o izmenama servera"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#| msgid "Evolution Data Server"
 msgid "Connection to Server"
 msgstr "Veza sa serverom"
 
@@ -3174,15 +3215,15 @@ msgstr "Fascikle"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Show only subscribed folders"
-msgstr "Prik_aži samo prijavljene fascikle"
+msgstr "_Prikaži samo prijavljene fascikle"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "O_verride server-supplied folder namespace"
-msgstr "P_remosti oblik imena fascikle koje daje server"
+msgstr "Premosti _oblik naziva fascikle koje daje server"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Namespace:"
-msgstr "Oblik imena:"
+msgstr "Oblik naziva:"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/local/camel-local-provider.c:39
@@ -3206,22 +3247,21 @@ msgid "Check new messages for _Junk contents"
 msgstr "Proveri da nema _đubreta među novim porukama"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-#| msgid "Only check for Junk messages in the IN_BOX folder"
 msgid "Only check for Junk messages in the In_box folder"
 msgstr "Proveri da nema đubreta samo u fascikli San_duče"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-#| msgid "Automatically synchroni_ze remote mail locally"
 msgid "Synchroni_ze remote mail locally in all folders"
 msgstr "Uskladi ud_aljenu poštu mesno u svim fasciklama"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
-msgstr "Osnovni port IMAP-a"
+msgstr "Osnovni priključnik za IMAP"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "IMAP preko SSL-a"
+#| msgid "IMAP over SSL"
+msgid "IMAP over TLS"
+msgstr "IMAP preko TLS-a"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
@@ -3231,174 +3271,199 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i smeštanje pošte na IMAP servere."
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1010
-#: ../camel/providers/imapx/camel-imapx-server.c:1017
-#, c-format
-msgid "Not authenticated"
-msgstr "Nepotvrđenog identiteta"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1744
-msgid "Server disconnected"
-msgstr "Veza sa serverom je isključena"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2252
+#: ../camel/providers/imapx/camel-imapx-server.c:1134
 msgid "Error writing to cache stream"
 msgstr "Greška prilikom upisa u tok ostave"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3640
-msgid "Error performing IDLE"
-msgstr "Greška prilikom izvršavanja IDLE-a"
+#: ../camel/providers/imapx/camel-imapx-server.c:2745
+#: ../camel/providers/imapx/camel-imapx-server.c:2832
+#: ../camel/providers/imapx/camel-imapx-server.c:3093
+msgid "Failed to get capabilities"
+msgstr "Ne mogu da dobije mogućnosti"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4646
+#: ../camel/providers/imapx/camel-imapx-server.c:2764
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4647
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
-msgstr "STARTTLS nije podržano"
+msgstr "STARTTLS nije podržan"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4707
+#: ../camel/providers/imapx/camel-imapx-server.c:2773
+msgid "Failed to issue STARTTLS"
+msgstr "Greška u izdavanju poruke STARTTLS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2821
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Nisam uspeo da se povežem na IMAP server „%s“ u bezbednom režimu: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4794
+#: ../camel/providers/imapx/camel-imapx-server.c:2915
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP server „%s“ ne podržava „%s“ prijavljivanje identiteta"
+msgstr "IMAP server „%s“ ne podržava „%s“ potvrđivanje identiteta"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4824
-#: ../camel/providers/nntp/camel-nntp-store.c:393
-#: ../camel/providers/nntp/camel-nntp-store.c:530
+#: ../camel/providers/imapx/camel-imapx-server.c:2946
+#: ../camel/providers/nntp/camel-nntp-store.c:400
+#: ../camel/providers/nntp/camel-nntp-store.c:542
 msgid "Cannot authenticate without a username"
 msgstr "Ne mogu da potvrdim identitet bez korisničkog imena"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4833
-#: ../camel/providers/nntp/camel-nntp-store.c:539
-#: ../camel/providers/pop3/camel-pop3-store.c:676
-#: ../camel/providers/pop3/camel-pop3-store.c:706
+#: ../camel/providers/imapx/camel-imapx-server.c:2955
+#: ../camel/providers/nntp/camel-nntp-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "Lozinka potvrđivanja identiteta nije dostupna"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5069
-#: ../camel/providers/imapx/camel-imapx-server.c:5128
+#: ../camel/providers/imapx/camel-imapx-server.c:2963
+msgid "Failed to authenticate"
+msgstr "Nisam uspeo da potvrdim identitet"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3115
+msgid "Failed to issue NAMESPACE"
+msgstr "Nisam uspeo da izdam poruku „NAMESPACE“"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3133
+msgid "Failed to enable QResync"
+msgstr "Nisam uspeo da omogućim „QResync“"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3165
+msgid "Failed to issue NOTIFY"
+msgstr "Nisam uspeo da izdam poruku „NOTIFY“"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3624
+msgid "Failed to select mailbox"
+msgstr "Nisam uspeo da izaberem sanduče"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3722
+msgid "Cannot issue command, no stream available"
+msgstr "Ne mogu da izdam naredbu, jer nije dostupan tok"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3985
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Ne mogu da nabavim poruku sa IB-om „%s“: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3986
+msgid "No such message available."
+msgstr "Nema takve poruke."
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4022
+#: ../camel/providers/imapx/camel-imapx-server.c:4047
+#: ../camel/providers/imapx/camel-imapx-server.c:4066
 msgid "Error fetching message"
-msgstr "Greška prilikom preuzimanja poruke"
+msgstr "Greška preuzimanja poruke"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5121
+#: ../camel/providers/imapx/camel-imapx-server.c:4059
 msgid "Failed to close the tmp stream"
 msgstr "Nisam uspeo da zatvorim privremenu datoteku"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5157
+#: ../camel/providers/imapx/camel-imapx-server.c:4090
 msgid "Failed to copy the tmp file"
 msgstr "Nisam uspeo da umnožim privremenu datoteku"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5329
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error moving messages"
 msgstr "Greška premeštanja poruka"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5333
+#: ../camel/providers/imapx/camel-imapx-server.c:4253
 msgid "Error copying messages"
 msgstr "Greška umnožavanja poruka"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5555
+#: ../camel/providers/imapx/camel-imapx-server.c:4437
+#: ../camel/providers/imapx/camel-imapx-server.c:4458
+msgid "Cannot create spool file: "
+msgstr "Ne mogu da napravim datoteku pripreme: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4549
 msgid "Error appending message"
 msgstr "Greška prikačinjanja poruka"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5791
-msgid "Error fetching message headers"
-msgstr "Greška preuzimanja zaglavlja poruke"
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+msgid "Error performing NOOP"
+msgstr "Greška u izvršenju poruke „NOOP“"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4787
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "Pregledam izmenjene poruke u „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5958
-msgid "Error retrieving message"
-msgstr "Greška dovlačenja poruke"
+#: ../camel/providers/imapx/camel-imapx-server.c:4790
+msgid "Error scanning changes"
+msgstr "Greška skeniranja izmena"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6092
-#: ../camel/providers/imapx/camel-imapx-server.c:6321
+#: ../camel/providers/imapx/camel-imapx-server.c:4808
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "Prikupljam pregled podataka novih poruka u „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6144
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "Pregledam izmenjene poruke u „%s“"
+#: ../camel/providers/imapx/camel-imapx-server.c:4825
+msgid "Error fetching message info"
+msgstr "Greška preuzimanja podataka o poruci"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6196
-msgid "Error fetching new messages"
-msgstr "Greška prilikom preuzimanja novih poruka"
+#: ../camel/providers/imapx/camel-imapx-server.c:4887
+msgid "Error running STATUS"
+msgstr "Greška u pokretanju poruke „STATUS“"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6469
-msgid "Error refreshing folder"
-msgstr "Greška tokom pretrage"
+#: ../camel/providers/imapx/camel-imapx-server.c:5370
+#: ../camel/providers/imapx/camel-imapx-server.c:5422
+msgid "Error syncing changes"
+msgstr "Greška usklađivanja izmena"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6619
+#: ../camel/providers/imapx/camel-imapx-server.c:5533
 msgid "Error expunging message"
-msgstr "Greška prilikom izbacivanja poruke"
+msgstr "Greška izbacivanja poruke"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6725
-#: ../camel/providers/imapx/camel-imapx-server.c:6750
+#: ../camel/providers/imapx/camel-imapx-server.c:5603
 msgid "Error fetching folders"
-msgstr "Greška prilikom preuzimanja fascikle"
+msgstr "Greška preuzimanja fascikle"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5614
+msgid "Error fetching subscribed folders"
+msgstr "Greška preuzimanja prijavljenih fascikli"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6830
+#: ../camel/providers/imapx/camel-imapx-server.c:5636
 msgid "Error creating folder"
-msgstr "Greška prilikom stvaranja fascikle"
+msgstr "Greška stvaranja fascikle"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6882
+#: ../camel/providers/imapx/camel-imapx-server.c:5692
 msgid "Error deleting folder"
-msgstr "Greška prilikom brisanja fascikle"
+msgstr "Greška brisanja fascikle"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6958
+#: ../camel/providers/imapx/camel-imapx-server.c:5738
 msgid "Error renaming folder"
-msgstr "Greška prilikom preimenovanja fascikle"
+msgstr "Greška preimenovanja fascikle"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7032
+#: ../camel/providers/imapx/camel-imapx-server.c:5770
 msgid "Error subscribing to folder"
-msgstr "Greška prilikom prijavljivanja na fasciklu"
+msgstr "Greška prijavljivanja na fasciklu"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7098
+#: ../camel/providers/imapx/camel-imapx-server.c:5806
 msgid "Error unsubscribing from folder"
 msgstr "Greška odjavljivanja sa fascikle"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7160
+#: ../camel/providers/imapx/camel-imapx-server.c:5846
+msgid "IMAP server does not support quotas"
+msgstr "IMAP server ne podržava količine"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5858
 msgid "Error retrieving quota information"
 msgstr "Greška dovlačenja obaveštenja o količini"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7212
+#: ../camel/providers/imapx/camel-imapx-server.c:5905
 msgid "Search failed"
 msgstr "Pretraga nije uspela"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7274
-msgid "Error performing NOOP"
-msgstr "Greška prilikom obavljanja NOOP-a"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:7381
-msgid "Error syncing changes"
-msgstr "Greška prilikom usklađivanja izmena"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8388
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "Ne mogu da nabavim poruku sa IB „%s“: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8389
-msgid "No such message available."
-msgstr "Nema takve poruke."
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8612
-#: ../camel/providers/imapx/camel-imapx-server.c:8633
-msgid "Cannot create spool file: "
-msgstr "Ne mogu da napravim datoteku pripreme: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:9462
-msgid "IMAP server does not support quotas"
-msgstr "IMAP server ne podržava količine"
+#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
+#: ../camel/providers/imapx/camel-imapx-server.c:6023
+msgid "Error running IDLE"
+msgstr "Greška u pokretanju poruke „IDLE“"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:223
+#: ../camel/providers/imapx/camel-imapx-store.c:224
 #: ../camel/providers/local/camel-maildir-folder.c:482
 #: ../camel/providers/local/camel-maildir-store.c:347
 #: ../camel/providers/local/camel-maildir-store.c:826
@@ -3408,70 +3473,140 @@ msgstr "IMAP server ne podržava količine"
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:757
+#: ../camel/providers/imapx/camel-imapx-store.c:765
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:760
+#: ../camel/providers/imapx/camel-imapx-store.c:768
 #, c-format
 msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za „%s“ na „%s"
+msgstr "IMAP usluga za „%s“ na „%s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:836
+msgid "No IMAPx connection object provided"
+msgstr "Nije dostavljen IMAPx objekat za povezivanje"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:835
+#: ../camel/providers/imapx/camel-imapx-store.c:853
 #: ../camel/providers/nntp/camel-nntp-provider.c:92
 #: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:837
+#: ../camel/providers/imapx/camel-imapx-store.c:855
 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/imapx/camel-imapx-store.c:916
+#: ../camel/providers/imapx/camel-imapx-store.c:938
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve fascikle „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1330
+#: ../camel/providers/imapx/camel-imapx-store.c:1353
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "Nema IMAP prostora naziva za putanju fascikle „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1511
-#: ../camel/providers/imapx/camel-imapx-store.c:1756
+#: ../camel/providers/imapx/camel-imapx-store.c:1614
+#: ../camel/providers/imapx/camel-imapx-store.c:1848
 #, c-format
-#| msgid "Retrieving folder list for %s"
 msgid "Retrieving folder list for '%s'"
 msgstr "Dovlačim spisak fascikle za „%s“"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1976
+#: ../camel/providers/imapx/camel-imapx-store.c:2065
 #, 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/imapx/camel-imapx-store.c:2748
-#: ../camel/providers/nntp/camel-nntp-store.c:1249
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:591
-#: ../camel/providers/pop3/camel-pop3-folder.c:787
-#: ../camel/providers/pop3/camel-pop3-folder.c:985
-#: ../camel/providers/pop3/camel-pop3-store.c:297
-#: ../camel/providers/pop3/camel-pop3-store.c:526
-#: ../camel/providers/pop3/camel-pop3-store.c:574
-#: ../camel/providers/pop3/camel-pop3-store.c:666
-#: ../camel/providers/pop3/camel-pop3-store.c:1079
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "Morate da budete na mreži da biste završili ovu operaciju"
+msgstr "Naziv fascikle „%s“ nije ispravan jer sadrži znak „%c“"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2374
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Gpošta]/Nacrti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2375
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "Nacrti"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2376
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "Nacrt"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2379
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "Å abloni"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2382
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "Arhiva"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2385
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gpošta]/Poslata pošta"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2386
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "Poslata"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2387
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "Poslate stavke"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2390
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gpošta]/Spam"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2391
+#| msgid "Junk"
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "Đubre"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2753
-#, c-format
-#| msgid "You must be working online to complete this operation"
-msgid "You must be working online to complete this operation (%s)"
-msgstr "Morate da budete na mreži da biste završili ovu operaciju (%s)"
+#: ../camel/providers/imapx/camel-imapx-store.c:2392
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "Nepoželjna el. pošta"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2393
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "Nepoželjna el. pošta"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2394
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "Spam"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2395
+#| msgid "Mail"
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "Grupna pošta"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2398
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gpošta]/Smeće"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2399
+#| msgid "Trash"
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "Smeće"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2400
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "Obrisane stavke"
 
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
@@ -3482,7 +3617,7 @@ msgstr "~%s (%s)"
 #: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
-msgstr "poštansko sanduče:%s (%s)"
+msgstr "sanduče: %s (%s)"
 
 #: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
@@ -3512,7 +3647,7 @@ msgstr "MH-oblikovani direktorijumi pošte"
 
 #: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
-msgstr "Za smeštanje lokalne pošte u direktorijume pošte nalik MH."
+msgstr "Za smeštanje lokalne pošte u direktorijume pošte nalik MH-u."
 
 #: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
@@ -3578,12 +3713,12 @@ msgstr "Lokalna datoteka pošte %s"
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr "Administratorska ostava „%s“ nije apsolutna putanja"
+msgstr "Korena ostava „%s“ nije apsolutna putanja"
 
 #: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "Administratorska ostava „%s“ nije regularan direktorijum"
+msgstr "Korena ostava „%s“ nije regularan direktorijum"
 
 #: ../camel/providers/local/camel-local-store.c:234
 #: ../camel/providers/local/camel-local-store.c:244
@@ -3645,7 +3780,6 @@ msgstr "Ne mogu da prebacim poruku u odredišnu fasciklu: %s"
 #: ../camel/providers/local/camel-maildir-store.c:131
 #: ../camel/providers/local/camel-maildir-store.c:931
 #, c-format
-#| msgid "Cannot create folder '%s': %s"
 msgid "Cannot create folder containing '%s'"
 msgstr "Ne mogu da napravim fasciklu koja sadrži „%s“"
 
@@ -3654,7 +3788,7 @@ msgstr "Ne mogu da napravim fasciklu koja sadrži „%s“"
 #: ../camel/providers/local/camel-maildir-store.c:923
 #, c-format
 msgid "Folder %s already exists"
-msgstr "Fascikla „%s“ već postoji"
+msgstr "Već postoji fascikla „%s“"
 
 #: ../camel/providers/local/camel-maildir-store.c:266
 #: ../camel/providers/local/camel-maildir-store.c:297
@@ -3702,21 +3836,21 @@ msgstr "nije direktorijum pošte"
 msgid "Could not scan folder '%s': %s"
 msgstr "Ne mogu da pretražim fasciklu „%s“: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:465
-#: ../camel/providers/local/camel-maildir-summary.c:605
+#: ../camel/providers/local/camel-maildir-summary.c:476
+#: ../camel/providers/local/camel-maildir-summary.c:616
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne mogu da otvorim putanju direktorijuma pošte: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:596
+#: ../camel/providers/local/camel-maildir-summary.c:607
 msgid "Checking folder consistency"
 msgstr "Proveravam celovitost fascikle"
 
-#: ../camel/providers/local/camel-maildir-summary.c:689
+#: ../camel/providers/local/camel-maildir-summary.c:707
 msgid "Checking for new messages"
 msgstr "Vršim proveru za novim porukama"
 
-#: ../camel/providers/local/camel-maildir-summary.c:791
+#: ../camel/providers/local/camel-maildir-summary.c:810
 #: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:687
 #: ../camel/providers/local/camel-mbox-summary.c:836
@@ -3748,7 +3882,7 @@ msgstr "Ne mogu da zaključam fasciklu „%s“: %s"
 #: ../camel/providers/local/camel-mbox-store.c:580
 #, c-format
 msgid "Cannot create a folder by this name."
-msgstr "Ne mogu da napravim fasciklu ovog imena."
+msgstr "Ne mogu da napravim fasciklu ovog naziva."
 
 #: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
@@ -3799,19 +3933,13 @@ msgstr "Ne mogu da obrišem pregled fascikle „%s“: %s"
 #: ../camel/providers/local/camel-mbox-store.c:806
 #, c-format
 msgid "The new folder name is illegal."
-msgstr "Novo ime fascikle je neispravno."
+msgstr "Novi naziv fascikle je neispravan."
 
 #: ../camel/providers/local/camel-mbox-store.c:822
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ne mogu da preimenujem „%s“: „%s“: %s"
 
-# bug: quotes on the other one as well
-#: ../camel/providers/local/camel-mbox-store.c:906
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
-
 #: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -4005,45 +4133,47 @@ msgstr ""
 "Ne mogu da uskladim fasciklu za pripremu „%s“: %s\n"
 "Fascikla je možda oštećena, umnožite sačuvano u „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:222
-#: ../camel/providers/nntp/camel-nntp-folder.c:590
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:595
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:292
 #: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/pop3/camel-pop3-folder.c:544
-#: ../camel/providers/pop3/camel-pop3-folder.c:943
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/pop3/camel-pop3-folder.c:574
+#: ../camel/providers/pop3/camel-pop3-folder.c:1002
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobavim poruku „%s“: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:304
-#: ../camel/providers/nntp/camel-nntp-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:474
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
-#: ../camel/providers/pop3/camel-pop3-folder.c:553
+#: ../camel/providers/nntp/camel-nntp-folder.c:309
+#: ../camel/providers/nntp/camel-nntp-folder.c:629
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:564
+#: ../camel/providers/pop3/camel-pop3-folder.c:583
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Ne mogu da dobavim poruku „%s“: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
-#: ../camel/providers/nntp/camel-nntp-folder.c:436
+#: ../camel/providers/nntp/camel-nntp-folder.c:435
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Posting failed: %s"
-msgstr "Neuspela pošiljka: %s"
+msgstr "Objavljivanje nije uspelo: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:503
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
 msgid "Posting failed: "
-msgstr "Neuspela pošiljka: "
+msgstr "Objavljivanje nije uspelo: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:613
+#: ../camel/providers/nntp/camel-nntp-folder.c:618
 #, c-format
 msgid "This message is not currently available"
 msgstr "Ova poruka nije trenutno dostupna"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:722
+#: ../camel/providers/nntp/camel-nntp-folder.c:727
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "Ne možete da umnožite poruke iz NNTP fascikle"
@@ -4056,15 +4186,16 @@ msgstr ""
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
-msgstr "U p_rozorčetu za prijavu, prikaži relativna imena fascikli"
+msgstr "U _prozorčetu za prijavu, prikaži relativne nazive fascikli"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
-msgstr "Osnovni port NNTP-a"
+msgstr "Osnovni priključnik NNTP-a"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:55
-msgid "NNTP over SSL"
-msgstr "NNTP preko SSL-a"
+#| msgid "NNTP over SSL"
+msgid "NNTP over TLS"
+msgstr "NNTP preko TLS-a"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
@@ -4088,50 +4219,49 @@ msgid ""
 msgstr ""
 "Ova opcija će prijaviti na NNTP server korišćenjem lozinke u običnom tekstu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:377
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Ne mogu da pročitam pozdrav sa „%s“: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:378
+#: ../camel/providers/nntp/camel-nntp-store.c:385
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server „%s“ je vratio kod greške „%d“: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "USENET News via %s"
 msgstr "JUZNET vesti preko „%s“"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1150
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
 msgstr ""
-"Greška pri dovlačenju grupa vesti:\n"
+"Greška dovlačenja grupa vesti:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1266
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ne možete da napravite fasciklu u ostavi vesti: prijavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1282
+#: ../camel/providers/nntp/camel-nntp-store.c:1324
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Ne možete da preimenujete fasciklu u ostavi vesti."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1305
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Ne možete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
+msgstr "Ne možete da uklonite fasciklu u ostavi vesti: odjavite se umesto toga."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1515
+#: ../camel/providers/nntp/camel-nntp-store.c:1557
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4142,7 +4272,7 @@ msgstr ""
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadređena fascikla."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1582
+#: ../camel/providers/nntp/camel-nntp-store.c:1624
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4153,16 +4283,16 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2008
+#: ../camel/providers/nntp/camel-nntp-store.c:2050
 msgid "NNTP Command failed: "
 msgstr "NNTP naredba nije uspela: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2105
+#: ../camel/providers/nntp/camel-nntp-store.c:2155
 #, c-format
 msgid "Not connected."
 msgstr "Nisam povezan."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2199
+#: ../camel/providers/nntp/camel-nntp-store.c:2257
 #, c-format
 msgid "No such folder: %s"
 msgstr "Nema takve fascikle: %s"
@@ -4176,50 +4306,50 @@ msgstr "%s: pretražujem nove poruke"
 #: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr "Neočekivan odgovor ksovera: %s"
+msgstr "Neočekivan odgovor iksovera: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
-msgstr "Neočekivan odgovor head-a: %s"
+msgstr "Neočekivan odgovor servera iz zaglavlja: %s"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
-msgstr "Neuspela operacija: %s"
+msgstr "Radnja nije uspela: %s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#: ../camel/providers/pop3/camel-pop3-folder.c:441
 #, c-format
 msgid "No message with UID %s"
 msgstr "Nema poruke sa KIB-om %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:456
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Dovlačim POP poruku %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:545
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
 msgid "Retrieving POP summary"
 msgstr "Preuzimam POP pregled"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#: ../camel/providers/pop3/camel-pop3-folder.c:673
-#: ../camel/providers/pop3/camel-pop3-folder.c:686
-#: ../camel/providers/pop3/camel-pop3-folder.c:700
+#: ../camel/providers/pop3/camel-pop3-folder.c:703
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/pop3/camel-pop3-folder.c:719
+#: ../camel/providers/pop3/camel-pop3-folder.c:732
+#: ../camel/providers/pop3/camel-pop3-folder.c:746
 msgid "Cannot get POP summary: "
 msgstr "Ne mogu da dobavim POP pregled: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:764
+#: ../camel/providers/pop3/camel-pop3-folder.c:811
 msgid "Expunging old messages"
 msgstr "Izbacujem stare poruke"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:792
+#: ../camel/providers/pop3/camel-pop3-folder.c:839
 msgid "Expunging deleted messages"
 msgstr "Izbacujem obrisane poruke"
 
@@ -4236,7 +4366,7 @@ msgstr "_Ostavi poruke na serveru"
 #: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
-msgstr "O_briši nakon %s dana"
+msgstr "_Obriši nakon %s dana"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
@@ -4248,11 +4378,12 @@ msgstr "Isključi _podršku za sva POP3 proširenja"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
-msgstr "Osnovni POP3 port"
+msgstr "Osnovni POP3 priključnik"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:53
-msgid "POP3 over SSL"
-msgstr "POP3 preko SSL-a"
+#| msgid "POP3 over SSL"
+msgid "POP3 over TLS"
+msgstr "POP3 preko TLS-a"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
@@ -4288,7 +4419,7 @@ msgstr ": "
 #: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Neuspelo čitanje ispravnog pozdrava POP servera „%s“"
+msgstr "Nisam uspeo da pročitam ispravni pozdrav POP servera „%s“"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:177
 #, c-format
@@ -4311,37 +4442,38 @@ msgstr "Nisam uspeo da se povežem na POP server „%s“ u bezbednom režimu%s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Nisam uspeo da se povežem na POP server „%s“ u bezbednom režimu: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:358
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu da se prijavim na POP server „%s“: greška SASL protokola"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:380
+#: ../camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Nisam uspeo da potvrdim identitet na POP serveru „%s“: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:488
+#: ../camel/providers/pop3/camel-pop3-store.c:487
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 server „%s“"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:491
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "POP3 server za „%s“ na „%s“"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:688
-#: ../camel/providers/pop3/camel-pop3-store.c:775
+#: ../camel/providers/pop3/camel-pop3-store.c:702
+#: ../camel/providers/pop3/camel-pop3-store.c:715
+#: ../camel/providers/pop3/camel-pop3-store.c:797
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
 msgstr ""
 "Ne mogu da se povežem na POP server „%s“.\n"
-"Greška pri slanju lozinke: "
+"Greška slanja lozinke: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4352,7 +4484,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:790
+#: ../camel/providers/pop3/camel-pop3-store.c:812
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4361,12 +4493,12 @@ msgstr ""
 "Ne mogu da se povežem na POP server „%s“.\n"
 "Greška pri slanju korisničkog imena%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:872
+#: ../camel/providers/pop3/camel-pop3-store.c:896
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Nema takve fascikle „%s“."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:889
+#: ../camel/providers/pop3/camel-pop3-store.c:913
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ostava nema hijerarhiju fascikli"
@@ -4380,8 +4512,7 @@ msgstr "Sendmejl"
 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."
+msgstr "Za dostavu pošte prosleđivanjem „sendmail“ programu na lokalnom sistemu."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
@@ -4391,66 +4522,67 @@ msgstr "sendmejl"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmejl"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:136
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Failed to read From address"
 msgstr "Nisam uspeo da pročitam adresu pošiljaoca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:154
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "Slanje poruke u režimu van mreže je isključeno"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:181
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 #, c-format
 msgid "Could not parse recipient list"
-msgstr "Ne mogu da analiziram spisak primalaca"
+msgstr "Ne mogu da obradim spisak primalaca"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:198
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:199
 #, c-format
 msgid "Could not parse arguments"
 msgstr "Ne mogu da obradim argumente"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:230
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "Ne mogu da napravim spojku ka „%s“: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:254
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
-msgstr "Ne mogu da podelim „%s“: %s: pošta nije poslata"
+msgstr "Ne mogu da iscepim „%s“: %s: pošta nije poslata"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:303
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:304
 msgid "Could not send message: "
 msgstr "Ne mogu da pošaljem poruku: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:333
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:334
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "„%s“ je završio signalom „%s“: pošta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:343
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:344
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Ne mogu da izvršim „%s“: pošta nije poslata."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:348
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:349
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "„%s“ je završio stanjem „%d“: pošta nije poslata."
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
-msgstr "Osnovni SMTP port"
+msgstr "Osnovni SMTP priključnik"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:40
-msgid "SMTP over SSL"
-msgstr "SMTP preko SSL-a"
+#| msgid "SMTP over SSL"
+msgid "SMTP over TLS"
+msgstr "SMTP preko TLS-a"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
-msgstr "Port podnošenja poruke"
+msgstr "Priključnik podnošenja poruke"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
@@ -4461,218 +4593,222 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Za dostavu pošte povezivanjem na prosleđivač pošte u mreži korišćenjem SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:244
 msgid "Welcome response error: "
 msgstr "Greška odgovora dobrodošlice: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, 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"
+msgstr "Ne mogu da se povežem na SMTP server „%s“ u bezbednom režimu: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
-#: ../camel/providers/smtp/camel-smtp-transport.c:239
-#: ../camel/providers/smtp/camel-smtp-transport.c:247
+#: ../camel/providers/smtp/camel-smtp-transport.c:289
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:309
 msgid "STARTTLS command failed: "
-msgstr "Neuspela STARTTLS naredba: "
+msgstr "STARTTLS naredba nije uspela: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#: ../camel/providers/smtp/camel-smtp-transport.c:328
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
-msgstr "Ne mogu da se povežem na SMTP server „%s“ u sigurnosnom režimu: "
+msgstr "Ne mogu da se povežem na SMTP server „%s“ u bezbednom režimu: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server „%s“"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko „%s“"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP server „%s“ ne podržava „%s“ potvrđivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:535
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "Nije naveden SASL mehanizam"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:570
-#: ../camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:595
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
+msgid "AUTH command failed: Not connected."
+msgstr "Nije uspela naredba potvrđivanja: Niste povezani."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "AUTH command failed: "
-msgstr "Neuspela naredba „AUTH“: "
+msgstr "Neuspela naredba potvrđivanja: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:888
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "Ne mogu da pošaljem poruku: servis nije povezan."
+msgstr "Ne mogu da pošaljem poruku: usluga nije povezana."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 #, 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:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:930
 #, 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:788
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
 #, 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:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:1077
 msgid "Syntax error, command unrecognized"
 msgstr "Greška u sintaksi, naredba nije prepoznata"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "Syntax error in parameters or arguments"
 msgstr "Greška u sintaksi u parametrima ili argumentima"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "Command not implemented"
 msgstr "Naredba nije podržana"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:1083
 msgid "Command parameter not implemented"
 msgstr "Parametar naredbe nije podržan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:1085
 msgid "System status, or system help reply"
-msgstr "Status sistema, ili odgovor na pomoć"
+msgstr "Stanje sistema, ili odgovor na pomoć"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:1087
 msgid "Help message"
 msgstr "Poruka o pomoći"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../camel/providers/smtp/camel-smtp-transport.c:1089
 msgid "Service ready"
-msgstr "Servis je spreman"
+msgstr "Usluga je spremna"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:923
+#: ../camel/providers/smtp/camel-smtp-transport.c:1091
 msgid "Service closing transmission channel"
-msgstr "Servis zatvara kanal prenosa"
+msgstr "Usluga zatvara kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:925
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "Service not available, closing transmission channel"
-msgstr "Servis nije dostupan, zatvaram kanal prenosa"
+msgstr "Usluga nije dostupna, zatvaram kanal prenosa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:927
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
 msgid "Requested mail action okay, completed"
 msgstr "Tražena radnja za poštu je u redu, završeno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:929
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
 msgid "User not local; will forward to <forward-path>"
-msgstr "Korisnik nije lokalan; biće prosleđeno na <putanja-prosleđivanja>"
+msgstr "Korisnik nije lokalan; biće prosleđeno na <putanju-prosleđivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:931
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 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:933
+#: ../camel/providers/smtp/camel-smtp-transport.c:1101
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Tražena radnja nije preduzeta: poštansko sanduče je nedostupno"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:935
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
 msgid "Requested action aborted: error in processing"
 msgstr "Tražena radnja nije preduzeta: greška pri obradi"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:937
+#: ../camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "User not local; please try <forward-path>"
 msgstr "Korisnik nije lokalan; pokušajte <putanja-prosleđivanja>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:939
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
 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:941
+#: ../camel/providers/smtp/camel-smtp-transport.c:1109
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Prekinuta je tražena radnja za poštu: premašen je dodeljen prostor"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:943
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
 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:945
+#: ../camel/providers/smtp/camel-smtp-transport.c:1113
 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:947
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
 msgid "Transaction failed"
-msgstr "Neuspeo prenos"
+msgstr "Prenos nije uspeo"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:951
+#: ../camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "A password transition is needed"
 msgstr "Potrebno je slanje lozinke"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:953
+#: ../camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizam potvrđivanja identiteta je preslab"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:955
+#: ../camel/providers/smtp/camel-smtp-transport.c:1123
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Neophodno je šifrovanje za traženi mehanizam potvrđivanja identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:957
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "Temporary authentication failure"
 msgstr "Nije uspelo privremeno potvrđivanje identiteta"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1246
+#: ../camel/providers/smtp/camel-smtp-transport.c:1415
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#: ../camel/providers/smtp/camel-smtp-transport.c:1279
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 msgid "HELO command failed: "
 msgstr "Neuspela naredba „HELO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1380
+#: ../camel/providers/smtp/camel-smtp-transport.c:1520
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
 msgid "MAIL FROM command failed: "
 msgstr "Neuspela naredba „MAIL FROM“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1571
 msgid "RCPT TO command failed: "
 msgstr "Neuspela naredba „RCPT TO“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1596
 #, c-format
 msgid "RCPT TO <%s> failed: "
-msgstr "RCPT TO <%s> nije uspelo: "
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1478
-#: ../camel/providers/smtp/camel-smtp-transport.c:1490
-#: ../camel/providers/smtp/camel-smtp-transport.c:1501
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1580
-#: ../camel/providers/smtp/camel-smtp-transport.c:1595
-#: ../camel/providers/smtp/camel-smtp-transport.c:1604
+msgstr "„RCPT TO“ <%s> nije uspelo: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1668
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1690
+#: ../camel/providers/smtp/camel-smtp-transport.c:1752
+#: ../camel/providers/smtp/camel-smtp-transport.c:1770
+#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+#: ../camel/providers/smtp/camel-smtp-transport.c:1791
 msgid "DATA command failed: "
 msgstr "Neuspela naredba „DATA“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1629
-#: ../camel/providers/smtp/camel-smtp-transport.c:1645
-#: ../camel/providers/smtp/camel-smtp-transport.c:1654
+#: ../camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+#: ../camel/providers/smtp/camel-smtp-transport.c:1839
 msgid "RSET command failed: "
 msgstr "Neuspela naredba „RSET“: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1679
-#: ../camel/providers/smtp/camel-smtp-transport.c:1693
-#: ../camel/providers/smtp/camel-smtp-transport.c:1700
+#: ../camel/providers/smtp/camel-smtp-transport.c:1865
+#: ../camel/providers/smtp/camel-smtp-transport.c:1877
+#: ../camel/providers/smtp/camel-smtp-transport.c:1883
 msgid "QUIT command failed: "
 msgstr "Neuspela naredba „QUIT“: "
 
@@ -4707,6 +4843,22 @@ msgid ""
 msgstr ""
 "Jedinice za podsetnik na rođendane ili godišnjice, „minuti“, „sati“ ili „dani“"
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
+msgid "Whether the migration of old setting was already done"
+msgstr "Da li je premeštanje starih podešavanja već obavljeno"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "Apsolutna putanja gčp (ili gčp2) izvršni je"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+"Jedan primer je „/usr/bin/gpg“; ako nije doživeo neuspeh, ili ako ne "
+"postoji, onda se traži. Promena zahteva ponovno pokretanje programa."
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
 msgstr "(Zastarelo) Vrsta posrednika za korišćenje"
@@ -4769,17 +4921,17 @@ msgstr "(Zastarelo) Broj priključnika za SOCKS zahteve"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(Zastarelo) Adresa za samopodešavanje posrednika"
 
-#: ../libebackend/e-collection-backend.c:900
+#: ../libebackend/e-collection-backend.c:976
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "„%s“ ne podržava stvaranje udaljenih izvorišta"
 
-#: ../libebackend/e-collection-backend.c:959
+#: ../libebackend/e-collection-backend.c:1035
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "„%s“ ne podržava brisanje udaljenih izvorišta"
 
-#: ../libebackend/e-data-factory.c:1233
+#: ../libebackend/e-data-factory.c:1294
 #, c-format
 msgid "Backend factory for source '%s' and extension '%s' cannot be found."
 msgstr "Ne mogu da nađem pozadinsku proizvodnju za izvor „%s“ i proširenje „%s“."
@@ -4789,46 +4941,47 @@ msgstr "Ne mogu da nađem pozadinsku proizvodnju za izvor „%s“ i proširenje
 msgid "Data source is missing a [%s] group"
 msgstr "Izvoru podataka nedostaje [%s] grupa"
 
-#: ../libebackend/e-server-side-source.c:1325
-#: ../libedataserver/e-source.c:1837
+#: ../libebackend/e-server-side-source.c:466
+msgid "Failed to lookup credentials: "
+msgstr "Nisam uspeo da nađem uverenja: "
+
+#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "Izvor podataka „%s“ ne podržava stvaranje udaljenih izvorišta"
 
-#: ../libebackend/e-server-side-source.c:1339
+#: ../libebackend/e-server-side-source.c:1405
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr ""
 "Izvor podataka „%s“ nema pozadinca zbirke da bi napravio udaljeno izvorište"
 
-#: ../libebackend/e-server-side-source.c:1367
-#: ../libedataserver/e-source.c:1950
+#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "Izvor podataka „%s“ ne podržava brisanje udaljenih izvorišta"
 
-#: ../libebackend/e-server-side-source.c:1381
+#: ../libebackend/e-server-side-source.c:1447
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr ""
 "Izvor podataka „%s“ nema pozadinca zbirke da bi obrisao udaljeno izvorište"
 
-#: ../libebackend/e-server-side-source.c:1412
-#: ../libedataserver/e-source.c:2046
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1021
+#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "Izvor podataka „%s“ ne podržava OAut 2.0 potvrđivanje identiteta"
 
-#: ../libebackend/e-server-side-source.c:1774
+#: ../libebackend/e-server-side-source.c:1856
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "Datoteka mora da ima nastavak „.source“"
 
 # već u upotrebi?
-#: ../libebackend/e-source-registry-server.c:315
+#: ../libebackend/e-source-registry-server.c:319
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "KIB „%s“ je već u upotrebi"
@@ -4928,7 +5081,7 @@ msgstr "Telefonski pozivi"
 #: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
-msgstr "Status"
+msgstr "Stanje"
 
 #: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
@@ -4955,74 +5108,90 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "ÄŒekanje"
 
-#: ../libedataserver/e-client.c:143
+#: ../libedataserver/e-client.c:146
 msgid "Source not loaded"
 msgstr "Izvor nije učitan"
 
-#: ../libedataserver/e-client.c:145
+#: ../libedataserver/e-client.c:148
 msgid "Source already loaded"
 msgstr "Izvor je već učitan"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:156
+#: ../libedataserver/e-client.c:159
 msgid "Offline unavailable"
 msgstr "Rad van mreže nije dostupan"
 
-#: ../libedataserver/e-client.c:178
+#: ../libedataserver/e-client.c:181
 msgid "D-Bus error"
-msgstr "Greška u D-magistrali"
+msgstr "Greška u D-sabirnici"
 
-#: ../libedataserver/e-client.c:2020
+#: ../libedataserver/e-client.c:2023
 msgid "Timeout was reached"
 msgstr "Vremenski rok je dostignut"
 
-#: ../libedataserver/e-source.c:967
+#: ../libedataserver/e-source.c:771
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Izvornoj datoteci nedostaje [%s] grupa"
 
-#: ../libedataserver/e-source.c:1617
+#: ../libedataserver/e-source.c:1375
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "Izvor podataka „%s“ se ne može ukloniti"
 
-#: ../libedataserver/e-source.c:1740
+#: ../libedataserver/e-source.c:1498
 #, c-format
 msgid "Data source '%s' is not writable"
-msgstr "Izvor podtaka „%s“ nije upisiv"
+msgstr "Izvor podataka „%s“ nije upisiv"
 
-#: ../libedataserver/e-source.c:2401
+#: ../libedataserver/e-source.c:2194
 msgid "Unnamed"
 msgstr "Neimenovan"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:41
-#| msgid "Protocol not supported"
 msgid "Credentials lookup is not supported"
 msgstr "Traženje uverenja nije podržano"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:54
-#| msgid "Forwarding messages is not supported"
 msgid "Credentials store is not supported"
 msgstr "Smeštanje uverenja nije podržano"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:65
-#| msgid "Forwarding messages is not supported"
 msgid "Credentials delete is not supported"
 msgstr "Brisanje uverenja nije podržano"
 
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:114
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:169
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:208
+#| msgid "Credentials store is not supported"
+msgid "Google authentication is not supported"
+msgstr "Guglovo potvrđivanje identiteta nije podržano"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:121
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:176
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:215
+#, c-format
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "Izvor „%s“ (%s) nije ispravan izvor Gugla"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:135
+#| msgid "Object not found"
+msgid "Google secret not found"
+msgstr "Nisam našao Guglovu tajnu"
+
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
-#| msgid "Contact not found"
 msgid "Password not found"
 msgstr "Nisam pronašao lozinku"
 
-#: ../libedataserver/e-source-mail-signature.c:485
+#: ../libedataserver/e-source-mail-signature.c:481
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "Skripta potpisa mora da bude mesna datoteka"
 
-#: ../libedataserver/e-source-proxy.c:1646
+#: ../libedataserver/e-source-proxy.c:1641
 #, c-format
 msgid "Source '%s' does not support proxy lookups"
 msgstr "Izvor „%s“ ne podržava traženja posrednika"
@@ -5031,7 +5200,7 @@ msgstr "Izvor „%s“ ne podržava traženja posrednika"
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1972
+#: ../libedataserver/e-time-utils.c:1692 ../libedataserver/e-time-utils.c:1991
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
@@ -5039,7 +5208,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:1678 ../libedataserver/e-time-utils.c:1963
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1982
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -5047,7 +5216,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:1683 ../libedataserver/e-time-utils.c:1968
+#: ../libedataserver/e-time-utils.c:1702 ../libedataserver/e-time-utils.c:1987
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
@@ -5055,78 +5224,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:1688 ../libedataserver/e-time-utils.c:1959
+#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1978
 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:1693
+#: ../libedataserver/e-time-utils.c:1712
 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:1698
+#: ../libedataserver/e-time-utils.c:1717
 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:1701 ../libedataserver/e-time-utils.c:1821
-#: ../libedataserver/e-time-utils.c:1954
+#: ../libedataserver/e-time-utils.c:1720 ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1973
 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:1708
+#: ../libedataserver/e-time-utils.c:1727
 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:1712
+#: ../libedataserver/e-time-utils.c:1731
 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:1717
+#: ../libedataserver/e-time-utils.c:1736
 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:1722
+#: ../libedataserver/e-time-utils.c:1741
 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:1727
+#: ../libedataserver/e-time-utils.c:1746
 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:1732
+#: ../libedataserver/e-time-utils.c:1751
 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:1735 ../libedataserver/e-time-utils.c:1824
+#: ../libedataserver/e-time-utils.c:1754 ../libedataserver/e-time-utils.c:1843
 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:1895 ../libedataserver/e-time-utils.c:2016
+#: ../libedataserver/e-time-utils.c:1914 ../libedataserver/e-time-utils.c:2035
 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:1899 ../libedataserver/e-time-utils.c:2008
+#: ../libedataserver/e-time-utils.c:1918 ../libedataserver/e-time-utils.c:2027
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5134,99 +5303,223 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1904 ../libedataserver/e-time-utils.c:2013
+#: ../libedataserver/e-time-utils.c:1923 ../libedataserver/e-time-utils.c:2032
 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:1908 ../libedataserver/e-time-utils.c:2005
+#: ../libedataserver/e-time-utils.c:1927 ../libedataserver/e-time-utils.c:2024
 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:1912
+#: ../libedataserver/e-time-utils.c:1931
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1916
+#: ../libedataserver/e-time-utils.c:1935
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-credentials-prompter.c:259
-#: ../libedataserverui/e-credentials-prompter.c:1561
-#: ../libedataserverui/e-credentials-prompter.c:1605
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP greška: %s"
+
+#: ../libedataserver/e-webdav-discover.c:523
+msgid "Could not parse response"
+msgstr "Ne mogu da obradim odgovor"
+
+#: ../libedataserver/e-webdav-discover.c:532
+msgid "Empty response"
+msgstr "Prazan odgovor"
+
+#: ../libedataserver/e-webdav-discover.c:540
+msgid "Unexpected reply from server"
+msgstr "Neočekivani odgovor sa servera"
+
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1563
+#: ../libedataserverui/e-credentials-prompter.c:1607
 msgid "Credentials prompt was cancelled"
 msgstr "Upit uverenja je otkazan"
 
-#: ../libedataserverui/e-credentials-prompter.c:663
+#: ../libedataserverui/e-credentials-prompter.c:664
 #, c-format
-#| msgid "Source '%s' does not support proxy lookups"
 msgid "Source '%s' doesn't support prompt for credentials"
 msgstr "Izvor „%s“ ne podržava upit za uverenjima"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:440
+#, c-format
+#| msgid "Failed to obtain an access token for '%s': "
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr ""
+"Nisam uspeo da dobijem čin pristupa sa adrese „%s“. Šifra greške je %d (%s)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:486
+msgid "Requesting access token, please wait..."
+msgstr "Zahtevam čin pristupa, sačekajte..."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:588
+#| msgid "Address book authentication request"
+msgid "Google Address book authentication request"
+msgstr "Zahtev za prijavu na adresar Gugla"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:591
+#| msgid "Calendar authentication request"
+msgid "Google Calendar authentication request"
+msgstr "Zahtev za prijavu na kalendar Gugla"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:594
+#| msgid "Mail authentication request"
+msgid "Google Memo List authentication request"
+msgstr "Zahtev za prijavu na spisak beleški Gugla"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:597
+#| msgid "Mail authentication request"
+msgid "Google Task List authentication request"
+msgstr "Zahtev za prijavu na spisak zadataka Gugla"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:601
+#| msgid "Mail authentication request"
+msgid "Google Mail authentication request"
+msgstr "Zahtev za prijavu na poštu Gugla"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:604
+#| msgid "Calendar authentication request"
+msgid "Google account authentication request"
+msgstr "Zahtev za prijavu na nalog Gugla"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:615
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem adresaru „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:619
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem kalendaru „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem nalogu pošte „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem prenosu pošte „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem spisku beleški „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem spisku zadataka „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr ""
+"Prijavite se na vaš Gugl nalog i prihvatite uslove kako biste pristupili "
+"vašem nalogu „%s“."
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:683
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
 msgid "Address book authentication request"
 msgstr "Zahtev za prijavu na adresar"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
 msgid "Calendar authentication request"
 msgstr "Zahtev za prijavu na kalendar"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
 msgid "Mail authentication request"
 msgstr "Zahtev za prijavu na poštu"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
 msgid "Authentication request"
 msgstr "Zahtev za prijavu"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "Unesite lozinku za adresar „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "Unesite lozinku za kalendar „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "Unesite lozinku za nalog pošte „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "Unesite lozinku za prenos pošte „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "Unesite lozinku za spisak beleški „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
-msgstr "Unesite lozinku za spisak zaduženja „%s“."
+msgstr "Unesite lozinku za spisak zadataka „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "Unesite lozinku za nalog „%s“."
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
-#: ../libedataserverui/e-trust-prompt.c:114
-#| msgid "Canceled"
-msgid "_Cancel"
-msgstr "_Otkaži"
-
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
+#: ../libedataserverui/e-webdav-discover-widget.c:1064
 msgid "_OK"
 msgstr "_U redu"
 
@@ -5235,13 +5528,11 @@ msgid "_User Name:"
 msgstr "_Korisnik:"
 
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:355
-#| msgid "Password"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
 #. Remember password check
 #: ../libedataserverui/e-credentials-prompter-impl-password.c:371
-#| msgid "Add this password to your keyring"
 msgid "_Add this password to your keyring"
 msgstr "_Dodajte ovu lozinku u vaš privezak"
 
@@ -5268,8 +5559,10 @@ msgstr "Prihvati _trajno"
 #: ../libedataserverui/e-trust-prompt.c:188
 #: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "SSL uverenje za „%s“ nije od poverenja. Da li želite da ga prihvatite?"
+#| msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr ""
+"SSL/TLS uverenje za „%s“ nije od poverenja. Da li želite da ga prihvatite?"
 
 #: ../libedataserverui/e-trust-prompt.c:210
 #: ../modules/trust-prompt/trust-prompt-gtk.c:174
@@ -5277,7 +5570,6 @@ msgid "Reason:"
 msgstr "Razlog:"
 
 #: ../libedataserverui/e-trust-prompt.c:213
-#| msgid "Other error"
 msgid "Detailed error:"
 msgstr "Opširna greška:"
 
@@ -5315,7 +5607,51 @@ msgstr "Uverenje je povučeno u skladu sa spiskom povlačenja uverenja veze."
 msgid "The certificate's algorithm is considered insecure."
 msgstr "Algoritam uverenja se smatra nesigurnim."
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:174
+#: ../libedataserverui/e-webdav-discover-widget.c:166
+msgid "Supports"
+msgstr "Izdavači podrške"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:177
+msgid "_User mail:"
+msgstr "_El. pošta korisnika:"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:523
+msgctxt "WebDAVDiscover"
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:524
+msgctxt "WebDAVDiscover"
+msgid "Events"
+msgstr "Događaji"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:525
+msgctxt "WebDAVDiscover"
+msgid "Memos"
+msgstr "Beleške"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:526
+msgctxt "WebDAVDiscover"
+msgid "Tasks"
+msgstr "Zadaci"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:825
+msgid "Invalid URL"
+msgstr "Neispravna adresa"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:839
+msgid "User name not filled"
+msgstr "Niste upisali korisničko ime"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:880
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ../libedataserverui/e-webdav-discover-widget.c:883
+msgid "Searching server sources..."
+msgstr "Pretražujem izvore na serveru..."
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:210
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5324,17 +5660,21 @@ msgstr ""
 "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ "
 "sa koje bih dobio lozinku za „%s“"
 
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:273
+msgid "Failed to get password from GOA: "
+msgstr "Ne mogu da dobijem lozinku iz Naloga na mreži: "
+
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
-msgstr "Kod: %u — Neočekivani odgovor sa servera"
+msgstr "Šifra: %u — Neočekivani odgovor sa servera"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
-msgstr "Nisam uspeo da obradim samootkrivajući odgovor IksML"
+msgstr "Nisam uspeo da obradim samootkrivajući odgovor IksML-a"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:249
@@ -5360,7 +5700,7 @@ msgstr "Nisam uspeo da pronađem element naloga"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "Nisam uspeo da pronađem ASadresu i OABadresu u odgovoru samootkrivanja"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1254
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1235
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5369,28 +5709,27 @@ msgstr ""
 "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ "
 "sa koje bih dobio pristup za „%s“."
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1284
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "Nisam uspeo da dobijem pristup za „%s“: "
 
-#: ../modules/google-backend/module-google-backend.c:205
-#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:199
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: ../modules/google-backend/module-google-backend.c:279
+#: ../modules/google-backend/module-google-backend.c:568
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "Zaduženja"
 
-#: ../modules/google-backend/module-google-backend.c:333
+#: ../modules/google-backend/module-google-backend.c:625
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "Kontakti"
 
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
+msgid "Calendar"
+msgstr "Kalendar"
+
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
 msgstr "Objedinite vaše kalendare"
@@ -5399,7 +5738,7 @@ msgstr "Objedinite vaše kalendare"
 msgid "Integrate your contacts"
 msgstr "Objedinite vaše kontakte"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:237
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:272
 msgid "Signon service did not return a secret"
 msgstr "Usluga prijavljivanja nije vratila tajnu"
 
@@ -5431,7 +5770,7 @@ msgstr "Pošta"
 msgid "Integrate your mailboxes"
 msgstr "Objedinite vaše sandučiće"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1002
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1060
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5479,13 +5818,13 @@ msgid "Yahoo! Mail"
 msgstr "Jahu! pošta"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:38
 #: ../services/evolution-user-prompter/evolution-user-prompter.c:32
 msgid "Keep running after the last client is closed"
 msgstr "Nastavlja da radi nakon zatvaranja poslednjeg klijenta"
 
 #: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
 msgid "Wait running until at least one client is connected"
 msgstr "Čeka sa pokretanjem sve dok se barem jedan klijent ne poveže"
 
@@ -5534,6 +5873,25 @@ msgstr "Ne preseljavaj korisničke podatke iz prethodnih izdanja Evolucije"
 msgid "_Dismiss"
 msgstr "_Zanemari"
 
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to issue DONE"
+#~ msgstr "Greška u izdavanju poruke DONE"
+
+#~ msgid "Server disconnected"
+#~ msgstr "Veza sa serverom je isključena"
+
+#~ msgid "Error fetching message headers"
+#~ msgstr "Greška preuzimanja zaglavlja poruke"
+
+#~ msgid "Error retrieving message"
+#~ msgstr "Greška dovlačenja poruke"
+
+#~ msgid "Error fetching new messages"
+#~ msgstr "Greška prilikom preuzimanja novih poruka"
+
+#~ msgid "Error refreshing folder"
+#~ msgstr "Greška tokom pretrage"
+
 #~ msgid "No backend name in source '%s'"
 #~ msgstr "Nema naziva pozadinca u izvoru „%s“"