[balsa] Updated Serbian translation



commit 7b80d510adcd6926a26d8e214e3da9b1ca29a05a
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Sun Feb 26 07:23:19 2017 +0100

    Updated Serbian translation

 po/sr.po       | 3985 +++++++++++++++++++++++++++++++-------------------------
 po/sr latin po | 3985 +++++++++++++++++++++++++++++++-------------------------
 2 files changed, 4466 insertions(+), 3504 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index d92f49b..2d0bbe9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,18 +1,18 @@
 # Serbian translation of balsa
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2017.
 # This file is distributed under the same license as the balsa package.
 # Maintainer: Данило Шеган <dsegan gmx net>
 # Милош Поповић <gpopac gmail com>, 2012.
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2012—2016.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2012—2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-07 05:12+0000\n"
-"PO-Revision-Date: 2016-09-11 07:55+0200\n"
+"POT-Creation-Date: 2017-02-08 03:26+0000\n"
+"PO-Revision-Date: 2017-02-25 19:06+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: српски <gnome-sr googlegroups org>\n"
+"Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,268 +26,278 @@ msgid "Balsa"
 msgstr "Балса"
 
 #: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
-msgid "E-Mail utility"
-msgstr "Алат за ел-пошту"
+#| msgid "E-Mail utility"
+msgid "Email utility"
+msgstr "Алат за е-пошту"
 
 #: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
 msgid "Mail Client"
-msgstr "Програм за ел-пошту"
+msgstr "Програм за е-пошту"
 
 #: ../balsa.desktop.in.in.h:4 ../balsa-mailto-handler.desktop.in.in.h:4
 msgid "Balsa Mail Client"
-msgstr "Програм ел-поште Балса"
+msgstr "Програм е-поште Балса"
 
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldif.c:332
+#: ../libbalsa/address-book-extern.c:209 ../libbalsa/address-book-ldif.c:330
 msgid "No-Id"
 msgstr "Без-ИБ"
 
-#: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:374
-#: ../libbalsa/address-book-ldap.c:500 ../libbalsa/address-book-ldif.c:311
-#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
-#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:406
+#: ../libbalsa/address-book-extern.c:214 ../libbalsa/address-book-extern.c:372
+#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:309
+#: ../libbalsa/address-book-ldif.c:333 ../libbalsa/address-book-ldif.c:352
+#: ../libbalsa/address-book-ldif.c:356 ../libbalsa/address-book-vcard.c:158
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
+#: ../libbalsa/rfc6350.c:112
 msgid "No-Name"
 msgstr "Без-имена"
 
-#: ../libbalsa/address-book-ldap.c:283
+#: ../libbalsa/address-book-ldap.c:280
 msgid "SASL Interaction\n"
 msgstr "САСЛ међудејство\n"
 
-#: ../libbalsa/address-book-ldap.c:330
+#: ../libbalsa/address-book-ldap.c:327
 msgid "TLS requested but not compiled in"
 msgstr "Тражен је ТЛС али није уграђен"
 
-#: ../libbalsa/address-book-ldap.c:609
+#: ../libbalsa/address-book-ldap.c:606
 msgid "Undefined location of user address book"
 msgstr "Није одређена путања до вашег адресара"
 
-#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book-osmo.c:146
+#, c-format
+#| msgid "Removing duplicates failed: %s"
+msgid "Reading Osmo contacts failed: %s"
+msgstr "Читање Осмо контакта није успело: %s"
+
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Нема грешке"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:313
 msgid "Cannot read from address book"
 msgstr "Не могу да читам из адресара"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:314
 msgid "Cannot write to address book"
 msgstr "Не могу да пишем у адресар"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:315
 msgid "Cannot connect to the server"
 msgstr "Не могу да се повежем са сервером"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:316
 msgid "Cannot search in the address book"
 msgstr "Не могу да претражујем адресар"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:318
 msgid "Cannot add duplicate entry"
 msgstr "Не могу да додам исти унос два пута"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:320
 msgid "Cannot find address in address book"
 msgstr "Не могу да нађем адресу у адресару"
 
-#: ../libbalsa/address-book.c:323 ../src/main-window.c:2916
-#: ../src/main-window.c:4252 ../src/sendmsg-window.c:3797
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2913
+#: ../src/main-window.c:4246 ../src/sendmsg-window.c:3810
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:750
+#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:741
 #: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3504
+#: ../src/sendmsg-window.c:3517
 msgid "To:"
 msgstr "Прима:"
 
-#: ../libbalsa/address-view.c:163 ../src/balsa-mime-widget-message.c:752
+#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:743
 #: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3512
-msgid "Cc:"
-msgstr "Копија:"
+#: ../src/sendmsg-window.c:3525
+#| msgid "Cc:"
+msgid "CC:"
+msgstr "ЦЦ:"
 
-#: ../libbalsa/address-view.c:164 ../src/balsa-mime-widget-message.c:754
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:745
 #: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:718
-msgid "Bcc:"
-msgstr "Невидљива копија:"
+msgid "BCC:"
+msgstr "БЦЦ:"
 
-#: ../libbalsa/address-view.c:165
+#: ../libbalsa/address-view.c:163
 msgid "Reply To:"
 msgstr "Одговори:"
 
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:952
 msgid "D_isplayed Name:"
 msgstr "Приказано _име:"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:953
 msgid "_First Name:"
 msgstr "_Име:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:954
 msgid "_Last Name:"
 msgstr "_Презиме:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:955
 msgid "_Nickname:"
 msgstr "_Надимак:"
 
-#: ../libbalsa/address.c:958
+#: ../libbalsa/address.c:956
 msgid "O_rganization:"
 msgstr "О_рганизација:"
 
-#: ../libbalsa/address.c:959
+#: ../libbalsa/address.c:957
 msgid "_Email Address:"
-msgstr "Адреса _ел-поште:"
+msgstr "Адреса _е-поште:"
 
-#: ../libbalsa/address.c:978 ../src/filter-edit-callbacks.c:1071
+#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1069
 msgid "A_dd"
 msgstr "_Додај"
 
-#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1841
-#: ../libbalsa/message.c:845
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1839
+#: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(без наслова)"
 
-#: ../libbalsa/body.c:395 ../libbalsa/body.c:442
+#: ../libbalsa/body.c:393 ../libbalsa/body.c:440
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Не могу да изградим излазни ток"
 
-#: ../libbalsa/body.c:574
+#: ../libbalsa/body.c:572
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Не могу да прочитам уграђену поруку"
 
-#: ../libbalsa/filter-error.c:48
+#: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
 msgstr "Грешка синтаксе у датотеци подешавања филтера"
 
-#: ../libbalsa/filter-error.c:49
+#: ../libbalsa/filter-error.c:47
 msgid "Unable to allocate memory"
 msgstr "Не могу да доделим меморију"
 
-#: ../libbalsa/filter-error.c:50
+#: ../libbalsa/filter-error.c:48
 msgid "Error in regular expression syntax"
 msgstr "Грешка у синтакси регуларног израза"
 
-#: ../libbalsa/filter-error.c:51
+#: ../libbalsa/filter-error.c:49
 msgid "Attempt to apply an invalid filter"
 msgstr "Покушавам да применим неисправан филтер"
 
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:985
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:983
 msgid "To"
 msgstr "Прима"
 
-#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:353
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:351
 msgid "From"
 msgstr "Шаље"
 
-#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:369
-#: ../src/pref-manager.c:397
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
+#: ../src/pref-manager.c:380
 msgid "Subject"
 msgstr "Тема"
 
-#: ../libbalsa/filter-funcs.c:386
-msgid "Cc"
-msgstr "Копија"
+#: ../libbalsa/filter-funcs.c:384
+msgid "CC"
+msgstr "ЦЦ"
 
-#: ../libbalsa/filter-funcs.c:387
+#: ../libbalsa/filter-funcs.c:385
 msgid "Body"
 msgstr "Тело"
 
-#: ../libbalsa/filter-funcs.c:392
+#: ../libbalsa/filter-funcs.c:390
 #, c-format
 msgid "Header:%s"
 msgstr "Заглавље:%s"
 
-#: ../libbalsa/filter-funcs.c:414
+#: ../libbalsa/filter-funcs.c:412
 msgid "New"
 msgstr "Ново"
 
-#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:992
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:992
 msgid "Replied"
 msgstr "Одговорено"
 
-#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:992
 msgid "Flagged"
 msgstr "Означено"
 
-#: ../libbalsa/filter-funcs.c:441
+#: ../libbalsa/filter-funcs.c:439
 msgid "Not "
 msgstr "Није "
 
-#: ../libbalsa/filter-funcs.c:457
+#: ../libbalsa/filter-funcs.c:455
 msgid "From %Y-%m-%d"
 msgstr "Од %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:463
+#: ../libbalsa/filter-funcs.c:461
 msgid "To %Y-%m-%d"
 msgstr "До %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:471
+#: ../libbalsa/filter-funcs.c:469
 msgid "And"
 msgstr "И"
 
-#: ../libbalsa/filter-funcs.c:474
+#: ../libbalsa/filter-funcs.c:472
 msgid "Or"
 msgstr "Или"
 
-#: ../libbalsa/filter-file.c:135
+#: ../libbalsa/filter-file.c:133
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Неисправни филтери %s за сандуче %s"
 
-#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:864
 msgid "Unable to load message body to match filter"
 msgstr "Не могу да учитам тело поруке које одговара филтеру"
 
-#: ../libbalsa/filter.c:234
+#: ../libbalsa/filter.c:232
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Неисправан филтер: %s"
 
-#: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Лош назив сандучета за филтер: %s"
 
-#: ../libbalsa/filter.c:286
+#: ../libbalsa/filter.c:284
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Грешка при умножавању порука: %s"
 
-#: ../libbalsa/filter.c:296
+#: ../libbalsa/filter.c:294
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Грешка при премештању порука у смеће: %s"
 
-#: ../libbalsa/filter.c:309
+#: ../libbalsa/filter.c:307
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Грешка при премештању порука: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:125
+#: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Не могу да дешифрујем МИМЕ део: грешка у обради"
 
-#: ../libbalsa/gmime-multipart-crypt.c:222
+#: ../libbalsa/gmime-multipart-crypt.c:220
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "Не могу да проверим вишеделни/потписани део јер неки подделови недостају."
 
-#: ../libbalsa/gmime-multipart-crypt.c:248
+#: ../libbalsa/gmime-multipart-crypt.c:246
 #, c-format
-msgid "unsupported protocol '%s'"
+#| msgid "unsupported protocol '%s'"
+msgid "unsupported protocol “%s”"
 msgstr "неподржан протокол „%s“"
 
-#: ../libbalsa/gmime-multipart-crypt.c:261
+#: ../libbalsa/gmime-multipart-crypt.c:259
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -295,20 +305,23 @@ msgstr ""
 "Не могу да проверим вишеделни/потписани део: врста садржаја потписа се не "
 "подудара са протоколом."
 
-#: ../libbalsa/gmime-multipart-crypt.c:462
+#: ../libbalsa/gmime-multipart-crypt.c:455
 #, c-format
+#| msgid ""
+#| "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
+#| "'%s'."
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
-"'%s'."
+"“%s”."
 msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: није подржано шифровање за "
 "протокол „%s“."
 
-#: ../libbalsa/gmime-multipart-crypt.c:463
+#: ../libbalsa/gmime-multipart-crypt.c:456
 msgid "(none)"
 msgstr "(ништа)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:476
+#: ../libbalsa/gmime-multipart-crypt.c:469
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -316,30 +329,29 @@ msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: врста садржаја не одговара "
 "протоколу."
 
-#: ../libbalsa/gmime-multipart-crypt.c:491
+#: ../libbalsa/gmime-multipart-crypt.c:484
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: неочекивана врста садржаја"
 
-#: ../libbalsa/gmime-multipart-crypt.c:533
+#: ../libbalsa/gmime-multipart-crypt.c:526
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
 "Не могу да дешифрујем вишеделни/шифровани део: не могу да обрадим шифровани "
 "садржај"
 
-#: ../libbalsa/html.c:68
+#: ../libbalsa/html.c:66
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Не могу да преузмем ХТМЛ део: %s"
 
-#: ../libbalsa/html.c:121
+#: ../libbalsa/html.c:119
 #, c-format
-#| msgid "Could not get an HTML part: %s"
 msgid "Could not convert HTML part to text: %s"
 msgstr "Не могу да претворим ХТМЛ део у текст: %s"
 
-#: ../libbalsa/html.c:402
+#: ../libbalsa/html.c:400
 msgid ""
 "This message part contains images from a remote server.\n"
 "To protect your privacy, Balsa has not downloaded them.\n"
@@ -349,7 +361,7 @@ msgstr ""
 "би заштитила вашу приватност, Балса их није преузела.\n"
 "Можете их преузети уколико верујете серверу."
 
-#: ../libbalsa/html.c:410 ../libbalsa/html.c:1078
+#: ../libbalsa/html.c:408 ../libbalsa/html.c:1076
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -359,195 +371,195 @@ msgstr ""
 "приватност, Балса их није преузела. Можете их преузети уколико верујете "
 "серверу."
 
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089
+#: ../libbalsa/html.c:417 ../libbalsa/html.c:1087
 msgid "_Download images"
 msgstr "Преузми _слике"
 
-#: ../libbalsa/html.c:421 ../libbalsa/html.c:1091 ../libbalsa/identity.c:1736
-#: ../src/ab-window.c:140 ../src/mailbox-conf.c:1162 ../src/mailbox-node.c:1115
-#: ../src/main-window.c:3945 ../src/toolbar-prefs.c:142
+#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1708
+#: ../src/ab-window.c:148 ../src/mailbox-conf.c:1160 ../src/mailbox-node.c:1113
+#: ../src/main-window.c:3939 ../src/toolbar-prefs.c:140
 msgid "_Close"
 msgstr "_Затвори"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1960
-#: ../libbalsa/mailbox_local.c:1962 ../src/sendmsg-window.c:3745
-#: ../src/sendmsg-window.c:3747
+#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1962
+#: ../libbalsa/mailbox_local.c:1964 ../src/sendmsg-window.c:3758
+#: ../src/sendmsg-window.c:3760
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3685
-#: ../src/sendmsg-window.c:3686 ../src/sendmsg-window.c:3687
+#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3698
+#: ../src/sendmsg-window.c:3699 ../src/sendmsg-window.c:3700
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:166
+#: ../libbalsa/identity.c:160
 msgid "New Identity"
 msgstr "Нови идентитет"
 
-#: ../libbalsa/identity.c:346
+#: ../libbalsa/identity.c:340
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Грешка извршавања творца потписа %s"
 
-#: ../libbalsa/identity.c:358
+#: ../libbalsa/identity.c:352
 #, c-format
-msgid "Cannot open signature file '%s' for reading"
+#| msgid "Cannot open signature file '%s' for reading"
+msgid "Cannot open signature file “%s” for reading"
 msgstr "Не могу да отворим датотеку потписа „%s“ ради читања"
 
-#: ../libbalsa/identity.c:364
+#: ../libbalsa/identity.c:358
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Грешка читања потписа из %s"
 
-#: ../libbalsa/identity.c:369
+#: ../libbalsa/identity.c:363
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Потпис у „%s“ није УТФ-8 текст."
 
-#: ../libbalsa/identity.c:488 ../libbalsa/libbalsa-gpgme-cb.c:159
-#: ../libbalsa/libbalsa-gpgme-cb.c:371 ../libbalsa/smtp-server.c:543
-#: ../src/ab-main.c:860 ../src/ab-window.c:133 ../src/address-book-config.c:239
-#: ../src/address-book-config.c:338 ../src/balsa-app.c:90
-#: ../src/balsa-index.c:2645 ../src/balsa-mblist.c:1878
-#: ../src/balsa-message.c:1791 ../src/balsa-mime-widget-callbacks.c:87
-#: ../src/filter-edit-callbacks.c:1241 ../src/filter-edit-dialog.c:404
-#: ../src/filter-edit-dialog.c:573 ../src/filter-export-dialog.c:81
-#: ../src/filter-run-dialog.c:313 ../src/folder-conf.c:306
-#: ../src/folder-conf.c:569 ../src/folder-conf.c:802 ../src/mailbox-conf.c:404
-#: ../src/mailbox-conf.c:425 ../src/mailbox-conf.c:441
-#: ../src/mailbox-conf.c:1125 ../src/pref-manager.c:508
-#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1542
-#: ../src/sendmsg-window.c:1994 ../src/sendmsg-window.c:3311
-#: ../src/sendmsg-window.c:4678 ../src/sendmsg-window.c:4975
-#: ../src/sendmsg-window.c:5132 ../src/spell-check.c:384
-#: ../src/store-address.c:210
+#: ../libbalsa/identity.c:480 ../libbalsa/libbalsa-gpgme-cb.c:157
+#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:430
+#: ../src/ab-main.c:858 ../src/ab-window.c:141 ../src/address-book-config.c:239
+#: ../src/address-book-config.c:342 ../src/address-book-config.c:388
+#: ../src/balsa-app.c:88 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
+#: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
+#: ../src/filter-edit-callbacks.c:1239 ../src/filter-edit-dialog.c:402
+#: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
+#: ../src/filter-run-dialog.c:311 ../src/folder-conf.c:304
+#: ../src/folder-conf.c:566 ../src/folder-conf.c:799 ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:423 ../src/mailbox-conf.c:439
+#: ../src/mailbox-conf.c:1123 ../src/pref-manager.c:491
+#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1546
+#: ../src/sendmsg-window.c:1998 ../src/sendmsg-window.c:3324
+#: ../src/sendmsg-window.c:4691 ../src/sendmsg-window.c:4988
+#: ../src/sendmsg-window.c:5145 ../src/spell-check.c:382
+#: ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../libbalsa/identity.c:489 ../libbalsa/libbalsa-gpgme-cb.c:158
-#: ../libbalsa/libbalsa-gpgme-cb.c:370 ../libbalsa/smtp-server.c:542
-#: ../src/ab-window.c:132 ../src/balsa-app.c:89 ../src/balsa-message.c:1792
-#: ../src/balsa-mime-widget-callbacks.c:88 ../src/filter-edit-callbacks.c:1240
-#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:312 ../src/main-window.c:4038
-#: ../src/pref-manager.c:506 ../src/sendmsg-window.c:1541
-#: ../src/sendmsg-window.c:1995 ../src/sendmsg-window.c:3310
-#: ../src/sendmsg-window.c:4679 ../src/store-address.c:211
+#: ../libbalsa/identity.c:481 ../libbalsa/libbalsa-gpgme-cb.c:156
+#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:429
+#: ../src/ab-window.c:140 ../src/balsa-app.c:87 ../src/balsa-message.c:1767
+#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1238
+#: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
+#: ../src/filter-run-dialog.c:310 ../src/main-window.c:4032
+#: ../src/pref-manager.c:489 ../src/sendmsg-window.c:1545
+#: ../src/sendmsg-window.c:1999 ../src/sendmsg-window.c:3323
+#: ../src/sendmsg-window.c:4692 ../src/store-address.c:209
 msgid "_OK"
 msgstr "У _реду"
 
-#: ../libbalsa/identity.c:501
+#: ../libbalsa/identity.c:493
 msgid "Current"
 msgstr "Тренутно"
 
-#: ../libbalsa/identity.c:755 ../libbalsa/smtp-server.c:265
+#: ../libbalsa/identity.c:743 ../libbalsa/smtp-server.c:192
 msgid "Default"
 msgstr "Основно"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:957
+#: ../libbalsa/identity.c:945
 msgid "_Face Path"
 msgstr "Путања до _сличице"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:963
+#: ../libbalsa/identity.c:951
 msgid "_X-Face Path"
 msgstr "Путања до _X-сличице"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:991
+#: ../libbalsa/identity.c:974
 msgid "General"
 msgstr "Опште"
 
-#: ../libbalsa/identity.c:993
+#: ../libbalsa/identity.c:976
 msgid "_Identity name:"
 msgstr "_Име идентитета:"
 
-#: ../libbalsa/identity.c:995
+#: ../libbalsa/identity.c:978
 msgid "_Full name:"
 msgstr "_Пуно име:"
 
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:980
 msgid "_Mailing address:"
 msgstr "_Поштанске адресе:"
 
-#: ../libbalsa/identity.c:999
+#: ../libbalsa/identity.c:982
 msgid "Reply _to:"
 msgstr "_Одговори:"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:984
 msgid "_Domain:"
 msgstr "_Домен:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:1005
+#: ../libbalsa/identity.c:988
 msgid "Messages"
 msgstr "Поруке"
 
-#: ../libbalsa/identity.c:1007
-msgid "_Bcc:"
-msgstr "_Невидљива копија:"
+#: ../libbalsa/identity.c:990
+msgid "_BCC:"
+msgstr "_БЦЦ:"
 
-#: ../libbalsa/identity.c:1009
+#: ../libbalsa/identity.c:992
 msgid "Reply _string:"
 msgstr "Ниска за _одговоре:"
 
-#: ../libbalsa/identity.c:1011
+#: ../libbalsa/identity.c:994
 msgid "F_orward string:"
 msgstr "Ниска за _прослеђивање:"
 
-#: ../libbalsa/identity.c:1014
+#: ../libbalsa/identity.c:997
 msgid "send messages in both plain text and _HTML format"
 msgstr "шаљи поруке и као чист текст и као _ХТМЛ"
 
-#: ../libbalsa/identity.c:1017
-#| msgid "request _Message Disposition Notification by default"
+#: ../libbalsa/identity.c:1000
 msgid "request positive (successful) _Delivery Status Notification by default"
 msgstr "захтевај позитивно (успешно) _обавештење о стању испоруке по основи"
 
-#: ../libbalsa/identity.c:1021
+#: ../libbalsa/identity.c:1004
 msgid "request _Message Disposition Notification by default"
 msgstr "захтевај _обавештење о приспећу поруке по основи"
 
-#: ../libbalsa/identity.c:1031
+#: ../libbalsa/identity.c:1013
 msgid "SMT_P server:"
 msgstr "СМТ_П сервер:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1036
+#: ../libbalsa/identity.c:1017
 msgid "Signature"
 msgstr "Потпис"
 
-#: ../libbalsa/identity.c:1039
+#: ../libbalsa/identity.c:1020
 msgid "Signature _path"
 msgstr "Путања до _потписа"
 
-#: ../libbalsa/identity.c:1042
+#: ../libbalsa/identity.c:1023
 msgid "_Execute signature"
 msgstr "_Изврши потпис"
 
-#: ../libbalsa/identity.c:1045
+#: ../libbalsa/identity.c:1026
 msgid "Incl_ude signature"
 msgstr "_Укључи потпис"
 
-#: ../libbalsa/identity.c:1048
+#: ../libbalsa/identity.c:1029
 msgid "Include signature when for_warding"
 msgstr "Укључи потпис при _прослеђивању"
 
-#: ../libbalsa/identity.c:1051
+#: ../libbalsa/identity.c:1032
 msgid "Include signature when rep_lying"
 msgstr "Укључи потпис при _одговарању"
 
-#: ../libbalsa/identity.c:1054
+#: ../libbalsa/identity.c:1035
 msgid "_Add signature separator"
 msgstr "_Додај раздвајач потписа"
 
-#: ../libbalsa/identity.c:1057
+#: ../libbalsa/identity.c:1038
 msgid "Prepend si_gnature"
 msgstr "Постави потпис _на почетак"
 
-#: ../libbalsa/identity.c:1063
+#: ../libbalsa/identity.c:1044
 msgid ""
 "Signing and encrypting messages are possible only if Balsa is built with "
 "cryptographic support."
@@ -555,34 +567,31 @@ msgstr ""
 "Потписивање и шифровање порука је могуће само ако је Балса изграђена са "
 "подршком за шифровање."
 
-#: ../libbalsa/identity.c:1068
+#: ../libbalsa/identity.c:1049
 msgid "Security"
 msgstr "Сигурност"
 
-#: ../libbalsa/identity.c:1071
+#: ../libbalsa/identity.c:1052
 msgid "sign messages by default"
 msgstr "потпиши поруке по основи"
 
-#: ../libbalsa/identity.c:1074
+#: ../libbalsa/identity.c:1055
 msgid "encrypt messages by default"
 msgstr "шифруј поруке по основи"
 
-#: ../libbalsa/identity.c:1077
+#: ../libbalsa/identity.c:1058
 msgid "default protocol"
 msgstr "основни протокол"
 
-#: ../libbalsa/identity.c:1080
+#: ../libbalsa/identity.c:1061
 msgid "always trust GnuPG keys when encrypting"
 msgstr "увек веруј ГнуПГ кључевима приликом шифровања"
 
-#: ../libbalsa/identity.c:1083
+#: ../libbalsa/identity.c:1064
 msgid "remind me if messages can be encrypted"
 msgstr "подсети ме уколико је могуће потписати поруку"
 
-#: ../libbalsa/identity.c:1086
-#| msgid ""
-#| "use secret key with this id for signing (leave empty for automatic "
-#| "selection)"
+#: ../libbalsa/identity.c:1067
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -590,85 +599,85 @@ msgstr ""
 "користи тајни кључ уз овај иб за потписивање\n"
 "(оставите празно за самостално бирање)"
 
-#: ../libbalsa/identity.c:1220
+#: ../libbalsa/identity.c:1201
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Грешка читања датотеке „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1230
+#: ../libbalsa/identity.c:1211
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Сличица заглавља „%s“ је превелика (%lu бајта)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1240
+#: ../libbalsa/identity.c:1221
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Сличица заглавља „%s“ садржи бинарне податке."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1260 ../src/balsa-message.c:1616
+#: ../libbalsa/identity.c:1241 ../src/balsa-message.c:1591
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Не могу да учитам сличицу: %s"
 
-#: ../libbalsa/identity.c:1439
+#: ../libbalsa/identity.c:1420
 msgid "Error: The identity does not have a name"
 msgstr "Грешка: Идентитет нема име"
 
-#: ../libbalsa/identity.c:1449
+#: ../libbalsa/identity.c:1430
 msgid "Error: An identity with that name already exists"
 msgstr "Грешка: Идентитет са тим именом већ постоји"
 
-#: ../libbalsa/identity.c:1644
+#: ../libbalsa/identity.c:1623
 msgid "Do you really want to delete the selected identity?"
 msgstr "Да ли заиста желите да обришете изабрани идентитет?"
 
-#: ../libbalsa/identity.c:1683
+#: ../libbalsa/identity.c:1662
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Грешка приказивања помоћи за личности: %s\n"
 
-#: ../libbalsa/identity.c:1729
+#: ../libbalsa/identity.c:1701
 msgid "Manage Identities"
 msgstr "Управљајте личностима"
 
-#: ../libbalsa/identity.c:1733 ../libbalsa/smtp-server.c:544
-#: ../src/address-book-config.c:237 ../src/address-book-config.c:336
-#: ../src/filter-edit-callbacks.c:1242 ../src/filter-edit-dialog.c:574
-#: ../src/filter-export-dialog.c:82 ../src/filter-run-dialog.c:314
-#: ../src/folder-conf.c:307 ../src/folder-conf.c:570 ../src/folder-conf.c:803
-#: ../src/main-window.c:3944 ../src/pref-manager.c:509
-#: ../src/toolbar-prefs.c:143
+#: ../libbalsa/identity.c:1705 ../libbalsa/smtp-server.c:431
+#: ../src/address-book-config.c:237 ../src/address-book-config.c:340
+#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1240
+#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
+#: ../src/filter-run-dialog.c:312 ../src/folder-conf.c:305
+#: ../src/folder-conf.c:567 ../src/folder-conf.c:800 ../src/main-window.c:3938
+#: ../src/pref-manager.c:492 ../src/toolbar-prefs.c:141
 msgid "_Help"
 msgstr "_Помоћ"
 
 #. new button
-#: ../libbalsa/identity.c:1734 ../src/filter-edit-dialog.c:226
-#: ../src/mailbox-node.c:1080
+#: ../libbalsa/identity.c:1706 ../src/filter-edit-dialog.c:224
+#: ../src/mailbox-node.c:1078
 msgid "_New"
 msgstr "_Нова"
 
-#: ../libbalsa/identity.c:1735 ../src/ab-main.c:855
-#: ../src/filter-edit-callbacks.c:1075 ../src/filter-edit-dialog.c:320
+#: ../libbalsa/identity.c:1707 ../src/ab-main.c:853
+#: ../src/filter-edit-callbacks.c:1073 ../src/filter-edit-dialog.c:318
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../libbalsa/identity.c:2127
+#: ../libbalsa/identity.c:2091
 msgid "GnuPG MIME mode"
 msgstr "ГнуПГ МИМЕ режим"
 
-#: ../libbalsa/identity.c:2129
+#: ../libbalsa/identity.c:2093
 msgid "GnuPG OpenPGP mode"
 msgstr "ГнуПГ ОпенПГП режим"
 
-#: ../libbalsa/identity.c:2132
+#: ../libbalsa/identity.c:2096
 msgid "GpgSM S/MIME mode"
 msgstr "ГпгСМ С/МИМЕ режим"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:290
+#: ../libbalsa/imap-server.c:288
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -678,80 +687,80 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:294
+#: ../libbalsa/imap-server.c:292
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Грешка ИМАП сервера %s: %s"
 
-#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:353
+#: ../libbalsa/imap-server.c:527 ../libbalsa/server.c:357
 #, c-format
 msgid "Error looking up password for %s@%s: %s\n"
 msgstr "Грешка тражења лозинке за %s@%s: %s\n"
 
-#: ../libbalsa/imap-server.c:531 ../libbalsa/server.c:355
+#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:359
 #, c-format
 msgid "Falling back\n"
 msgstr "Враћам на старо\n"
 
-#: ../libbalsa/imap-server.c:541 ../libbalsa/imap-server.c:577
-#: ../libbalsa/server.c:364 ../libbalsa/server.c:398 ../libbalsa/server.c:443
-#: ../libbalsa/server.c:457
+#: ../libbalsa/imap-server.c:539 ../libbalsa/imap-server.c:575
+#: ../libbalsa/server.c:368 ../libbalsa/server.c:402 ../libbalsa/server.c:447
+#: ../libbalsa/server.c:461
 msgid "Balsa passwords"
 msgstr "Балсине лозинке"
 
-#: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:373
-#: ../libbalsa/server.c:450
+#: ../libbalsa/imap-server.c:548 ../libbalsa/server.c:377
+#: ../libbalsa/server.c:454
 #, c-format
 msgid "Error storing password for %s@%s: %s\n"
 msgstr "Грешка складиштења лозинке за %s@%s: %s\n"
 
-#: ../libbalsa/imap-server.c:628
+#: ../libbalsa/imap-server.c:626
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Не могу да се повежем на %s"
 
-#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#: ../libbalsa/imap-server.c:631 ../libbalsa/imap-server.c:636
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Не могу да се повежем на сервер: %s"
 
-#: ../libbalsa/imap-server.c:787
+#: ../libbalsa/imap-server.c:785
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Прекорачен је број веза са сервером „%s“"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "User ID"
 msgstr "ИБ корисника"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Key ID"
 msgstr "ИБ кључа"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Length"
 msgstr "Дужина"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Validity"
 msgstr "Исправност"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:154
+#: ../libbalsa/libbalsa-gpgme-cb.c:152
 msgid "Select key"
 msgstr "Изаберите кључ"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:175
+#: ../libbalsa/libbalsa-gpgme-cb.c:173
 #, c-format
 msgid "Select the private key for the signer %s"
 msgstr "Изаберите приватни кључ за потписника %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:180
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
 #, c-format
 msgid "Select the public key for the recipient %s"
 msgstr "Изаберите јавни кључ за примаоца %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:185
+#: ../libbalsa/libbalsa-gpgme-cb.c:183
 #, c-format
 msgid ""
 "There seems to be no public key for recipient %s in your key ring.\n"
@@ -761,26 +770,27 @@ msgstr ""
 "Изгледа да у вашем привеску кључева не постоји јавни кључ за примаоца „%s“.\n"
 "Ако сте сигурни да прималац поседује другачији кључ, изаберите га са списка."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:326
+#: ../libbalsa/libbalsa-gpgme-cb.c:324
 #, c-format
 msgid "Insufficient trust for recipient %s"
 msgstr "Недовољно поверења за примаоца %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:330
+#: ../libbalsa/libbalsa-gpgme-cb.c:328
 #, c-format
-msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+#| msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgid "The validity of the key with user ID “%s” is “%s”."
 msgstr "Исправност кључа са корисничким ИБ-ом „%s“ је „%s“."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:341
+#: ../libbalsa/libbalsa-gpgme-cb.c:339
 msgid "Use this key anyway?"
 msgstr "Да ипак користим овај кључ?"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:367
+#: ../libbalsa/libbalsa-gpgme-cb.c:365
 msgid "Enter Passphrase"
 msgstr "Унесите лозинку"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:395
+#: ../libbalsa/libbalsa-gpgme-cb.c:393
 #, c-format
 msgid ""
 "%s\n"
@@ -793,7 +803,7 @@ msgstr ""
 "\n"
 "Кључ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:400
+#: ../libbalsa/libbalsa-gpgme-cb.c:398
 #, c-format
 msgid ""
 "%s\n"
@@ -806,60 +816,62 @@ msgstr ""
 "\n"
 "Кључ: %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:240 ../libbalsa/libbalsa-gpgme.c:251
-#: ../libbalsa/libbalsa-gpgme.c:352 ../libbalsa/libbalsa-gpgme.c:474
-#: ../libbalsa/libbalsa-gpgme.c:566
+#: ../libbalsa/libbalsa-gpgme.c:238 ../libbalsa/libbalsa-gpgme.c:249
+#: ../libbalsa/libbalsa-gpgme.c:350 ../libbalsa/libbalsa-gpgme.c:472
+#: ../libbalsa/libbalsa-gpgme.c:564
 msgid "could not get data from stream"
 msgstr "не могу да добавим податке из тока"
 
-#: ../libbalsa/libbalsa-gpgme.c:264 ../libbalsa/rfc3156.c:390
-#: ../libbalsa/rfc3156.c:395 ../libbalsa/rfc3156.c:571
-#: ../libbalsa/rfc3156.c:577
+#: ../libbalsa/libbalsa-gpgme.c:262 ../libbalsa/rfc3156.c:388
+#: ../libbalsa/rfc3156.c:393 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
 msgid "signature verification failed"
 msgstr "провера потписа није успела"
 
-#: ../libbalsa/libbalsa-gpgme.c:360 ../libbalsa/libbalsa-gpgme.c:483
-#: ../libbalsa/libbalsa-gpgme.c:574
+#: ../libbalsa/libbalsa-gpgme.c:358 ../libbalsa/libbalsa-gpgme.c:481
+#: ../libbalsa/libbalsa-gpgme.c:572
 msgid "could not create new data object"
 msgstr "не могу да створим нови објекат података"
 
-#: ../libbalsa/libbalsa-gpgme.c:369
+#: ../libbalsa/libbalsa-gpgme.c:367
 msgid "signing failed"
 msgstr "потписивање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:442
+#: ../libbalsa/libbalsa-gpgme.c:440
 #, c-format
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "мешање потписивања и шифровања је одређено једино за РФЦ 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:510
+#: ../libbalsa/libbalsa-gpgme.c:508
 msgid "signing and encryption failed"
 msgstr "потписивање и шифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:512
+#: ../libbalsa/libbalsa-gpgme.c:510
 msgid "encryption failed"
 msgstr "шифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:584 ../libbalsa/rfc3156.c:470
-#: ../libbalsa/rfc3156.c:475
+#: ../libbalsa/libbalsa-gpgme.c:582 ../libbalsa/rfc3156.c:468
+#: ../libbalsa/rfc3156.c:473
 msgid "decryption failed"
 msgstr "дешифровање није успело"
 
-#: ../libbalsa/libbalsa-gpgme.c:691
+#: ../libbalsa/libbalsa-gpgme.c:689
 msgid "could not create context"
 msgstr "не могу да образујем контекст"
 
-#: ../libbalsa/libbalsa-gpgme.c:695
+#: ../libbalsa/libbalsa-gpgme.c:693
 #, c-format
-msgid "could not set protocol '%s'"
+#| msgid "could not set protocol '%s'"
+msgid "could not set protocol “%s”"
 msgstr "не могу да подесим протокол „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:758 ../libbalsa/libbalsa-gpgme.c:776
+#: ../libbalsa/libbalsa-gpgme.c:756 ../libbalsa/libbalsa-gpgme.c:774
 #, c-format
-msgid "could not list keys for \"%s\""
+#| msgid "could not list keys for \"%s\""
+msgid "could not list keys for “%s”"
 msgstr "не могу да побројим кључеве за „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:794
+#: ../libbalsa/libbalsa-gpgme.c:792
 #, c-format
 msgid ""
 "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
@@ -867,12 +879,12 @@ msgstr ""
 "%s: кључ за „%s“ је присутан, али је истекао, искључен, опозван или "
 "неисправан"
 
-#: ../libbalsa/libbalsa-gpgme.c:799
+#: ../libbalsa/libbalsa-gpgme.c:797
 #, c-format
 msgid "%s: could not find a key for %s"
 msgstr "%s: не могу да нађем кључ за %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:806
+#: ../libbalsa/libbalsa-gpgme.c:804
 #, c-format
 msgid ""
 "%s: a key with id %s is present, but it is expired, disabled, revoked or "
@@ -881,61 +893,92 @@ msgstr ""
 "%s: кључ са иб-ом %s је присутан, али је истекао, искључен, опозван или "
 "неисправан"
 
-#: ../libbalsa/libbalsa-gpgme.c:811
+#: ../libbalsa/libbalsa-gpgme.c:809
 #, c-format
 msgid "%s: could not find a key with id %s"
 msgstr "%s: не могу да нађем кључ са иб-ом %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:829
+#: ../libbalsa/libbalsa-gpgme.c:827
 #, c-format
 msgid "%s: multiple keys for %s"
 msgstr "%s: више кључева за %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:875
+#: ../libbalsa/libbalsa-gpgme.c:873
 #, c-format
-msgid "%s: insufficient validity for uid %s"
-msgstr "%s: недовољно ваљаности за уиб %s"
+#| msgid "%s: insufficient validity for uid %s"
+msgid "%s: insufficient validity for UID %s"
+msgstr "%s: недовољно ваљаности за УИБ %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:896 ../libbalsa/libbalsa-gpgme.c:910
+#: ../libbalsa/libbalsa-gpgme.c:894 ../libbalsa/libbalsa-gpgme.c:908
 #, c-format
-#| msgid "could not list keys for \"%s\""
 msgid "could not list keys"
 msgstr "не могу да побројим кључеве"
 
-#: ../libbalsa/libbalsa-conf.c:143
-msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+#: ../libbalsa/libbalsa-conf.c:141
+#| msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+msgid "Your Balsa configuration is now stored in “~/.balsa/config”."
 msgstr "Ваша подешавања Балсе су сада смештена у „~/.balsa/config“."
 
-#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:4468
+#: ../libbalsa/libbalsa-vfs.c:554 ../src/sendmsg-window.c:4481
 #, c-format
 msgid "not a regular file"
 msgstr "није обична датотека"
 
-#: ../libbalsa/libbalsa-vfs.c:608
+#: ../libbalsa/libbalsa-vfs.c:606
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "Не могу да покренем, недостаје програм"
 
-#: ../libbalsa/libbalsa-vfs.c:674
+#: ../libbalsa/libbalsa-vfs.c:672
 #, c-format
 msgid "Open with %s"
 msgstr "Отвори програмом „%s“"
 
-#: ../libbalsa/libbalsa-vfs.c:727
+#: ../libbalsa/libbalsa-vfs.c:725
 #, c-format
 msgid "Open _part with %s"
 msgstr "Прегледај _део помоћу „%s“"
 
-#: ../libbalsa/libbalsa.c:357
+#: ../libbalsa/libbalsa.c:366
 msgid "Invalid date"
 msgstr "Погрешан датум"
 
-#: ../libbalsa/libbalsa.c:374 ../src/pref-manager.c:1383
-#: ../src/pref-manager.c:1479
+#: ../libbalsa/libbalsa.c:383 ../src/pref-manager.c:1370
+#: ../src/pref-manager.c:1466
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../libbalsa/libbalsa.c:514
+#: ../libbalsa/libbalsa.c:525 ../libbalsa/libbalsa.c:630
+msgid "SSL/TLS certificate"
+msgstr "ССЛ/ТЛС уверење"
+
+#: ../libbalsa/libbalsa.c:529 ../libbalsa/libbalsa.c:634
+msgid "_Accept Once"
+msgstr "_Прихвати једном"
+
+#: ../libbalsa/libbalsa.c:530 ../libbalsa/libbalsa.c:635
+#| msgid "Accept&_Save"
+msgid "Accept & _Save"
+msgstr "Прихвати и _сачувај"
+
+#: ../libbalsa/libbalsa.c:531 ../libbalsa/libbalsa.c:636
+msgid "_Reject"
+msgstr "_Одбаци"
+
+#: ../libbalsa/libbalsa.c:541
+#, c-format
+#| msgid ""
+#| "Authenticity of this certificate could not be verified.\n"
+#| "<b>Reason:</b> %s\n"
+#| "<b>This certificate belongs to:</b>\n"
+msgid ""
+"<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
+"Reason: %s"
+msgstr ""
+"<big><b>Не могу да проверим веродостојност овог уверења.</b></big>\n"
+"<b>Разлог:</b> %s"
+
+#: ../libbalsa/libbalsa.c:588
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -946,7 +989,7 @@ msgstr ""
 "<b>Разлог:</b> %s\n"
 "<b>Ово уверење припада:</b>\n"
 
-#: ../libbalsa/libbalsa.c:526
+#: ../libbalsa/libbalsa.c:600
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -954,7 +997,7 @@ msgstr ""
 "\n"
 "<b>Ово уверење је издао:</b>\n"
 
-#: ../libbalsa/libbalsa.c:537
+#: ../libbalsa/libbalsa.c:611
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -967,107 +1010,93 @@ msgstr ""
 "до %s\n"
 "<b>Отисак:</b> %s"
 
-#: ../libbalsa/libbalsa.c:556
-msgid "SSL/TLS certificate"
-msgstr "ССЛ/ТЛС уверење"
-
-#: ../libbalsa/libbalsa.c:560
-msgid "_Accept Once"
-msgstr "_Прихвати једном"
-
-#: ../libbalsa/libbalsa.c:561
-msgid "Accept&_Save"
-msgstr "Прихвати и _сачувај"
-
-#: ../libbalsa/libbalsa.c:562
-msgid "_Reject"
-msgstr "_Одбаци"
-
-#: ../libbalsa/libbalsa.c:609
+#: ../libbalsa/libbalsa.c:685
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Веза са „%s“ је истекла. Да прекинем?"
 
-#: ../libbalsa/libbalsa.c:766
+#: ../libbalsa/libbalsa.c:842
 #, c-format
 msgid "No image data"
 msgstr "Нема слике"
 
-#: ../libbalsa/libbalsa.c:800
+#: ../libbalsa/libbalsa.c:876
 #, c-format
 msgid "Invalid input format"
 msgstr "Неисправан облик на улазу"
 
-#: ../libbalsa/libbalsa.c:804
+#: ../libbalsa/libbalsa.c:880
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Унутрашње прекорачење оставе"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:821
+#: ../libbalsa/libbalsa.c:897
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Неисправна X-сличица"
 
-#: ../libbalsa/mailbox.c:506
+#: ../libbalsa/mailbox.c:504
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Не могу да учитам сандуче „%s“"
 
-#: ../libbalsa/mailbox.c:513
+#: ../libbalsa/mailbox.c:511
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Не постоји ова врста сандучета: %s"
 
-#: ../libbalsa/mailbox.c:530
+#: ../libbalsa/mailbox.c:528
 #, c-format
-msgid "Bad local mailbox path \"%s\""
+#| msgid "Bad local mailbox path \"%s\""
+msgid "Bad local mailbox path “%s”"
 msgstr "Лоша путања месног сандучета „%s“"
 
-#: ../libbalsa/mailbox.c:535
+#: ../libbalsa/mailbox.c:533
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Нисам могао да створим сандуче врсте „%s“"
 
-#: ../libbalsa/mailbox.c:864
+#: ../libbalsa/mailbox.c:862
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Примењујем правила филтера на „%s“"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1027
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Умножавам из „%s“ у „%s“"
 
-#: ../libbalsa/mailbox.c:1959
+#: ../libbalsa/mailbox.c:1957
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "библбалса_сандуче_добави_поруку: сандуче „%s“ је затворено"
 
-#: ../libbalsa/mailbox.c:2164
+#: ../libbalsa/mailbox.c:2162
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Нисам успео да уклоним порука из сандучета извора"
 
-#: ../libbalsa/mailbox.c:2991
+#: ../libbalsa/mailbox.c:2989
 msgid "from unknown"
 msgstr "из непознатог"
 
-#: ../libbalsa/mailbox.c:2993
-msgid "Loading..."
-msgstr "Учитавам..."
+#: ../libbalsa/mailbox.c:2991
+#| msgid "Loading..."
+msgid "Loading…"
+msgstr "Учитавам…"
 
-#: ../libbalsa/mailbox.c:3962
+#: ../libbalsa/mailbox.c:3960
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Претражујем „%s“ за делимичним порукама"
 
-#: ../libbalsa/mailbox.c:4052
+#: ../libbalsa/mailbox.c:4050
 msgid "Reconstructing message"
 msgstr "Реконструишем поруку"
 
-#: ../libbalsa/mailbox.c:4312
+#: ../libbalsa/mailbox.c:4310
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Нисам успео да уклоним двоструке поруке из сандучета извора"
@@ -1075,37 +1104,40 @@ msgstr "Нисам успео да уклоним двоструке порук
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:615
-msgid "IMAP connection has been severed. Reconnecting..."
-msgstr "ИМАП веза је раскинута. Поново се повезујем..."
+#: ../libbalsa/mailbox_imap.c:613
+#| msgid "IMAP connection has been severed. Reconnecting..."
+msgid "IMAP connection has been severed. Reconnecting…"
+msgstr "ИМАП веза је раскинута. Поново се повезујем…"
 
-#: ../libbalsa/mailbox_imap.c:618
+#: ../libbalsa/mailbox_imap.c:616
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Грешка ИМАП протокола. Покушавам да укључим сређивање проблема."
 
-#: ../libbalsa/mailbox_imap.c:621
+#: ../libbalsa/mailbox_imap.c:619
 #, c-format
-msgid "IMAP server has shut the connection: %s Reconnecting..."
-msgstr "ИМАП сервер је угасио везу: %s Поново се повезујем..."
+#| msgid "IMAP server has shut the connection: %s Reconnecting..."
+msgid "IMAP server has shut the connection: %s Reconnecting…"
+msgstr "ИМАП сервер је угасио везу: %s Поново се повезујем…"
 
-#: ../libbalsa/mailbox_imap.c:633
+#: ../libbalsa/mailbox_imap.c:631
 #, c-format
-msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+#| msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+msgid "Async IMAP cmd %s could not be executed. Reconnecting…"
 msgstr ""
-"Неусклађена ИМАП наредба „%s“ не може бити извршена. Поново се повезујем..."
+"Неусклађена ИМАП наредба „%s“ не може бити извршена. Поново се повезујем…"
 
-#: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:505
-#: ../libbalsa/mailbox_mbox.c:739 ../libbalsa/mailbox_mh.c:541
+#: ../libbalsa/mailbox_imap.c:1122 ../libbalsa/mailbox_maildir.c:503
+#: ../libbalsa/mailbox_mbox.c:737 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Отварам %s Рефброј: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1211
+#: ../libbalsa/mailbox_imap.c:1209
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Преузимам %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1610
+#: ../libbalsa/mailbox_imap.c:1608
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1114,103 +1146,108 @@ msgstr ""
 "Наредба ПРЕТРАЖИ ИМАП није успела за сандуче „%s“\n"
 "враћам се на подразумевани начин претраге"
 
-#: ../libbalsa/mailbox_imap.c:1670
+#: ../libbalsa/mailbox_imap.c:1668
 #, c-format
-msgid "No path found for mailbox \"%s\", using \"%s\""
+#| msgid "No path found for mailbox \"%s\", using \"%s\""
+msgid "No path found for mailbox “%s”, using “%s”"
 msgstr "Нисам пронашао путању за сандуче „%s“, користим „%s“"
 
-#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
+#: ../libbalsa/mailbox_imap.c:1796 ../libbalsa/mailbox_imap.c:1837
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Не могу да добавим ИМАП управљање"
 
-#: ../libbalsa/mailbox_imap.c:2443 ../libbalsa/mailbox_imap.c:2509
+#: ../libbalsa/mailbox_imap.c:2441 ../libbalsa/mailbox_imap.c:2507
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Грешка довлачења поруке са ИМАП сервера: %s"
 
-#: ../libbalsa/mailbox_imap.c:2477
+#: ../libbalsa/mailbox_imap.c:2475
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Преузимам %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2521
+#: ../libbalsa/mailbox_imap.c:2519
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Не могу да направим привремену датотеку"
 
-#: ../libbalsa/mailbox_imap.c:2541
+#: ../libbalsa/mailbox_imap.c:2539
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Не могу да пишем у привремену датотеку „%s“"
 
-#: ../libbalsa/mailbox_imap.c:2770 ../libbalsa/mailbox_imap.c:2889
+#: ../libbalsa/mailbox_imap.c:2768 ../libbalsa/mailbox_imap.c:2887
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Шаљем %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:3192
+#: ../libbalsa/mailbox_imap.c:3190
 msgid "Server-side threading not supported."
 msgstr "Није подржано темачење са стране сервера."
 
-#: ../libbalsa/mailbox_local.c:566
+#: ../libbalsa/mailbox_local.c:564
 #, c-format
-msgid "Failed to save cache file \"%s\": %s."
+#| msgid "Failed to save cache file \"%s\": %s."
+msgid "Failed to save cache file “%s”: %s."
 msgstr "Нисам успео да сачувам датотеку оставе „%s“: %s."
 
-#: ../libbalsa/mailbox_local.c:600
+#: ../libbalsa/mailbox_local.c:598
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Биће направљена датотека оставе за сандуче „%s“"
 
-#: ../libbalsa/mailbox_local.c:609
+#: ../libbalsa/mailbox_local.c:607
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Нисам успео да прочитам датотеку оставе „%s“: %s"
 
-#: ../libbalsa/mailbox_local.c:627 ../libbalsa/mailbox_local.c:646
-#: ../libbalsa/mailbox_local.c:670
+#: ../libbalsa/mailbox_local.c:625 ../libbalsa/mailbox_local.c:644
+#: ../libbalsa/mailbox_local.c:668
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Биће поправљена датотека оставе за сандуче „%s“"
 
-#: ../libbalsa/mailbox_local.c:1243
+#: ../libbalsa/mailbox_local.c:1241
 #, c-format
 msgid "Filtering %s"
 msgstr "Разврставам %s"
 
-#: ../libbalsa/mailbox_local.c:1332
+#: ../libbalsa/mailbox_local.c:1330
 #, c-format
 msgid "Preparing %s"
 msgstr "Припремам %s"
 
-#: ../libbalsa/mailbox_local.c:2129
+#: ../libbalsa/mailbox_local.c:2131
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Нисам успео да отворим „%s“. Грешка број %d, "
 
-#: ../libbalsa/mailbox_local.c:2151
+#: ../libbalsa/mailbox_local.c:2153
 #, c-format
-msgid "Failed to sync mailbox \"%s\""
+#| msgid "Failed to sync mailbox \"%s\""
+msgid "Failed to sync mailbox “%s”"
 msgstr "Нисам успео да ускладим сандуче „%s“"
 
-#: ../libbalsa/mailbox_maildir.c:193
+#: ../libbalsa/mailbox_maildir.c:191
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Сандуче %s не изгледа као сандуче врсте „Maildir“."
 
-#: ../libbalsa/mailbox_maildir.c:202
+#: ../libbalsa/mailbox_maildir.c:200
 #, c-format
-msgid "Could not create a MailDir directory at %s (%s)"
+#| msgid "Could not create a MailDir directory at %s (%s)"
+msgid "Could not create a Maildir directory at %s (%s)"
 msgstr "Не могу да створим „MailDir“ директоријум у %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:210 ../libbalsa/mailbox_maildir.c:219
-#: ../libbalsa/mailbox_maildir.c:230
+#: ../libbalsa/mailbox_maildir.c:208 ../libbalsa/mailbox_maildir.c:217
+#: ../libbalsa/mailbox_maildir.c:228
 #, c-format
-msgid "Could not create a MailDir at %s (%s)"
+#| msgid "Could not create a MailDir at %s (%s)"
+msgid "Could not create a Maildir at %s (%s)"
 msgstr "Не могу да створим „MailDir“ у %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:337 ../libbalsa/mailbox_mh.c:291
+#: ../libbalsa/mailbox_maildir.c:335 ../libbalsa/mailbox_mh.c:289
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1219,8 +1256,8 @@ msgstr ""
 "Не могу да уклоним садржај %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:343 ../libbalsa/mailbox_mbox.c:316
-#: ../libbalsa/mailbox_mh.c:297
+#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mbox.c:314
+#: ../libbalsa/mailbox_mh.c:295
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1229,132 +1266,137 @@ msgstr ""
 "Не могу да уклоним %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:486 ../libbalsa/mailbox_mbox.c:686
-#: ../libbalsa/mailbox_mh.c:524
+#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:684
+#: ../libbalsa/mailbox_mh.c:522
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Сандуче не постоји."
 
-#: ../libbalsa/mailbox_maildir.c:926 ../libbalsa/mailbox_mbox.c:1970
-#: ../libbalsa/mailbox_mh.c:1104
+#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1968
+#: ../libbalsa/mailbox_mh.c:1102
 #, c-format
 msgid "Data copy error"
 msgstr "Грешка умножавања података"
 
-#: ../libbalsa/mailbox_mbox.c:201
+#: ../libbalsa/mailbox_mbox.c:199
 #, c-format
-msgid "Mailbox %s does not appear to be an Mbox mailbox."
+#| msgid "Mailbox %s does not appear to be an Mbox mailbox."
+msgid "Mailbox %s does not appear to be an mbox mailbox."
 msgstr "Сандуче „%s“ не изгледа као сандуче врсте „Mbox“."
 
-#: ../libbalsa/mailbox_mbox.c:419
+#: ../libbalsa/mailbox_mbox.c:417
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "Не могу да запишем датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:431
+#: ../libbalsa/mailbox_mbox.c:429
 #, c-format
-msgid "Failed to create temporary file \"%s\": %s"
+#| msgid "Failed to create temporary file \"%s\": %s"
+msgid "Failed to create temporary file “%s”: %s"
 msgstr "Нисам успео да направим привремену датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:443
+#: ../libbalsa/mailbox_mbox.c:441
 #, c-format
-msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+#| msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+msgid "Failed to save cache file “%s”: %s. New version saved as “%s”"
 msgstr ""
-"Нисам успео да сачувам датотеку оставе „%s“: %s.  Ново издање је сачувано "
-"као „%s“"
+"Нисам успео да сачувам датотеку оставе „%s“: %s. Ново издање је сачувано као "
+"„%s“"
 
-#: ../libbalsa/mailbox_mbox.c:451
+#: ../libbalsa/mailbox_mbox.c:449
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "Не могу да развежем датотеку „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:694
+#: ../libbalsa/mailbox_mbox.c:692
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Не могу да отворим сандуче."
 
-#: ../libbalsa/mailbox_mbox.c:706
+#: ../libbalsa/mailbox_mbox.c:704
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Сандуче није у „mbox“ запису."
 
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:712
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Не могу да закључам сандуче."
 
-#: ../libbalsa/mailbox_mbox.c:1926
+#: ../libbalsa/mailbox_mbox.c:1924
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: не могу да отворим %s."
 
-#: ../libbalsa/mailbox_mbox.c:1938
+#: ../libbalsa/mailbox_mbox.c:1936
 #, c-format
-msgid "%s: could not get new mime stream."
-msgstr "%s: не могу да добавим нови миме ток."
+#| msgid "%s: could not get new mime stream."
+msgid "%s: could not get new MIME stream."
+msgstr "%s: не могу да добавим нови МИМЕ ток."
 
-#: ../libbalsa/mailbox_mbox.c:1946
+#: ../libbalsa/mailbox_mbox.c:1944
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: „%s“ није у „mbox“ запису."
 
-#: ../libbalsa/mailbox_mh.c:172
+#: ../libbalsa/mailbox_mh.c:170
 #, c-format
-msgid "Mailbox %s does not appear to be a Mh mailbox."
+#| msgid "Mailbox %s does not appear to be a Mh mailbox."
+msgid "Mailbox %s does not appear to be an MH mailbox."
 msgstr "Сандуче „%s“ не изгледа као сандуче врсте „Mh“."
 
-#: ../libbalsa/mailbox_mh.c:182
+#: ../libbalsa/mailbox_mh.c:180
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Не могу да створим директоријум врсте „MH“ у %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:194
+#: ../libbalsa/mailbox_mh.c:192
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Не могу да створим структуру врсте „MH“ у %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1085
+#: ../libbalsa/mailbox_mh.c:1083
 #, c-format
 msgid "Cannot create message"
 msgstr "Не могу да направим поруку"
 
-#: ../libbalsa/mailbox_mh.c:1129
+#: ../libbalsa/mailbox_mh.c:1127
 #, c-format
 msgid "Message rename error"
 msgstr "Грешка преименовања поруке"
 
-#: ../libbalsa/mailbox_pop3.c:198
+#: ../libbalsa/mailbox_pop3.c:196
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Грешка прилагања поруке „%d“ из „%s“ у „%s“: %s"
 
-#: ../libbalsa/mailbox_pop3.c:347
+#: ../libbalsa/mailbox_pop3.c:345
 #, c-format
 msgid "Saving POP message to %s failed"
 msgstr "Нисам успео да сачувам ПОП поруку у „%s“"
 
-#: ../libbalsa/mailbox_pop3.c:354
+#: ../libbalsa/mailbox_pop3.c:352
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Преузимам поруку %d од %d"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox_pop3.c:377
+#: ../libbalsa/mailbox_pop3.c:375
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Примљено је %ld kB од %ld"
 
-#: ../libbalsa/mailbox_pop3.c:391
+#: ../libbalsa/mailbox_pop3.c:389
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "Нисам успео да сачувам ПОП поруку у „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:401
+#: ../libbalsa/mailbox_pop3.c:399
 #, c-format
 msgid "Transferring POP message to %s failed."
 msgstr "Нисам успео да пренесем ПОП поруку у „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:483
+#: ../libbalsa/mailbox_pop3.c:481
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -1363,107 +1405,126 @@ msgstr ""
 "Грешка привремене датотеке ПОП3 сандучета %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:508
+#: ../libbalsa/mailbox_pop3.c:506
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "Грешка ПОП3 сандучета %s: %s\n"
 
-#: ../libbalsa/mailbox_pop3.c:546
+#: ../libbalsa/mailbox_pop3.c:544
 #, c-format
-msgid "POP3 message %d oversized: %d kB - skipped."
+#| msgid "POP3 message %d oversized: %d kB - skipped."
+msgid "POP3 message %d oversized: %d kB — skipped."
 msgstr "Премашена је величина ПОП3 поруке „%d“: %d kB — прескачем."
 
-#: ../libbalsa/mailbox_pop3.c:558
+#: ../libbalsa/mailbox_pop3.c:556
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "ПОП3 грешка: не могу да отворим „%s“ ради уписа."
 
-#: ../libbalsa/mailbox_pop3.c:566
+#: ../libbalsa/mailbox_pop3.c:564
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "ПОП3 грешка: не могу да затворим „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:601
+#: ../libbalsa/mailbox_pop3.c:599
 #, c-format
 msgid "POP3 error: %s."
 msgstr "ПОП3 грешка: %s."
 
-#: ../libbalsa/message.c:617
+#: ../libbalsa/message.c:615
 #, c-format
-msgid "Mailbox (%s) is readonly: cannot change flags."
+#| msgid "Mailbox (%s) is readonly: cannot change flags."
+msgid "Mailbox (%s) is read-only: cannot change flags."
 msgstr "Сандуче (%s) је само за читање: не могу да изменим опције."
 
 #: ../libbalsa/misc.c:596
-msgid "west european"
-msgstr "западноевропски"
+#| msgid "west european"
+msgid "West European"
+msgstr "Западноевропски"
 
 #: ../libbalsa/misc.c:598 ../libbalsa/misc.c:632
-msgid "east european"
-msgstr "источноевропски"
+#| msgid "east european"
+msgid "East European"
+msgstr "Источноевропски"
 
 #: ../libbalsa/misc.c:600
-msgid "south european"
-msgstr "јужноевропски"
+#| msgid "south european"
+msgid "South European"
+msgstr "Јужноевропски"
 
 #: ../libbalsa/misc.c:602
-msgid "north european"
-msgstr "северноевропски"
+#| msgid "north european"
+msgid "North European"
+msgstr "Северноевропски"
 
 #: ../libbalsa/misc.c:604 ../libbalsa/misc.c:634
-msgid "cyrillic"
-msgstr "ћирилични"
+#| msgid "cyrillic"
+msgid "Cyrillic"
+msgstr "Ћирилични"
 
 #: ../libbalsa/misc.c:606 ../libbalsa/misc.c:640
-msgid "arabic"
-msgstr "арапски"
+#| msgid "arabic"
+msgid "Arabic"
+msgstr "Арапски"
 
 #: ../libbalsa/misc.c:608 ../libbalsa/misc.c:636
-msgid "greek"
-msgstr "грчки"
+#| msgid "_Greek"
+msgid "Greek"
+msgstr "Грчки"
 
 #: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
-msgid "hebrew"
-msgstr "хебрејски"
+#| msgid "_Hebrew"
+msgid "Hebrew"
+msgstr "Хебрејски"
 
 #: ../libbalsa/misc.c:612
-msgid "turkish"
-msgstr "турски"
+#| msgid "_Turkish"
+msgid "Turkish"
+msgstr "Турски"
 
 #: ../libbalsa/misc.c:614
-msgid "nordic"
-msgstr "нордијски"
+#| msgid "nordic"
+msgid "Nordic"
+msgstr "Нордијски"
 
 #: ../libbalsa/misc.c:616
-msgid "thai"
-msgstr "тајландски"
+msgid "Thai"
+msgstr "Тајландски"
 
 #: ../libbalsa/misc.c:618 ../libbalsa/misc.c:642
-msgid "baltic"
-msgstr "балтички"
+#| msgid "baltic"
+msgid "Baltic"
+msgstr "Балтички"
 
 #: ../libbalsa/misc.c:620
-msgid "celtic"
-msgstr "келтски"
+#| msgid "celtic"
+msgid "Celtic"
+msgstr "Келтски"
 
 #: ../libbalsa/misc.c:622
-msgid "west europe (euro)"
-msgstr "западноевропски (евро)"
+#| msgid "west europe (euro)"
+msgid "West European (euro)"
+msgstr "Западноевропски (евро)"
 
 #: ../libbalsa/misc.c:624
-msgid "russian"
-msgstr "руски"
+#| msgid "_Russian"
+msgid "Russian"
+msgstr "Руски"
 
 #: ../libbalsa/misc.c:626
-msgid "ukrainian"
-msgstr "украјински"
+#| msgid "_Ukrainian"
+msgid "Ukrainian"
+msgstr "Украјински"
 
 #: ../libbalsa/misc.c:628
-msgid "japanese"
-msgstr "јапански"
+#| msgid "japanese"
+msgid "Japanese"
+msgstr "Јапански"
 
 #: ../libbalsa/misc.c:630
-msgid "korean"
-msgstr "корејски"
+#| msgid "_Korean"
+msgid "Korean"
+msgstr "Корејски"
 
 #: ../libbalsa/misc.c:823
 #, c-format
@@ -1481,8 +1542,9 @@ msgstr "Време је истекло при покушају да постав
 
 #: ../libbalsa/misc.c:966
 #, c-format
-msgid "Waiting for fcntl lock... %d"
-msgstr "Чекам на катанац „fcntl“... %d"
+#| msgid "Waiting for fcntl lock... %d"
+msgid "Waiting for fcntl lock… %d"
+msgstr "Чекам на катанац „fcntl“… %d"
 
 #: ../libbalsa/misc.c:994
 msgid "Timeout exceeded while attempting flock lock!"
@@ -1490,189 +1552,190 @@ msgstr "Време је истекло при покушају да постав
 
 #: ../libbalsa/misc.c:1001
 #, c-format
-msgid "Waiting for flock attempt... %d"
-msgstr "Чекам на покушај закључавања „flock“... %d"
+#| msgid "Waiting for flock attempt... %d"
+msgid "Waiting for flock attempt… %d"
+msgstr "Чекам на покушај закључавања „flock“… %d"
 
 #: ../libbalsa/misc.c:1283
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "ЛДАП каталог за %s"
 
-#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:699 ../libbalsa/rfc2445.c:718
-#: ../libbalsa/rfc3156.c:720
+#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:697 ../libbalsa/rfc2445.c:716
+#: ../libbalsa/rfc3156.c:718
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libbalsa/rfc2445.c:91
+#: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "захтева радњу"
 
-#: ../libbalsa/rfc2445.c:92
+#: ../libbalsa/rfc2445.c:90
 msgid "accepted"
 msgstr "прихваћено"
 
-#: ../libbalsa/rfc2445.c:93
+#: ../libbalsa/rfc2445.c:91
 msgid "declined"
 msgstr "одбијено"
 
-#: ../libbalsa/rfc2445.c:94
+#: ../libbalsa/rfc2445.c:92
 msgid "tentatively accepted"
 msgstr "прихваћено с резервом"
 
-#: ../libbalsa/rfc2445.c:95
+#: ../libbalsa/rfc2445.c:93
 msgid "delegated"
 msgstr "изаслано"
 
-#: ../libbalsa/rfc2445.c:96
+#: ../libbalsa/rfc2445.c:94
 msgid "completed"
 msgstr "завршено"
 
-#: ../libbalsa/rfc2445.c:97
+#: ../libbalsa/rfc2445.c:95
 msgid "in process"
 msgstr "у току"
 
-#: ../libbalsa/rfc2445.c:700
+#: ../libbalsa/rfc2445.c:698
 msgid "Event Notification"
 msgstr "Обавештење догађаја"
 
-#: ../libbalsa/rfc2445.c:701
+#: ../libbalsa/rfc2445.c:699
 msgid "Event Request"
 msgstr "Захтев догађаја"
 
-#: ../libbalsa/rfc2445.c:702
+#: ../libbalsa/rfc2445.c:700
 msgid "Reply to Event Request"
 msgstr "Одговори на захтев догађаја"
 
-#: ../libbalsa/rfc2445.c:703
+#: ../libbalsa/rfc2445.c:701
 msgid "Event Cancellation"
 msgstr "Брисање догађаја"
 
-#: ../libbalsa/rfc2445.c:719
+#: ../libbalsa/rfc2445.c:717
 msgid "chair"
 msgstr "председник"
 
-#: ../libbalsa/rfc2445.c:720
+#: ../libbalsa/rfc2445.c:718
 msgid "required participant"
 msgstr "обавезан учесник"
 
-#: ../libbalsa/rfc2445.c:721
+#: ../libbalsa/rfc2445.c:719
 msgid "optional participant"
 msgstr "могући учесник"
 
-#: ../libbalsa/rfc2445.c:722
+#: ../libbalsa/rfc2445.c:720
 msgid "non-participant, information only"
 msgstr "не-учествујући, само податак"
 
-#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
+#: ../libbalsa/rfc3156.c:624 ../libbalsa/rfc3156.c:631
 msgid "decryption and signature verification failed"
 msgstr "није успело дешифровање и провера потписа"
 
-#: ../libbalsa/rfc3156.c:659
+#: ../libbalsa/rfc3156.c:657
 msgid "The signature is valid."
 msgstr "Потпис је исправан."
 
-#: ../libbalsa/rfc3156.c:661
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid but expired."
 msgstr "Потпис је исправан али је истекао."
 
-#: ../libbalsa/rfc3156.c:664
+#: ../libbalsa/rfc3156.c:662
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr "Потпис је исправан али је кључ за потврду потписа истекао."
 
-#: ../libbalsa/rfc3156.c:667
+#: ../libbalsa/rfc3156.c:665
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
 msgstr "Потпис је исправан али је кључ за потврду потписа повучен."
 
-#: ../libbalsa/rfc3156.c:670
+#: ../libbalsa/rfc3156.c:668
 msgid "The signature is invalid."
 msgstr "Потпис није исправан."
 
-#: ../libbalsa/rfc3156.c:673
+#: ../libbalsa/rfc3156.c:671
 msgid "The signature could not be verified due to a missing key."
 msgstr "Потпис није могао да буде проверен због непостојања кључа."
 
-#: ../libbalsa/rfc3156.c:675
+#: ../libbalsa/rfc3156.c:673
 msgid "This part is not a real PGP signature."
 msgstr "Овај део није прави ПГП потпис."
 
-#: ../libbalsa/rfc3156.c:678
+#: ../libbalsa/rfc3156.c:676
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
 "Потпис није могао да буде проверен због неисправног механизма шифровања."
 
-#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1048
+#: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:1046
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "ГнуПГ поново изграђује базу повереника и тренутно је недоступан."
 
-#: ../libbalsa/rfc3156.c:687
+#: ../libbalsa/rfc3156.c:685
 msgid "An error prevented the signature verification."
 msgstr "Грешка је спречила проверу потписа."
 
-#: ../libbalsa/rfc3156.c:698
+#: ../libbalsa/rfc3156.c:696
 msgid "The user ID is of unknown validity."
 msgstr "Кориснички ИБ је непознате исправности."
 
-#: ../libbalsa/rfc3156.c:700
+#: ../libbalsa/rfc3156.c:698
 msgid "The validity of the user ID is undefined."
 msgstr "Исправност корисничког ИБ-а није одређена."
 
-#: ../libbalsa/rfc3156.c:702
+#: ../libbalsa/rfc3156.c:700
 msgid "The user ID is never valid."
 msgstr "Кориснички ИБ никада није исправан."
 
-#: ../libbalsa/rfc3156.c:704
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is marginally valid."
 msgstr "Кориснички ИБ је делом исправан."
 
-#: ../libbalsa/rfc3156.c:706
+#: ../libbalsa/rfc3156.c:704
 msgid "The user ID is fully valid."
 msgstr "Кориснички ИБ је у потпуности исправан."
 
-#: ../libbalsa/rfc3156.c:708
+#: ../libbalsa/rfc3156.c:706
 msgid "The user ID is ultimately valid."
 msgstr "Кориснички ИБ је увек исправан."
 
-#: ../libbalsa/rfc3156.c:710 ../libbalsa/rfc3156.c:732
+#: ../libbalsa/rfc3156.c:708 ../libbalsa/rfc3156.c:730
 msgid "bad validity"
 msgstr "лоша исправност"
 
-#: ../libbalsa/rfc3156.c:722
+#: ../libbalsa/rfc3156.c:720
 msgid "undefined"
 msgstr "неодређено"
 
-#: ../libbalsa/rfc3156.c:724 ../libbalsa/rfc3156.c:759
+#: ../libbalsa/rfc3156.c:722 ../libbalsa/rfc3156.c:757
 #: ../src/address-book-config.c:197
 msgid "never"
 msgstr "никад"
 
-#: ../libbalsa/rfc3156.c:726
+#: ../libbalsa/rfc3156.c:724
 msgid "marginal"
 msgstr "делом"
 
-#: ../libbalsa/rfc3156.c:728
+#: ../libbalsa/rfc3156.c:726
 msgid "full"
 msgstr "потпуно"
 
-#: ../libbalsa/rfc3156.c:730
+#: ../libbalsa/rfc3156.c:728
 msgid "ultimate"
 msgstr "увек"
 
-#: ../libbalsa/rfc3156.c:742
+#: ../libbalsa/rfc3156.c:740
 msgid "PGP signature: "
 msgstr "ПГП потпис: "
 
-#: ../libbalsa/rfc3156.c:744
+#: ../libbalsa/rfc3156.c:742
 msgid "S/MIME signature: "
 msgstr "С/МИМЕ потпис: "
 
-#: ../libbalsa/rfc3156.c:746
+#: ../libbalsa/rfc3156.c:744
 msgid "(unknown protocol) "
 msgstr "(непознат протокол) "
 
-#: ../libbalsa/rfc3156.c:776
+#: ../libbalsa/rfc3156.c:774
 #, c-format
 msgid ""
 "\n"
@@ -1681,7 +1744,7 @@ msgstr ""
 "\n"
 "Исправност потписа: %s"
 
-#: ../libbalsa/rfc3156.c:779
+#: ../libbalsa/rfc3156.c:777
 #, c-format
 msgid ""
 "\n"
@@ -1690,7 +1753,7 @@ msgstr ""
 "\n"
 "Потписан: %s"
 
-#: ../libbalsa/rfc3156.c:781
+#: ../libbalsa/rfc3156.c:779
 #, c-format
 msgid ""
 "\n"
@@ -1699,7 +1762,7 @@ msgstr ""
 "\n"
 "Веровање кључу власника: %s"
 
-#: ../libbalsa/rfc3156.c:785
+#: ../libbalsa/rfc3156.c:783
 #, c-format
 msgid ""
 "\n"
@@ -1708,15 +1771,18 @@ msgstr ""
 "\n"
 "Отисак кључа: %s"
 
-#: ../libbalsa/rfc3156.c:799
+#: ../libbalsa/rfc3156.c:797
+#| msgid ""
+#| "\n"
+#| "User ID's:"
 msgid ""
 "\n"
-"User ID's:"
+"User IDs:"
 msgstr ""
 "\n"
 "ИБ корисника:"
 
-#: ../libbalsa/rfc3156.c:802
+#: ../libbalsa/rfc3156.c:800
 msgid ""
 "\n"
 "User ID:"
@@ -1724,15 +1790,15 @@ msgstr ""
 "\n"
 "ИБ корисника:"
 
-#: ../libbalsa/rfc3156.c:813
+#: ../libbalsa/rfc3156.c:811
 msgid " [Revoked]"
 msgstr " [Повучен]"
 
-#: ../libbalsa/rfc3156.c:815
+#: ../libbalsa/rfc3156.c:813
 msgid " [Invalid]"
 msgstr " [Неисправан]"
 
-#: ../libbalsa/rfc3156.c:842
+#: ../libbalsa/rfc3156.c:840
 #, c-format
 msgid ""
 "\n"
@@ -1741,7 +1807,7 @@ msgstr ""
 "\n"
 "Подкључ је створен: %s"
 
-#: ../libbalsa/rfc3156.c:844
+#: ../libbalsa/rfc3156.c:842
 #, c-format
 msgid ""
 "\n"
@@ -1750,25 +1816,25 @@ msgstr ""
 "\n"
 "Подкључ истиче: %s"
 
-#: ../libbalsa/rfc3156.c:853
+#: ../libbalsa/rfc3156.c:851
 msgid " revoked"
 msgstr " повучен"
 
-#: ../libbalsa/rfc3156.c:858
+#: ../libbalsa/rfc3156.c:856
 msgid " expired"
 msgstr " истекао"
 
-#: ../libbalsa/rfc3156.c:863
+#: ../libbalsa/rfc3156.c:861
 msgid " disabled"
 msgstr " искључен"
 
-#: ../libbalsa/rfc3156.c:868
+#: ../libbalsa/rfc3156.c:866
 msgid " invalid"
 msgstr " неисправан"
 
 #. ngettext: string begins with a single space, so no space
 #. * after the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:872
+#: ../libbalsa/rfc3156.c:870
 #, c-format
 msgid ""
 "\n"
@@ -1789,7 +1855,7 @@ msgstr[3] ""
 "\n"
 "Особина подкључа:%s"
 
-#: ../libbalsa/rfc3156.c:884
+#: ../libbalsa/rfc3156.c:882
 #, c-format
 msgid ""
 "\n"
@@ -1798,7 +1864,7 @@ msgstr ""
 "\n"
 "Издавач: %s"
 
-#: ../libbalsa/rfc3156.c:888
+#: ../libbalsa/rfc3156.c:886
 #, c-format
 msgid ""
 "\n"
@@ -1807,7 +1873,7 @@ msgstr ""
 "\n"
 "Серијски број издавача: %s"
 
-#: ../libbalsa/rfc3156.c:891
+#: ../libbalsa/rfc3156.c:889
 #, c-format
 msgid ""
 "\n"
@@ -1816,12 +1882,12 @@ msgstr ""
 "\n"
 "ИБ ланца: %s"
 
-#: ../libbalsa/rfc3156.c:950
+#: ../libbalsa/rfc3156.c:948
 #, c-format
 msgid "Could not launch %s to query the public key %s."
 msgstr "Не могу да покренем „%s“ да бих пропитао јавни кључ „%s“."
 
-#: ../libbalsa/rfc3156.c:1000
+#: ../libbalsa/rfc3156.c:998
 #, c-format
 msgid ""
 "Running %s failed with return value %d:\n"
@@ -1830,7 +1896,7 @@ msgstr ""
 "Покретање „%s“ није успело са повратном вредношћу „%d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1007
+#: ../libbalsa/rfc3156.c:1005
 #, c-format
 msgid ""
 "Running %s successful:\n"
@@ -1839,132 +1905,90 @@ msgstr ""
 "Покретање „%s“ је успело:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1049
+#: ../libbalsa/rfc3156.c:1047
 msgid "Try again later."
 msgstr "Покушајте касније."
 
-#: ../libbalsa/send.c:248 ../libbalsa/send.c:255
-msgid "Sending Mail..."
-msgstr "Шаљем пошту..."
-
-#: ../libbalsa/send.c:252 ../src/main-window.c:3257
-msgid "_Hide"
-msgstr "_Сакриј"
-
-#: ../libbalsa/send.c:961
+#: ../libbalsa/rfc6350.c:62
 #, c-format
-msgid ""
-"Could not send the message to %s:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
-msgstr ""
-"Не могу да пошаљем поруку за %s:\n"
-"%d: %s\n"
-"Порука је задржана у сандучету „Одлазна“.\n"
+msgid "malformed card, BEGIN:VCARD expected"
+msgstr "лоша картица, очекивано је „BEGIN:VCARD“"
 
-#: ../libbalsa/send.c:1007
+#: ../libbalsa/rfc6350.c:100
 #, c-format
-msgid "Saving sent message to %s failed: %s"
-msgstr "Нисам успео да сачувам послату поруку у „%s“: %s"
+msgid "malformed card, END:VCARD missing"
+msgstr "лоша картица, недостаје „END:VCARD“"
 
-#: ../libbalsa/send.c:1037 ../libbalsa/send.c:1049
+#: ../libbalsa/rfc6350.c:259
 #, c-format
-msgid ""
-"Relaying refused:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
-msgstr ""
-"Прослеђивање је одбијено:\n"
-"%d: %s\n"
-"Порука је остала у одлазној пошти.\n"
+msgid "malformed line “%s”, missing “:”"
+msgstr "лош ред „%s“, недостаје „:“"
 
-#: ../libbalsa/send.c:1056
-msgid ""
-"Message submission problem, placing it into your outbox.\n"
-"System will attempt to resubmit the message until you delete it."
-msgstr ""
-"Проблем са слањем поруке, смештам је у „Одлазну“.\n"
-"Систем ће покушавати са поновним слањем поруке све док је не обришете."
+#: ../libbalsa/rfc6350.c:270
+#, c-format
+msgid "malformed line “%s”, empty name or value"
+msgstr "лош ред „%s“, празан назив или вредност"
 
-#: ../libbalsa/send.c:1085
-msgid "Connected to MTA"
-msgstr "Повезан сам на АПП"
+#: ../libbalsa/send.c:204 ../libbalsa/send.c:211
+#| msgid "Sending Mail..."
+msgid "Sending Mail…"
+msgstr "Шаљем пошту…"
 
-#. status code, mailbox
-#: ../libbalsa/send.c:1094
-#, c-format
-msgid "From: %d <%s>"
-msgstr "Шаље: %d <%s>"
+#: ../libbalsa/send.c:208 ../src/main-window.c:3254
+msgid "_Hide"
+msgstr "_Сакриј"
 
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1098
+#: ../libbalsa/send.c:797
 #, c-format
-msgid "From %s: %d %s"
-msgstr "Шаље %s: %d %s"
+#| msgid "Connected to MTA"
+msgid "Connected to MTA %s: %s"
+msgstr "Повезан сам на МТА „%s“: %s"
 
-#. status code, mailbox
-#: ../libbalsa/send.c:1109
+#: ../libbalsa/send.c:830
 #, c-format
-msgid "To: %d <%s>"
-msgstr "Прима: %d <%s>"
+msgid "Saving sent message to %s failed: %s"
+msgstr "Нисам успео да сачувам послату поруку у „%s“: %s"
 
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1113
+#: ../libbalsa/send.c:847
 #, c-format
-msgid "To %s: %d %s"
-msgstr "Прима %s: %d %s"
-
-#: ../libbalsa/send.c:1151
-msgid "Disconnected"
-msgstr "Неповезан"
-
-#: ../libbalsa/send.c:1382
-msgid ""
-"SMTP server refused connection.\n"
-"Check your internet connection."
-msgstr ""
-"СМТП сервер је одбио везу.\n"
-"Проверите вашу интернет везу."
-
-#: ../libbalsa/send.c:1387
+#| msgid ""
+#| "Relaying refused:\n"
+#| "%d: %s\n"
+#| "Message left in your outbox.\n"
 msgid ""
-"SMTP server cannot be reached.\n"
-"Check your internet connection."
+"Sending message failed: %s\n"
+"Message left in your outbox."
 msgstr ""
-"СМТП сервер не може бити приступљен.\n"
-"Проверите вашу интернет везу."
-
-#: ../libbalsa/send.c:1396
-msgid "Message left in Outbox (try again later)"
-msgstr "Остала је порука у сандучету (покушајте касније)"
+"Слање поруке није успело: %s\n"
+"Порука је остала у одлазној пошти."
 
-#: ../libbalsa/send.c:1400
+#: ../libbalsa/send.c:857
 #, c-format
-msgid ""
-"SMTP server problem (%d): %s\n"
-"Message is left in outbox."
-msgstr ""
-"Проблем СМТП сервера (%d): %s\n"
-"Порука је остала у одлазном."
+#| msgid "Scanning of %s failed: %s"
+msgid "Connecting MTA %s (%s) failed: %s"
+msgstr "Повезивање МТА „%s“ (%s) није успело: %s"
 
-#: ../libbalsa/send.c:1706 ../libbalsa/send.c:1775
+#: ../libbalsa/send.c:1018 ../libbalsa/send.c:1087
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Не могу да прочитам %s: %s"
 
-#: ../libbalsa/send.c:1709 ../libbalsa/send.c:1778
+#: ../libbalsa/send.c:1021 ../libbalsa/send.c:1090
 #, c-format
 msgid "Cannot read %s"
 msgstr "Не могу да прочитам „%s“"
 
-#: ../libbalsa/send.c:1739
+#: ../libbalsa/send.c:1051
 #, c-format
-msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
+#| msgid ""
+#| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
+msgid ""
+"Cannot determine character set for text file “%s”; sending as MIME type “%s”"
 msgstr ""
-"Не могу да одредим знаковни скуп за текстуалну датотеку „%s“; шаљем као миме "
+"Не могу да одредим знаковни скуп за текстуалну датотеку „%s“; шаљем као МИМЕ "
 "врсту „%s“"
 
-#: ../libbalsa/send.c:2114
+#: ../libbalsa/send.c:1469
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Ова порука неће бити шифрована за невидљиву копију: прималац."
@@ -1972,123 +1996,131 @@ msgstr[1] "Ова порука неће бити шифрована за нев
 msgstr[2] "Ова порука неће бити шифрована за невидљиву копију: примаоци."
 msgstr[3] "Ова порука неће бити шифрована за невидљиву копију: прималац."
 
-#: ../libbalsa/send.c:2202
+#: ../libbalsa/send.c:1557
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Ова порука неће бити шифрована за невидљиву копију: прималац(оци)."
 
 #. host, authentication method
-#: ../libbalsa/server.c:496
+#: ../libbalsa/server.c:501
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Пријављујем се на „%s“ користећи %s"
 
-#: ../libbalsa/smtp-server.c:383 ../src/mailbox-conf.c:205
-#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:391
-#: ../src/pref-manager.c:3334
-msgid "Never"
-msgstr "Никад"
+#: ../libbalsa/smtp-server.c:298
+msgid "SMTP over SSL (SMTPS)"
+msgstr "СМТП преко ССЛ-а (СМТПС)"
 
-#: ../libbalsa/smtp-server.c:385 ../src/mailbox-conf.c:206
-#: ../src/mailbox-conf.c:1440
-msgid "If Possible"
-msgstr "Ако је могуће"
+#: ../libbalsa/smtp-server.c:299
+#| msgid "Required"
+msgid "TLS required"
+msgstr "ТЛС је потребно"
 
-#: ../libbalsa/smtp-server.c:387 ../src/mailbox-conf.c:207
-msgid "Required"
-msgstr "Увек"
+#: ../libbalsa/smtp-server.c:300
+msgid "TLS if possible (not recommended)"
+msgstr "ТЛС ако је могуће (не препоручује се)"
 
-#: ../libbalsa/smtp-server.c:423
+#: ../libbalsa/smtp-server.c:301
+msgid "None (not recommended)"
+msgstr "Ништа (не препоручује се)"
+
+#: ../libbalsa/smtp-server.c:324
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Грешка приказивања помоћи сервера: %s\n"
 
-#: ../libbalsa/smtp-server.c:538
+#: ../libbalsa/smtp-server.c:425
 msgid "SMTP Server"
 msgstr "СМТП сервер"
 
-#: ../libbalsa/smtp-server.c:566
+#: ../libbalsa/smtp-server.c:453
 msgid "_Descriptive Name:"
 msgstr "Описни _назив:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:573 ../src/folder-conf.c:380
-#: ../src/mailbox-conf.c:1188 ../src/mailbox-conf.c:1303
+#: ../libbalsa/smtp-server.c:460 ../src/folder-conf.c:377
+#: ../src/mailbox-conf.c:1186 ../src/mailbox-conf.c:1301
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../libbalsa/smtp-server.c:580
+#: ../libbalsa/smtp-server.c:467
 msgid "_User Name:"
 msgstr "_Корисничко име:"
 
-#: ../libbalsa/smtp-server.c:587
+#: ../libbalsa/smtp-server.c:474
 msgid "_Pass Phrase:"
 msgstr "_Лозинка:"
 
-#: ../libbalsa/smtp-server.c:596 ../src/mailbox-conf.c:227
-msgid "Use _TLS:"
-msgstr "Користи _ТЛС:"
+#: ../libbalsa/smtp-server.c:482
+#| msgid "Security"
+msgid "Se_curity:"
+msgstr "_Безбедност:"
 
-#: ../libbalsa/smtp-server.c:601
+#: ../libbalsa/smtp-server.c:487
 msgid "C_ertificate Pass Phrase:"
 msgstr "Лозинка _уверења:"
 
-#: ../libbalsa/smtp-server.c:613
+#: ../libbalsa/smtp-server.c:498
 msgid "Sp_lit message larger than"
 msgstr "_Подели поруке веће од"
 
-#: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1897
+#: ../libbalsa/smtp-server.c:503 ../src/pref-manager.c:1880
 msgid "MB"
 msgstr "MB"
 
-#: ../libbalsa/source-viewer.c:130
+#: ../libbalsa/source-viewer.c:128
 msgid "Mailbox closed"
 msgstr "Сандуче је затворено"
 
-#: ../libbalsa/source-viewer.c:235
+#: ../libbalsa/source-viewer.c:238
 msgid "Message Source"
 msgstr "Извор поруке"
 
-#: ../libbalsa/source-viewer.c:247 ../src/main-window.c:2062
-#: ../src/message-window.c:847
+#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2059
+#: ../src/message-window.c:848
 #, c-format
 msgid "Error adding from %s: %s\n"
 msgstr "Грешка додавања из „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:68
+#: ../libinit_balsa/assistant_helper.c:66
 #, c-format
 msgid "Error loading %s: %s\n"
 msgstr "Грешка учитавања „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:203
+#: ../libinit_balsa/assistant_helper.c:201
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
 msgstr ""
 "Путања „%s“ мора да се односи на корен система датотека (почните са /)."
 
-#: ../libinit_balsa/assistant_helper.c:215
+#: ../libinit_balsa/assistant_helper.c:213
 #, c-format
+#| msgid ""
+#| "Couldn't create a directory: mkdir() failed on pathname \"%s\", with "
+#| "error \"%s\"."
 msgid ""
-"Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
-"\"%s\"."
+"Couldn’t create a directory: mkdir() failed on pathname “%s”, with error "
+"“%s”."
 msgstr ""
 "Не могу да створим директоријум: није успела функција „mkdir()“ за назив "
 "путање „%s“, са грешком „%s“."
 
-#: ../libinit_balsa/assistant_helper.c:227
-#: ../libinit_balsa/assistant_helper.c:250
+#: ../libinit_balsa/assistant_helper.c:225
+#: ../libinit_balsa/assistant_helper.c:248
 #, c-format
-msgid "The file with pathname \"%s\" is not a directory."
+#| msgid "The file with pathname \"%s\" is not a directory."
+msgid "The file with pathname “%s” is not a directory."
 msgstr "Датотека са називом путање „%s“ није директоријум."
 
-#: ../libinit_balsa/assistant_helper.c:241
+#: ../libinit_balsa/assistant_helper.c:239
 #, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgid "Couldn’t create a directory: mkdir() failed on pathname “%s”."
 msgstr ""
 "Не могу да створим директоријум: није успела функција „mkdir()“ за назив "
 "путање „%s“."
 
-#: ../libinit_balsa/assistant_init.c:51
+#: ../libinit_balsa/assistant_init.c:49
 msgid ""
 "This will exit Balsa.\n"
 "Do you really want to do this?"
@@ -2096,86 +2128,93 @@ msgstr ""
 "Овим ће се изаћи из Балсе.\n"
 "Да ли заиста желите то да урадите?"
 
-#: ../libinit_balsa/assistant_init.c:71
+#: ../libinit_balsa/assistant_init.c:69
 msgid "GnomeCard Address Book"
 msgstr "Адресар Гномове картице"
 
-#: ../libinit_balsa/assistant_init.c:78 ../libinit_balsa/assistant_init.c:86
-#: ../src/ab-window.c:235
+#: ../libinit_balsa/assistant_init.c:76 ../libinit_balsa/assistant_init.c:84
+#: ../src/ab-window.c:243
 msgid "Address Book"
 msgstr "Адресар"
 
-#: ../libinit_balsa/assistant_init.c:139
+#: ../libinit_balsa/assistant_init.c:137
 msgid "Configure Balsa"
 msgstr "Подесите Балсу"
 
-#: ../libinit_balsa/assistant_page_defclient.c:56
+#: ../libinit_balsa/assistant_page_defclient.c:54
 msgid "Use Balsa as default email client?"
 msgstr "Да користим Балсу као основни програм за пошту?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:60
+#: ../libinit_balsa/assistant_page_defclient.c:58
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../libinit_balsa/assistant_page_defclient.c:62
+#: ../libinit_balsa/assistant_page_defclient.c:60
 msgid "_No"
 msgstr "_Не"
 
-#: ../libinit_balsa/assistant_page_defclient.c:96
+#: ../libinit_balsa/assistant_page_defclient.c:94
 msgid "Default Client"
 msgstr "Основни програм"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Inbox:"
 msgstr "_Долазна:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Outbox:"
 msgstr "_Одлазна:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Sentbox:"
 msgstr "_Послане:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Draftbox:"
 msgstr "_Скице:"
 
-#: ../libinit_balsa/assistant_page_directory.c:51
+#: ../libinit_balsa/assistant_page_directory.c:49
 msgid "_Trash:"
 msgstr "Сме_ће:"
 
-#: ../libinit_balsa/assistant_page_directory.c:85
+#: ../libinit_balsa/assistant_page_directory.c:83
 #, c-format
+#| msgid ""
+#| "The pathname \"%s\" must be specified canonically -- it must start with a "
+#| "'/'."
 msgid ""
-"The pathname \"%s\" must be specified canonically -- it must start with a "
-"'/'."
+"The pathname “%s” must be specified canonically — it must start with a “/”."
 msgstr "Путања „%s“ мора да буде задана у потпуности – мора да почиње са „/“."
 
-#: ../libinit_balsa/assistant_page_directory.c:125
+#: ../libinit_balsa/assistant_page_directory.c:123
 #, c-format
-msgid "Could not create mailbox at path \"%s\"\n"
+#| msgid "Could not create mailbox at path \"%s\"\n"
+msgid "Could not create mailbox at path “%s”\n"
 msgstr "Не могу да направим сандуче на путањи „%s“\n"
 
-#: ../libinit_balsa/assistant_page_directory.c:157
+#: ../libinit_balsa/assistant_page_directory.c:155
 #, c-format
-msgid "The mailbox \"%s\" does not appear to be valid."
+#| msgid "The mailbox \"%s\" does not appear to be valid."
+msgid "The mailbox “%s” does not appear to be valid."
 msgstr "Сандуче „%s“ не изгледа исправно."
 
-#: ../libinit_balsa/assistant_page_directory.c:191
+#: ../libinit_balsa/assistant_page_directory.c:189
 #, c-format
+#| msgid ""
+#| "Problem verifying path \"%s\":\n"
+#| "%s"
 msgid ""
-"Problem verifying path \"%s\":\n"
+"Problem verifying path “%s”:\n"
 "%s"
 msgstr ""
 "Проблем провере путање „%s“:\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_directory.c:224
+#: ../libinit_balsa/assistant_page_directory.c:222
 msgid "_Verify locations"
 msgstr "_Провери места"
 
-#: ../libinit_balsa/assistant_page_directory.c:258
+#: ../libinit_balsa/assistant_page_directory.c:256
 msgid ""
 "Please verify the locations of your default mail files. These will be "
 "created if necessary."
@@ -2183,100 +2222,108 @@ msgstr ""
 "Молим проверите места ваших основних датотека поште. Оне ће бити створене по "
 "потреби."
 
-#: ../libinit_balsa/assistant_page_directory.c:322
+#: ../libinit_balsa/assistant_page_directory.c:320
 msgid "Mail Files"
 msgstr "Датотеке поште"
 
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
+#| msgid ""
+#| "You've successfully set up Balsa. Have fun!\n"
+#| "   -- The Balsa development team"
 msgid ""
-"You've successfully set up Balsa. Have fun!\n"
+"You’ve successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
 msgstr ""
 "Успешно сте подесили Балсу. Забавите се!\n"
 "   — Развојна екипа Балсе"
 
-#: ../libinit_balsa/assistant_page_finish.c:49
+#: ../libinit_balsa/assistant_page_finish.c:47
 msgid "All Done!"
 msgstr "Све је урађено!"
 
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
+#| msgid ""
+#| "The following settings are also needed (and you can find them later, if "
+#| "need be, in the Email application in the 'Preferences' and 'Identities' "
+#| "menu items)"
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
-"be, in the Email application in the 'Preferences' and 'Identities' menu "
+"be, in the Email application in the “Preferences” and “Identities” menu "
 "items)"
 msgstr ""
 "Следећа подешавања су такође потребна (можете их пронаћи касније, ако буде "
-"било потребно, у програму ел-поште у ставкама изборника „Поставке“ и "
+"било потребно, у програму е-поште у ставкама изборника „Поставке“ и "
 "„Личности“)"
 
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
 "have set this up for you):"
 msgstr ""
-" Ко вам обезбеђује налог ел-поште треба да буде у могућности да вам да "
+" Ко вам обезбеђује налог е-поште треба да буде у могућности да вам да "
 "следеће податке (ако имате администратора мреже, можда је он ово већ "
 "подесио):"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "Yes, remember it"
 msgstr "Да, запамти је"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "No, type it in every time"
 msgstr "Не, упиши је сваки пут"
 
-#: ../libinit_balsa/assistant_page_user.c:103
+#: ../libinit_balsa/assistant_page_user.c:99
 msgid "Name of mail server for incoming _mail:"
 msgstr "Назив сервера поште за долазну _пошту:"
 
-#: ../libinit_balsa/assistant_page_user.c:108
+#: ../libinit_balsa/assistant_page_user.c:104
 msgid "_Type of mail server:"
 msgstr "_Врста сервера поште:"
 
-#: ../libinit_balsa/assistant_page_user.c:112
+#: ../libinit_balsa/assistant_page_user.c:108
 msgid "Connect using _SSL:"
 msgstr "Повежи се користећи _ССЛ:"
 
-#: ../libinit_balsa/assistant_page_user.c:115
+#: ../libinit_balsa/assistant_page_user.c:111
 msgid "Your email _login name:"
 msgstr "Ваше име за _пријављивање:"
 
-#: ../libinit_balsa/assistant_page_user.c:118
+#: ../libinit_balsa/assistant_page_user.c:114
 msgid "Your _password:"
 msgstr "Ваша _лозинка:"
 
-#: ../libinit_balsa/assistant_page_user.c:126
+#: ../libinit_balsa/assistant_page_user.c:121
 msgid "_SMTP Server:"
 msgstr "_СМТП сервер:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:131
+#: ../libinit_balsa/assistant_page_user.c:125
 msgid "Your real _name:"
 msgstr "Ваше право _име:"
 
-#: ../libinit_balsa/assistant_page_user.c:137
-msgid "Your _Email Address, for this email account:"
-msgstr "Ваша адреса _ел-поште, за овај налог:"
+#: ../libinit_balsa/assistant_page_user.c:131
+#| msgid "Your _Email Address, for this email account:"
+msgid "Your _email address for this email account:"
+msgstr "Ваша адреса _е-поште, за овај налог:"
 
-#: ../libinit_balsa/assistant_page_user.c:142
+#: ../libinit_balsa/assistant_page_user.c:136
 msgid "_Remember your password:"
 msgstr "_Запамтите вашу лозинку:"
 
-#: ../libinit_balsa/assistant_page_user.c:147
+#: ../libinit_balsa/assistant_page_user.c:141
 msgid "_Local mail directory:"
 msgstr "_Месни директоријум поште:"
 
-#: ../libinit_balsa/assistant_page_user.c:165
+#: ../libinit_balsa/assistant_page_user.c:159
 msgid "User Settings"
 msgstr "Корисничка подешавања"
 
-#: ../libinit_balsa/assistant_page_user.c:286
+#: ../libinit_balsa/assistant_page_user.c:278
 msgid "Default Identity"
 msgstr "Основна личност"
 
-#: ../libinit_balsa/assistant_page_user.c:326
+#: ../libinit_balsa/assistant_page_user.c:316
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2285,117 +2332,224 @@ msgstr ""
 "Проблем са месном поштом\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_welcome.c:29
+#: ../libinit_balsa/assistant_page_welcome.c:27
 msgid "Welcome to Balsa!"
 msgstr "Добродошли у Балсу!"
 
-#: ../libinit_balsa/assistant_page_welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:30
+#| msgid ""
+#| "Before you can send or receive email:\n"
+#| "\n"
+#| "-- either you should already have Internet access and an email account, "
+#| "provided by an Internet Service Provider, and you should have made that "
+#| "Internet connection on your computer\n"
+#| "\n"
+#| "-- or your Network Administrator at your place of work/study/similar may "
+#| "have set up your computer to connect to the network."
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
-"-- either you should already have Internet access and an email account, "
+"• either you should already have Internet access and an email account, "
 "provided by an Internet Service Provider, and you should have made that "
 "Internet connection on your computer\n"
 "\n"
-"-- or your Network Administrator at your place of work/study/similar may "
-"have set up your computer to connect to the network."
+"• or your network administrator at your place of work/study/similar may have "
+"set up your computer to connect to the network."
 msgstr ""
 "Пре него што ћете моћи да шаљете или примате пошту:\n"
 "\n"
-"— требало би већ да имате приступ на Интернет и налог ел-поште, који вам "
+"• требало би већ да имате приступ на Интернет и налог е-поште, који вам "
 "доставља ваш достављач интернет услуга, и требало би да сте успоставили "
 "Интернет везу на вашем рачунару\n"
 "\n"
-"— или да је ваш администратор мреже на вашем радном месту/канцеларији већ "
+"• или да је ваш администратор мреже на вашем радном месту/канцеларији већ "
 "подесио ваш рачунар за повезивање на мрежу."
 
+#: ../libnetclient/net-client-smtp.c:135
+#, c-format
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
+msgid "remote server does not support STARTTLS"
+msgstr "удаљени сервер не подржава СТАРТТЛС"
+
+#: ../libnetclient/net-client-smtp.c:388
+#, c-format
+msgid "no suitable authentication mechanism"
+msgstr "нема одговарајућег механизма потврђивања идентитета"
+
+#: ../libnetclient/net-client-smtp.c:509 ../libnetclient/net-client-smtp.c:576
+#: ../libnetclient/net-client-smtp.c:618
+#, c-format
+#| msgid "Mail server: %s\n"
+msgid "bad server reply: %s"
+msgstr "лош одговор сервера: %s"
+
+#: ../libnetclient/net-client-smtp.c:608
+#, c-format
+#| msgid "Sending error: %s"
+msgid "transient error %d: %s"
+msgstr "пролазна грешка %d: %s"
+
+#: ../libnetclient/net-client-smtp.c:613
+#, c-format
+#| msgid "Sending error: %s"
+msgid "permanent error %d: %s"
+msgstr "стална грешка %d: %s"
+
+#: ../libnetclient/net-client.c:80 ../libnetclient/net-client.c:117
+#, c-format
+msgid "network client is already connected"
+msgstr "клијент мреже је већ повезан"
+
+#: ../libnetclient/net-client.c:154 ../libnetclient/net-client.c:197
+#, c-format
+msgid "network client is not connected"
+msgstr "клијент мреже није повезан"
+
+#: ../libnetclient/net-client.c:165
+#, c-format
+msgid "reply length %lu exceeds the maximum allowed length %lu"
+msgstr "дужина одговора %lu превазилази највећу дозвољену дужину %lu"
+
+#: ../libnetclient/net-client.c:180
+#, c-format
+msgid "connection lost"
+msgstr "веза је изгубљена"
+
+#: ../libnetclient/net-client.c:228
+#, c-format
+msgid "line too long"
+msgstr "ред је предуг"
+
+#: ../libnetclient/net-client.c:297
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing certificate: %s"
+msgstr "грешка покретања уверења: %s"
+
+#: ../libnetclient/net-client.c:307
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading certificate: %s"
+msgstr "грешка учитавања уверења: %s"
+
+#: ../libnetclient/net-client.c:315
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing key: %s"
+msgstr "грешка покретања кључа: %s"
+
+#: ../libnetclient/net-client.c:371
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading key: %s"
+msgstr "грешка учитавања кључа: %s"
+
+#: ../libnetclient/net-client.c:411
+#, c-format
+#| msgid "Disconnected"
+msgid "not connected"
+msgstr "неповезан"
+
+#: ../libnetclient/net-client.c:413
+#, c-format
+msgid "connection is already encrypted"
+msgstr "веза је већ шифрована"
+
 #: ../sounds/balsa.soundlist.in.h:1
-msgid "Balsa E-mail reader"
-msgstr "Читач ел-поште Балса"
+#| msgid "Balsa E-mail reader"
+msgid "Balsa Email Reader"
+msgstr "Читач е-поште Балса"
 
 #: ../sounds/balsa.soundlist.in.h:2
-msgid "Program startup"
+#| msgid "Program startup"
+msgid "Program start-up"
 msgstr "Покретање програма"
 
 #: ../sounds/balsa.soundlist.in.h:3
 msgid "New mail notification"
 msgstr "Обавештење о новој пошти"
 
-#: ../src/ab-main.c:214 ../src/ab-window.c:694
+#: ../src/ab-main.c:212 ../src/ab-window.c:702
 msgid " address book: "
 msgstr " адресар: "
 
-#: ../src/ab-main.c:746
+#: ../src/ab-main.c:744
 msgid "_Name"
 msgstr "_Назив"
 
-#: ../src/ab-main.c:762
+#: ../src/ab-main.c:760
 msgid "_Address"
 msgstr "_Адреса"
 
-#: ../src/ab-main.c:850 ../src/address-book-config.c:226
-#: ../src/address-book-config.c:327 ../src/filter-edit-dialog.c:500
-#: ../src/main-window.c:4002 ../src/pref-manager.c:507
+#: ../src/ab-main.c:848 ../src/address-book-config.c:226
+#: ../src/address-book-config.c:331 ../src/address-book-config.c:375
+#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3996
+#: ../src/pref-manager.c:490
 msgid "_Apply"
 msgstr "_Примени"
 
-#: ../src/ab-main.c:888
+#: ../src/ab-main.c:886
 msgid "F_ilter:"
 msgstr "_Пропусник:"
 
-#: ../src/ab-window.c:176 ../src/filter-edit-dialog.c:209
-#: ../src/filter-export-dialog.c:93 ../src/filter-run-dialog.c:226
-#: ../src/filter-run-dialog.c:331
+#: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:224
+#: ../src/filter-run-dialog.c:329
 msgid "Name"
 msgstr "Назив"
 
-#: ../src/ab-window.c:184
-msgid "E-Mail Address"
-msgstr "Адреса ел-поште"
+#: ../src/ab-window.c:192 ../src/balsa-print-object-text.c:502
+msgid "Email Address"
+msgstr "Адреса е-поште"
 
 #. -- grid column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:285
+#: ../src/ab-window.c:293
 msgid "_Search for Name:"
 msgstr "_Тражи име:"
 
-#: ../src/ab-window.c:318
-#| msgid "Run Editor"
+#: ../src/ab-window.c:326
 msgid "Run _Editor"
 msgstr "Покрени _уређивача"
 
-#: ../src/ab-window.c:324
-msgid "_Re-Import"
+#: ../src/ab-window.c:332
+#| msgid "_Re-Import"
+msgid "_Re-import"
 msgstr "_Поново увези"
 
 #. -- grid column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:358
+#: ../src/ab-window.c:366
 msgid "Send-To"
 msgstr "Пошаљи"
 
 #. mode switching stuff
-#: ../src/ab-window.c:372
+#: ../src/ab-window.c:380
 msgid "Treat multiple addresses as:"
 msgstr "Сматрај више адреса као:"
 
-#: ../src/ab-window.c:376
+#: ../src/ab-window.c:384
 msgid "alternative addresses for the same person"
 msgstr "алтернативне адресе исте особе"
 
-#: ../src/ab-window.c:381
+#: ../src/ab-window.c:389
 msgid "a distribution list"
 msgstr "списак прималаца"
 
-#: ../src/ab-window.c:425
+#: ../src/ab-window.c:433
 #, c-format
 msgid "Could not launch %s: %s"
 msgstr "Не могу да покренем %s: %s"
 
-#: ../src/ab-window.c:722
+#: ../src/ab-window.c:730
 #, c-format
+#| msgid ""
+#| "Error opening address book '%s':\n"
+#| "%s"
 msgid ""
-"Error opening address book '%s':\n"
+"Error opening address book “%s”:\n"
 "%s"
 msgstr ""
 "Грешка отварања адресара „%s“\n"
@@ -2413,117 +2567,138 @@ msgstr "када куцам"
 msgid "when I hit the Escape key"
 msgstr "када притиснем тастер „Ескејп“"
 
-#: ../src/address-book-config.c:225 ../src/address-book-config.c:326
+#: ../src/address-book-config.c:225 ../src/address-book-config.c:330
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Измени адресар „%s“"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:329
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:333
 #, c-format
 msgid "Add %s Address Book"
 msgstr "Додај адресар „%s“"
 
-#: ../src/address-book-config.c:230 ../src/address-book-config.c:330
-#: ../src/mailbox-conf.c:554 ../src/pref-manager.c:1698
-#: ../src/pref-manager.c:1771 ../src/pref-manager.c:2871
+#: ../src/address-book-config.c:230 ../src/address-book-config.c:334
+#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:552
+#: ../src/pref-manager.c:1683 ../src/pref-manager.c:1755
+#: ../src/pref-manager.c:2854
 msgid "_Add"
 msgstr "_Додај"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:249 ../src/address-book-config.c:368
-#: ../src/address-book-config.c:434 ../src/address-book-config.c:501
+#: ../src/address-book-config.c:249 ../src/address-book-config.c:400
+#: ../src/address-book-config.c:426 ../src/address-book-config.c:492
+#: ../src/address-book-config.c:559
 msgid "A_ddress Book Name:"
 msgstr "Назив _адресара:"
 
-#: ../src/address-book-config.c:373
+#: ../src/address-book-config.c:374
+#, c-format
+#| msgid "Modify %s Address Book"
+msgid "Modify Osmo Address Book"
+msgstr "Измени адресар Осмоа"
+
+#: ../src/address-book-config.c:378
+#, c-format
+#| msgid "Add %s Address Book"
+msgid "Add Osmo Address Book"
+msgstr "Додај адресар Осмоа"
+
+#: ../src/address-book-config.c:431
 msgid "Load program location:"
 msgstr "Место програма за учитавање:"
 
-#: ../src/address-book-config.c:378
+#: ../src/address-book-config.c:436
 msgid "Select load program for address book"
 msgstr "Изаберите програм за учитавање адресара"
 
-#: ../src/address-book-config.c:386
+#: ../src/address-book-config.c:444
 msgid "Save program location:"
 msgstr "Место програма за чување:"
 
-#: ../src/address-book-config.c:391
+#: ../src/address-book-config.c:449
 msgid "Select save program for address book"
 msgstr "Изаберите програм за чување адресара"
 
-#: ../src/address-book-config.c:439
+#: ../src/address-book-config.c:497
 msgid "_Host Name"
 msgstr "_Назив домаћина"
 
-#: ../src/address-book-config.c:444
+#: ../src/address-book-config.c:502
 msgid "Base Domain _Name"
 msgstr "Основни назив _домена"
 
-#: ../src/address-book-config.c:449
+#: ../src/address-book-config.c:507
 msgid "_User Name (Bind DN)"
 msgstr "_Корисничко име (Bind DN)"
 
-#: ../src/address-book-config.c:454
+#: ../src/address-book-config.c:512
 msgid "_Password"
 msgstr "_Лозинка"
 
-#: ../src/address-book-config.c:460
+#: ../src/address-book-config.c:518
 msgid "_User Address Book DN"
 msgstr "ДН _корисничког адресара"
 
-#: ../src/address-book-config.c:466
+#: ../src/address-book-config.c:524
 msgid "Enable _TLS"
 msgstr "Укључи _ТЛС"
 
-#: ../src/address-book-config.c:503 ../src/address-book-config.c:890
+#: ../src/address-book-config.c:561 ../src/address-book-config.c:954
 msgid "GPE Address Book"
 msgstr "ГПЕ адресар"
 
-#: ../src/address-book-config.c:536 ../src/main-window.c:940
-#: ../src/main-window.c:4109
+#: ../src/address-book-config.c:594 ../src/main-window.c:939
+#: ../src/main-window.c:4103
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Грешка приказивања помоћи: %s\n"
 
-#: ../src/address-book-config.c:613
-msgid "No path found.  Do you want to give one?"
-msgstr "Нисам пронашао путању.  Да ли желите да дате неку?"
+#: ../src/address-book-config.c:671
+#| msgid "No path found.  Do you want to give one?"
+msgid "No path found. Do you want to give one?"
+msgstr "Нисам пронашао путању. Да ли желите да дате неку?"
 
-#: ../src/address-book-config.c:866
-msgid "VCard Address Book (GnomeCard)"
+#: ../src/address-book-config.c:930
+#| msgid "VCard Address Book (GnomeCard)"
+msgid "vCard Address Book (GnomeCard)"
 msgstr "Адресар Вкартице (Гномова картица)"
 
-#: ../src/address-book-config.c:872
+#: ../src/address-book-config.c:936
 msgid "External query (a program)"
 msgstr "Спољашњи упит (програм)"
 
-#: ../src/address-book-config.c:877
+#: ../src/address-book-config.c:941
 msgid "LDIF Address Book"
 msgstr "ЛДИФ адресар"
 
-#: ../src/address-book-config.c:883
+#: ../src/address-book-config.c:947
 msgid "LDAP Address Book"
 msgstr "ЛДАП адресар"
 
-#: ../src/address-book-config.c:897
+#: ../src/address-book-config.c:961
 msgid "Rubrica2 Address Book"
 msgstr "Адресар Рубрике2"
 
-#: ../src/balsa-app.c:65 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1281
+#: ../src/address-book-config.c:968
+#| msgid "Address Book"
+msgid "Osmo Address Book"
+msgstr "Адресар Осмоа"
+
+#: ../src/balsa-app.c:63 ../src/folder-conf.c:274 ../src/mailbox-conf.c:1279
 msgid "_Remember password in Secret Service"
 msgstr "_Запамти лозинку у услузи тајни"
 
-#: ../src/balsa-app.c:68 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1284
+#: ../src/balsa-app.c:66 ../src/folder-conf.c:277 ../src/mailbox-conf.c:1282
 msgid "_Remember password in keyring"
 msgstr "_Запамти лозинку у привеску кључева"
 
-#: ../src/balsa-app.c:71 ../src/folder-conf.c:282 ../src/mailbox-conf.c:1287
+#: ../src/balsa-app.c:69 ../src/folder-conf.c:280 ../src/mailbox-conf.c:1285
 msgid "_Remember password"
 msgstr "_Запамти лозинку"
 
-#: ../src/balsa-app.c:77
+#: ../src/balsa-app.c:75
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2532,166 +2707,180 @@ msgstr ""
 "Отварам удаљено сандуче %s.\n"
 "_Лозинка за „%s@%s“:"
 
-#: ../src/balsa-app.c:82
+#: ../src/balsa-app.c:80
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Лозинка за „%s@%s“ (%s):"
 
-#: ../src/balsa-app.c:85
+#: ../src/balsa-app.c:83
 msgid "Password needed"
 msgstr "Неопходна је лозинка"
 
-#: ../src/balsa-app.c:531
+#: ../src/balsa-app.c:509
 #, c-format
-msgid "Couldn't open mailbox \"%s\""
+#| msgid "Couldn't open mailbox \"%s\""
+msgid "Couldn’t open mailbox “%s”"
 msgstr "Не могу да отворим сандуче „%s“"
 
-#: ../src/balsa-index.c:386 ../src/pref-manager.c:398
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:381
 msgid "Date"
 msgstr "Датум"
 
-#: ../src/balsa-index.c:401 ../src/pref-manager.c:399
-#: ../src/sendmsg-window.c:2674
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:382
+#: ../src/sendmsg-window.c:2688
 msgid "Size"
 msgstr "Величина"
 
-#: ../src/balsa-index.c:1655
+#: ../src/balsa-index.c:1653
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Премештање у смеће није успело: %s"
 
+#: ../src/balsa-index.c:1811
+#| msgid "Reply"
+msgid "_Reply…"
+msgstr "_Одговори…"
+
 #: ../src/balsa-index.c:1813
-msgid "_Reply..."
-msgstr "_Одговори..."
+#| msgid "Reply To _All..."
+msgid "Reply To _All…"
+msgstr "Одговори _свима…"
 
 #: ../src/balsa-index.c:1815
-msgid "Reply To _All..."
-msgstr "Одговори _свима..."
+#| msgid "Reply To _Group..."
+msgid "Reply To _Group…"
+msgstr "Одговори _групи…"
 
 #: ../src/balsa-index.c:1817
-msgid "Reply To _Group..."
-msgstr "Одговори _групи..."
+#| msgid "_Forward Attached..."
+msgid "_Forward Attached…"
+msgstr "_Проследи као прилог…"
 
 #: ../src/balsa-index.c:1819
-msgid "_Forward Attached..."
-msgstr "_Проследи као прилог..."
+#| msgid "Forward _Inline..."
+msgid "Forward _Inline…"
+msgstr "Проследи у _телу поруке…"
 
 #: ../src/balsa-index.c:1821
-msgid "Forward _Inline..."
-msgstr "Проследи у _телу поруке..."
+#| msgid "_Pipe through..."
+msgid "_Pipe through…"
+msgstr "_Преспој…"
 
 #: ../src/balsa-index.c:1823
-msgid "_Pipe through..."
-msgstr "_Преспој..."
-
-#: ../src/balsa-index.c:1825
-msgid "_Store Address..."
-msgstr "_Ускладишти адресу..."
+#| msgid "Store Address"
+msgid "_Store Address…"
+msgstr "_Сачувај адресу…"
 
-#: ../src/balsa-index.c:1839 ../src/mailbox-node.c:1107
-#: ../src/mailbox-node.c:1123 ../src/pref-manager.c:1703
-#: ../src/pref-manager.c:1778 ../src/pref-manager.c:2878
+#: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
+#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:1688
+#: ../src/pref-manager.c:1762 ../src/pref-manager.c:2861
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../src/balsa-index.c:1843
+#: ../src/balsa-index.c:1841
 msgid "_Undelete"
 msgstr "_Поништи брисање"
 
-#: ../src/balsa-index.c:1847
+#: ../src/balsa-index.c:1845
 msgid "Move To _Trash"
 msgstr "Премести у _смеће"
 
-#: ../src/balsa-index.c:1851
+#: ../src/balsa-index.c:1849
 msgid "T_oggle"
 msgstr "_Промени"
 
-#: ../src/balsa-index.c:1854
+#: ../src/balsa-index.c:1852
 msgid "_Flagged"
 msgstr "_Означено"
 
-#: ../src/balsa-index.c:1857
+#: ../src/balsa-index.c:1855
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../src/balsa-index.c:1865
+#: ../src/balsa-index.c:1863
 msgid "_Move to"
 msgstr "_Премести"
 
-#: ../src/balsa-index.c:1872
+#: ../src/balsa-index.c:1870
 msgid "_View Source"
 msgstr "_Погледај извор"
 
-#: ../src/balsa-index.c:2107
+#: ../src/balsa-index.c:2116
 #, c-format
-msgid "Failed to copy %d message to mailbox \"%s\": %s"
-msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+#| msgid "Failed to copy %d message to mailbox \"%s\": %s"
+#| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+msgid "Failed to copy %d message to mailbox “%s”: %s"
+msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
 msgstr[0] "Нисам успео да умножим %d поруку у сандуче „%s“: %s"
 msgstr[1] "Нисам успео да умножим %d поруке у сандуче „%s“: %s"
 msgstr[2] "Нисам успео да умножим %d порука у сандуче „%s“: %s"
 msgstr[3] "Нисам успео да умножим %d поруку у сандуче „%s“: %s"
 
-#: ../src/balsa-index.c:2119
+#: ../src/balsa-index.c:2128
 #, c-format
-msgid "Copied to \"%s\"."
+#| msgid "Copied to \"%s\"."
+msgid "Copied to “%s”."
 msgstr "Умножено је у „%s“."
 
-#: ../src/balsa-index.c:2120
+#: ../src/balsa-index.c:2129
 #, c-format
-msgid "Moved to \"%s\"."
+#| msgid "Moved to \"%s\"."
+msgid "Moved to “%s”."
 msgstr "Премештено је у „%s“."
 
-#: ../src/balsa-index.c:2224
+#: ../src/balsa-index.c:2233
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Нисам успео да пошаљем сандуче „%s“."
 
-#: ../src/balsa-index.c:2322
+#: ../src/balsa-index.c:2331
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "Не могу да обрадим поруку: %s"
 
-#: ../src/balsa-index.c:2446
+#: ../src/balsa-index.c:2455
 #, c-format
 msgid "Cannot access message %u to pass to %s"
 msgstr "Не могу да приступим поруци „%u“ да бих прошао у %s"
 
-#: ../src/balsa-index.c:2473
+#: ../src/balsa-index.c:2482
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Не могу да прочитам поруку „%u“ да бих прошао у %s"
 
-#: ../src/balsa-index.c:2640
+#: ../src/balsa-index.c:2649
 msgid "Pipe message through a program"
 msgstr "Проследи поруку кроз програм"
 
-#: ../src/balsa-index.c:2644
+#: ../src/balsa-index.c:2653
 msgid "_Run"
 msgstr "_Покрени"
 
-#: ../src/balsa-index.c:2656
+#: ../src/balsa-index.c:2665
 msgid "Specify the program to run:"
 msgstr "Наведите програм за покретање:"
 
-#: ../src/balsa-mblist.c:355
+#: ../src/balsa-mblist.c:353
 msgid "Mailbox"
 msgstr "Сандуче"
 
-#: ../src/balsa-mblist.c:1136 ../src/balsa-mblist.c:1186
+#: ../src/balsa-mblist.c:1147 ../src/balsa-mblist.c:1197
 msgid "Failed to find mailbox"
 msgstr "Нисам успео да пронађем сандуче"
 
-#: ../src/balsa-mblist.c:1764
-msgid "_Other..."
-msgstr "_Друго..."
+#: ../src/balsa-mblist.c:1775
+#| msgid "_Other..."
+msgid "_Other…"
+msgstr "_Друго…"
 
-#: ../src/balsa-mblist.c:1874
+#: ../src/balsa-mblist.c:1892
 msgid "Choose destination folder"
 msgstr "Изаберите одредишну фасциклу"
 
-#: ../src/balsa-mblist.c:2068
-msgid "Other..."
-msgstr "Друго..."
+#: ../src/balsa-mblist.c:2086
+#| msgid "Other..."
+msgid "Other…"
+msgstr "Друго…"
 
 #: ../src/balsa-message.c:283
 msgid "Check cryptographic signature"
@@ -2713,149 +2902,161 @@ msgstr "Нисам пронашао"
 msgid "Find:"
 msgstr "Пронађи:"
 
-#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:151
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
 msgid "Previous"
 msgstr "Претходну"
 
-#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:152
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
 msgid "Next"
 msgstr "Следећу"
 
-#: ../src/balsa-message.c:721 ../src/balsa-message.c:724
+#: ../src/balsa-message.c:711
 msgid "Content"
 msgstr "Садржај"
 
-#: ../src/balsa-message.c:817 ../src/balsa-message.c:820
+#: ../src/balsa-message.c:797
 msgid "Message parts"
 msgstr "Делови поруке"
 
-#: ../src/balsa-message.c:1013
-msgid "Save selected as..."
-msgstr "Сачувај изабрано као..."
+#: ../src/balsa-message.c:989
+#| msgid "Save selected as..."
+msgid "Save selected as…"
+msgstr "Сачувај изабрано као…"
 
-#: ../src/balsa-message.c:1020
-msgid "Save selected to folder..."
-msgstr "Сачувај изабрано у фасциклу..."
+#: ../src/balsa-message.c:996
+#| msgid "Save selected to folder..."
+msgid "Save selected to folder…"
+msgstr "Сачувај изабрано у фасциклу…"
 
-#: ../src/balsa-message.c:1113
+#: ../src/balsa-message.c:1106
 msgid "(No sender)"
 msgstr "(нема пошиљаоца)"
 
-#: ../src/balsa-message.c:1171 ../src/balsa-message.c:1183
+#: ../src/balsa-message.c:1159 ../src/balsa-message.c:1171
 #, c-format
-msgid "Could not access message %u in mailbox \"%s\"."
+#| msgid "Could not access message %u in mailbox \"%s\"."
+msgid "Could not access message %u in mailbox “%s”."
 msgstr "Не могу да приступим поруци „%u“ у сандучету „%s“."
 
-#: ../src/balsa-message.c:1355
+#: ../src/balsa-message.c:1338
 msgid "mixed parts"
 msgstr "измешани делови"
 
-#: ../src/balsa-message.c:1357
+#: ../src/balsa-message.c:1340
 msgid "alternative parts"
 msgstr "допунски делови"
 
-#: ../src/balsa-message.c:1359
+#: ../src/balsa-message.c:1342
 msgid "signed parts"
 msgstr "потписани делови"
 
-#: ../src/balsa-message.c:1361
+#: ../src/balsa-message.c:1344
 msgid "encrypted parts"
 msgstr "шифровани делови"
 
-#: ../src/balsa-message.c:1363
-msgid "rfc822 message"
-msgstr "рфц822 порука"
+#: ../src/balsa-message.c:1346
+#| msgid "rfc822 message"
+msgid "RFC822 message"
+msgstr "РФЦ822 порука"
 
-#: ../src/balsa-message.c:1365
+#: ../src/balsa-message.c:1348
 #, c-format
-msgid "\"%s\" parts"
+#| msgid "\"%s\" parts"
+msgid "“%s” parts"
 msgstr "„%s“ делови"
 
-#: ../src/balsa-message.c:1421
+#: ../src/balsa-message.c:1396
 msgid "force inline for all parts"
 msgstr "присили унутрашње за све делове"
 
-#: ../src/balsa-message.c:1464
+#: ../src/balsa-message.c:1439
 #, c-format
-msgid "rfc822 message (from %s, subject \"%s\")"
-msgstr "рфц822 порука (шаље %s, тема „%s“)"
+#| msgid "rfc822 message (from %s, subject \"%s\")"
+msgid "RFC822 message (from %s, subject “%s”)"
+msgstr "РФЦ822 порука (шаље %s, тема „%s“)"
 
-#: ../src/balsa-message.c:1476
+#: ../src/balsa-message.c:1451
 msgid "complete message"
 msgstr "целокупна порука"
 
-#: ../src/balsa-message.c:1493
+#: ../src/balsa-message.c:1468
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "део %s: %s (датотека %s)"
 
-#: ../src/balsa-message.c:1504
+#: ../src/balsa-message.c:1479
 #, c-format
 msgid "part %s: %s"
 msgstr "део %s: %s"
 
-#: ../src/balsa-message.c:1519
+#: ../src/balsa-message.c:1494
 msgid "encrypted: "
 msgstr "шифровано: "
 
-#: ../src/balsa-message.c:1659
+#: ../src/balsa-message.c:1634
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Нисам успео да прочитам уграђену поруку: %s"
 
-#: ../src/balsa-message.c:1667
+#: ../src/balsa-message.c:1642
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Нисам успео да прикачим поруку у „%s“: %s"
 
-#: ../src/balsa-message.c:1696
-msgid "_Save..."
-msgstr "_Сачувај..."
+#: ../src/balsa-message.c:1671
+#| msgid "_Save"
+msgid "_Save…"
+msgstr "_Сачувај…"
 
-#: ../src/balsa-message.c:1705 ../src/balsa-mime-widget-message.c:443
-msgid "_Copy to folder..."
-msgstr "_Умножи у фасциклу..."
+#: ../src/balsa-message.c:1680 ../src/balsa-mime-widget-message.c:435
+#| msgid "Copy to folder:"
+msgid "_Copy to folder…"
+msgstr "_Умножи у фасциклу…"
 
-#: ../src/balsa-message.c:1788
+#: ../src/balsa-message.c:1763
 msgid "Select folder for saving selected parts"
 msgstr "Изаберите фасциклу за чување изабраних делова"
 
-#: ../src/balsa-message.c:1813
+#: ../src/balsa-message.c:1788
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Не могу да направим путању за „%s“"
 
-#: ../src/balsa-message.c:1838
+#: ../src/balsa-message.c:1813
 #, c-format
 msgid "%s message part"
 msgstr "%s дела поруке"
 
-#: ../src/balsa-message.c:1871 ../src/balsa-mime-widget-callbacks.c:166
+#: ../src/balsa-message.c:1846 ../src/balsa-mime-widget-callbacks.c:164
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Не могу да сачувам %s: %s"
 
-#: ../src/balsa-message.c:2514 ../src/balsa-message.c:2663
+#: ../src/balsa-message.c:2482 ../src/balsa-message.c:2623
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Нисам успео да пошаљем обавештење о приспећу: %s"
 
-#: ../src/balsa-message.c:2611
+#: ../src/balsa-message.c:2579
 #, c-format
+#| msgid ""
+#| "The sender of this mail, %s, requested \n"
+#| "a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+#| "Do you want to send this notification?"
 msgid ""
 "The sender of this mail, %s, requested \n"
-"a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+"a Message Disposition Notification (MDN) to be returned to “%s”.\n"
 "Do you want to send this notification?"
 msgstr ""
 "Пошиљалац овог писма, %s, захтевао је да\n"
 "обавештење о приспећу поруке (ОПП) буде враћено на „%s“.\n"
 "Да ли желите да пошаљете ово обавештење?"
 
-#: ../src/balsa-message.c:2621
+#: ../src/balsa-message.c:2589
 msgid "Reply to MDN?"
 msgstr "Да одговорим на ОПП?"
 
-#: ../src/balsa-message.c:2839
+#: ../src/balsa-message.c:2799
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -2865,109 +3066,132 @@ msgstr ""
 "пута.\n"
 "Молим затворите остале примерке ове поруке и покушајте опет."
 
-#: ../src/balsa-message.c:2860 ../src/balsa-message.c:2945
-#: ../src/balsa-message.c:3067
+#: ../src/balsa-message.c:2820 ../src/balsa-message.c:2905
+#: ../src/balsa-message.c:3027
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Нисам успео да обрадим део поруке: %s"
 
-#: ../src/balsa-message.c:2861 ../src/balsa-message.c:2946
-#: ../src/balsa-message.c:3068
+#: ../src/balsa-message.c:2821 ../src/balsa-message.c:2906
+#: ../src/balsa-message.c:3028
 msgid "Possible disk space problem."
 msgstr "Могуће је да недостаје простор на диску."
 
-#: ../src/balsa-message.c:2875
+#: ../src/balsa-message.c:2835
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains an encrypted part, "
+#| "but it's structure is invalid."
 msgid ""
-"The message sent by %s with subject \"%s\" contains an encrypted part, but "
-"it's structure is invalid."
+"The message sent by %s with subject “%s” contains an encrypted part, but its "
+"structure is invalid."
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи шифровани део, али је њена "
 "структура неисправна."
 
-#: ../src/balsa-message.c:2883
+#: ../src/balsa-message.c:2843
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
+#| "but this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
-"but this crypto protocol is not available."
+"The message sent by %s with subject “%s” contains a PGP encrypted part, but "
+"this crypto protocol is not available."
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи ПГП шифровани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2896
+#: ../src/balsa-message.c:2856
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a S/MIME encrypted "
+#| "part, but this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
+"The message sent by %s with subject “%s” contains a S/MIME encrypted part, "
 "but this crypto protocol is not available."
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи С/МИМЕ шифровани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2963
+#: ../src/balsa-message.c:2923
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a signed part, but "
+#| "its structure is invalid. The signature, if there is any, cannot be "
+#| "checked."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a signed part, but its "
+"The message sent by %s with subject “%s” contains a signed part, but its "
 "structure is invalid. The signature, if there is any, cannot be checked."
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи део са потписом, али је "
 "структура неисправна. Потпис, ако уопште постоји, се не може проверити."
 
-#: ../src/balsa-message.c:2976
+#: ../src/balsa-message.c:2936
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a %s signed part, but "
+#| "this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a %s signed part, but "
-"this crypto protocol is not available."
+"The message sent by %s with subject “%s” contains a %s signed part, but this "
+"crypto protocol is not available."
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи „%s“ потписани део, али овај "
 "протокол шифровања није доступан."
 
-#: ../src/balsa-message.c:2979
+#: ../src/balsa-message.c:2939
 msgid "PGP"
 msgstr "ПГП"
 
-#: ../src/balsa-message.c:2979 ../src/print-gtk.c:201
+#: ../src/balsa-message.c:2939 ../src/print-gtk.c:199
 msgid "S/MIME"
 msgstr "С/МИМЕ"
 
-#: ../src/balsa-message.c:3003 ../src/balsa-message.c:3130
+#: ../src/balsa-message.c:2963 ../src/balsa-message.c:3090
 msgid "Detected a good signature"
 msgstr "Открио сам добар потпис"
 
-#: ../src/balsa-message.c:3009
+#: ../src/balsa-message.c:2969
 msgid "Detected a good signature with insufficient validity"
 msgstr "Препознао сам исправан потпис са недовољно исправности"
 
-#: ../src/balsa-message.c:3014 ../src/balsa-message.c:3134
+#: ../src/balsa-message.c:2974 ../src/balsa-message.c:3094
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Препознао сам исправан потпис са недовољно исправности/поверења"
 
-#: ../src/balsa-message.c:3021 ../src/balsa-message.c:3140
+#: ../src/balsa-message.c:2981 ../src/balsa-message.c:3100
 #, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "returned:\n"
+#| "%s"
 msgid ""
-"Checking the signature of the message sent by %s with subject \"%s\" "
+"Checking the signature of the message sent by %s with subject “%s” "
 "returned:\n"
 "%s"
 msgstr ""
 "Провера потписа поруке коју је послао %s са темом „%s“ је вратило:\n"
 "%s"
 
-#: ../src/balsa-message.c:3033
+#: ../src/balsa-message.c:2993
 #, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "failed with an error!"
 msgid ""
-"Checking the signature of the message sent by %s with subject \"%s\" failed "
+"Checking the signature of the message sent by %s with subject “%s” failed "
 "with an error!"
 msgstr ""
 "Провера потписа поруке коју је послао %s са темом „%s“ није успела и вратила "
 "је грешку!"
 
-#: ../src/balsa-message.c:3092
+#: ../src/balsa-message.c:3052
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
 "Дешифровање не може бити обављено зато што је ова порука приказана више пута."
 
-#: ../src/balsa-message.c:3094
+#: ../src/balsa-message.c:3054
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -2975,734 +3199,742 @@ msgstr ""
 "Провера потписа и уклањање ОпенПГП оклопа не може бити обављено зато што је "
 "ова порука приказана више пута."
 
-#: ../src/balsa-message.c:3097
+#: ../src/balsa-message.c:3057
 msgid "Please close the other instances of this message and try again."
 msgstr "Молим затворите остале примерке ове поруке и покушајте опет."
 
-#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1449
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1453
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Не могу да покренем програм: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:81
+#: ../src/balsa-mime-widget-callbacks.c:79
 #, c-format
 msgid "Save %s MIME Part"
 msgstr "Сачувај %s МИМЕ део"
 
-#: ../src/balsa-mime-widget-callbacks.c:124
+#: ../src/balsa-mime-widget-callbacks.c:122
 #, c-format
 msgid "Could not construct URI from %s"
 msgstr "Не могу да направим путању из „%s“"
 
-#: ../src/balsa-mime-widget-callbacks.c:143
+#: ../src/balsa-mime-widget-callbacks.c:141
 msgid "File already exists. Overwrite?"
 msgstr "Датотека већ постоји. Да препишем преко?"
 
-#: ../src/balsa-mime-widget-callbacks.c:153
+#: ../src/balsa-mime-widget-callbacks.c:151
 #, c-format
 msgid "Unlink %s: %s"
 msgstr "Развежи %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:89
+#: ../src/balsa-mime-widget-crypto.c:87
 msgid "_Run GnuPG to import this key"
 msgstr "_Покрени ГнуПГ за увоз овог кључа"
 
-#: ../src/balsa-mime-widget-crypto.c:93
+#: ../src/balsa-mime-widget-crypto.c:91
 msgid "_Run GnuPG to check for an update of this key"
 msgstr "_Покрени ГнуПГ за проверу ажурирања овог кључа"
 
-#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:248
+#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:252
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Грешка учитавања приложене слике: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:146 ../src/balsa-print-object.c:113
-#| msgid "Message parts"
+#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:113
 msgid "message headers"
 msgstr "заглавља поруке"
 
-#: ../src/balsa-mime-widget-message.c:176
-#: ../src/balsa-mime-widget-message.c:188
-#: ../src/balsa-mime-widget-message.c:216
-#: ../src/balsa-mime-widget-message.c:269
+#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:186
+#: ../src/balsa-mime-widget-message.c:214
+#: ../src/balsa-mime-widget-message.c:267
 msgid "Content Type: external-body\n"
 msgstr "Врста садржаја: спољашње тело\n"
 
-#: ../src/balsa-mime-widget-message.c:177
+#: ../src/balsa-mime-widget-message.c:175
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Врста приступа: локална датотека\n"
 
-#: ../src/balsa-mime-widget-message.c:178
-#: ../src/balsa-mime-widget-message.c:224 ../src/balsa-mime-widget.c:242
+#: ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget-message.c:222 ../src/balsa-mime-widget.c:240
 #, c-format
 msgid "File name: %s"
 msgstr "Назив датотеке: %s"
 
-#: ../src/balsa-mime-widget-message.c:189
+#: ../src/balsa-mime-widget-message.c:187
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Врста приступа: адреса\n"
 
-#: ../src/balsa-mime-widget-message.c:190
+#: ../src/balsa-mime-widget-message.c:188
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../src/balsa-mime-widget-message.c:217
+#: ../src/balsa-mime-widget-message.c:215
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Врста приступа: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:221
+#: ../src/balsa-mime-widget-message.c:219
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "ФТП сајт: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:223
+#: ../src/balsa-mime-widget-message.c:221
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Директоријум: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:270
+#: ../src/balsa-mime-widget-message.c:268
 msgid "Access type: mail-server\n"
 msgstr "Врста приступа: сервер поште\n"
 
-#: ../src/balsa-mime-widget-message.c:271
+#: ../src/balsa-mime-widget-message.c:269
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Сервер поште: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:273
+#: ../src/balsa-mime-widget-message.c:271
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:290
+#: ../src/balsa-mime-widget-message.c:288
 msgid "Se_nd message to obtain this part"
 msgstr "Пошаљи _поруку да добијеш овај део"
 
-#: ../src/balsa-mime-widget-message.c:313 ../src/balsa-mime-widget-text.c:802
-#: ../src/sendmsg-window.c:1472
+#: ../src/balsa-mime-widget-message.c:311 ../src/balsa-mime-widget-text.c:801
+#: ../src/sendmsg-window.c:1476
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Грешка приказивања „%s“: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:348
+#: ../src/balsa-mime-widget-message.c:346
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Не могу да преузмем део: %s"
 
-#: ../src/balsa-mime-widget-message.c:382
+#: ../src/balsa-mime-widget-message.c:374
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "Нисам успео да пошаљем захтев спољног тела: %s"
 
-#: ../src/balsa-mime-widget-message.c:435
-msgid "Reply..."
-msgstr "Одговори..."
+#: ../src/balsa-mime-widget-message.c:427
+#| msgid "Reply"
+msgid "Reply…"
+msgstr "Одговори…"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:714
+#: ../src/balsa-mime-widget-message.c:705
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../src/balsa-mime-widget-message.c:715
+#: ../src/balsa-mime-widget-message.c:706
 msgid "IMAP server did not report message structure"
 msgstr "ИМАП сервер није известио о структури поруке"
 
-#: ../src/balsa-mime-widget-message.c:728
+#: ../src/balsa-mime-widget-message.c:719
 #: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:748
 #: ../src/sendmsg-window.c:750 ../src/sendmsg-window.c:842
-#: ../src/sendmsg-window.c:3489 ../src/sendmsg-window.c:5010
+#: ../src/sendmsg-window.c:3502 ../src/sendmsg-window.c:5023
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/balsa-mime-widget-message.c:733
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3485
+#: ../src/balsa-mime-widget-message.c:724
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3498
 msgid "Date:"
 msgstr "Датум:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3496
+#: ../src/balsa-mime-widget-message.c:730
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3509
 msgid "From:"
 msgstr "Шаље:"
 
-#: ../src/balsa-mime-widget-message.c:746
+#: ../src/balsa-mime-widget-message.c:737
 msgid "Reply-To:"
 msgstr "Одговори на:"
 
-#: ../src/balsa-mime-widget-message.c:759
+#: ../src/balsa-mime-widget-message.c:750
 #: ../src/balsa-print-object-header.c:177
-msgid "Fcc:"
-msgstr "Умножак датотеке:"
+msgid "FCC:"
+msgstr "ФЦЦ:"
 
-#: ../src/balsa-mime-widget-message.c:767
+#: ../src/balsa-mime-widget-message.c:758
 #: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Порука о приспећу:"
 
-#: ../src/balsa-mime-widget-text.c:158
+#: ../src/balsa-mime-widget-text.c:156
 #, c-format
 msgid "Could not save a text part: %s"
 msgstr "Не могу да сачувам текстуални део: %s"
 
-#: ../src/balsa-mime-widget-text.c:509
+#: ../src/balsa-mime-widget-text.c:507
 msgid "Copy link"
 msgstr "Умножи везу"
 
-#: ../src/balsa-mime-widget-text.c:514
+#: ../src/balsa-mime-widget-text.c:512
 msgid "Open link"
 msgstr "Отвори везу"
 
-#: ../src/balsa-mime-widget-text.c:519
-msgid "Send link..."
-msgstr "Пошаљи везу..."
+#: ../src/balsa-mime-widget-text.c:517
+#| msgid "Send link..."
+msgid "Send link…"
+msgstr "Пошаљи везу…"
 
-#: ../src/balsa-mime-widget-text.c:550 ../src/balsa-mime-widget-text.c:1080
-msgid "Save..."
-msgstr "Сачувај..."
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1079
+#| msgid "Save"
+msgid "Save…"
+msgstr "Сачувај…"
 
-#: ../src/balsa-mime-widget-text.c:560
+#: ../src/balsa-mime-widget-text.c:558
 msgid "Highlight structured phrases"
 msgstr "Истакни сређене изразе"
 
-#: ../src/balsa-mime-widget-text.c:787
+#: ../src/balsa-mime-widget-text.c:786
 #, c-format
-msgid "Calling URL %s..."
-msgstr "Позивам адресу %s..."
+#| msgid "Calling URL %s..."
+msgid "Calling URL %s…"
+msgstr "Позивам адресу %s…"
 
-#: ../src/balsa-mime-widget-text.c:1047
+#: ../src/balsa-mime-widget-text.c:1046
 msgid "Zoom In"
-msgstr "У_већај"
+msgstr "Увећај"
 
-#: ../src/balsa-mime-widget-text.c:1052
+#: ../src/balsa-mime-widget-text.c:1051
 msgid "Zoom Out"
-msgstr "У_мањи"
+msgstr "Умањи"
 
-#: ../src/balsa-mime-widget-text.c:1057
+#: ../src/balsa-mime-widget-text.c:1056
 msgid "Zoom 100%"
 msgstr "Увећај на 100%"
 
-#: ../src/balsa-mime-widget-text.c:1066
+#: ../src/balsa-mime-widget-text.c:1065
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: ../src/balsa-mime-widget-text.c:1089
-msgid "Print..."
-msgstr "Штампај..."
+#: ../src/balsa-mime-widget-text.c:1088
+#| msgid "Print"
+msgid "Print…"
+msgstr "Штампај…"
 
-#: ../src/balsa-mime-widget-text.c:1212
+#: ../src/balsa-mime-widget-text.c:1226
 msgid "S_tore Address"
 msgstr "_Складишти адресу"
 
-#: ../src/balsa-mime-widget-text.c:1219
+#: ../src/balsa-mime-widget-text.c:1233
 msgid "Full Name:"
 msgstr "Име и презиме:"
 
-#: ../src/balsa-mime-widget-text.c:1220
+#: ../src/balsa-mime-widget-text.c:1234
 msgid "Nick Name:"
 msgstr "Надимак:"
 
-#: ../src/balsa-mime-widget-text.c:1221
+#: ../src/balsa-mime-widget-text.c:1235
 msgid "First Name:"
 msgstr "Име:"
 
-#: ../src/balsa-mime-widget-text.c:1222
+#: ../src/balsa-mime-widget-text.c:1236
 msgid "Last Name:"
 msgstr "Презиме:"
 
-#: ../src/balsa-mime-widget-text.c:1223
+#: ../src/balsa-mime-widget-text.c:1237
 msgid "Organization:"
 msgstr "Установа:"
 
-#: ../src/balsa-mime-widget-text.c:1225
+#: ../src/balsa-mime-widget-text.c:1239
 msgid "Email Address:"
-msgstr "Адреса ел-поште:"
+msgstr "Адреса е-поште:"
 
-#: ../src/balsa-mime-widget-text.c:1253
+#: ../src/balsa-mime-widget-text.c:1267
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
+#| "no header describing the used codeset (converted to %s)"
 msgid ""
-"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
+"The message sent by %s with subject “%s” contains 8-bit characters, but no "
 "header describing the used codeset (converted to %s)"
 msgstr ""
 "Порука коју је послао %s са темом „%s“ садржи 8-битне знакове, али не и "
 "заглавље које описује коришћени скуп кодова (пребачено у %s)"
 
-#: ../src/balsa-mime-widget-vcalendar.c:67
+#: ../src/balsa-mime-widget-vcalendar.c:65
 #, c-format
-msgid "This is an iTIP calendar \"%s\" message."
+#| msgid "This is an iTIP calendar \"%s\" message."
+msgid "This is an iTIP calendar “%s” message."
 msgstr "Ово је порука иТИП календара „%s“."
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
+#: ../src/balsa-mime-widget-vcalendar.c:171
 msgid "Summary:"
 msgstr "Сажетак:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:174
+#: ../src/balsa-mime-widget-vcalendar.c:172
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:175
+#: ../src/balsa-mime-widget-vcalendar.c:173
 msgid "Start:"
 msgstr "Почетак:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:176
+#: ../src/balsa-mime-widget-vcalendar.c:174
 msgid "End:"
 msgstr "Крај:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:177
+#: ../src/balsa-mime-widget-vcalendar.c:175
 msgid "Location:"
 msgstr "Место:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:209
+#: ../src/balsa-mime-widget-vcalendar.c:207
 msgid "Attendee:"
 msgid_plural "Attendees:"
 msgstr[0] "Присутан:"
 msgstr[1] "Присутни:"
 msgstr[2] "Присутни:"
-msgstr[3] "Званица"
+msgstr[3] "Присутан:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:213
+#: ../src/balsa-mime-widget-vcalendar.c:211
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:234
+#: ../src/balsa-mime-widget-vcalendar.c:232
 msgid "The sender asks you for a reply to this request:"
 msgstr "Пошиљалац је затражио да одговорите на овај захтев:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:241
+#: ../src/balsa-mime-widget-vcalendar.c:239
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../src/balsa-mime-widget-vcalendar.c:250
+#: ../src/balsa-mime-widget-vcalendar.c:248
 msgid "Accept tentatively"
 msgstr "Прихвати уз резерву"
 
-#: ../src/balsa-mime-widget-vcalendar.c:258
+#: ../src/balsa-mime-widget-vcalendar.c:256
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/balsa-mime-widget-vcalendar.c:305
-msgid "iTip Calendar Request"
+#: ../src/balsa-mime-widget-vcalendar.c:303
+#| msgid "iTip Calendar Request"
+msgid "iTIP Calendar Request"
 msgstr "Захтев иТИП календара"
 
-#: ../src/balsa-mime-widget-vcalendar.c:343
+#: ../src/balsa-mime-widget-vcalendar.c:333
 #, c-format
-msgid "Sending the iTip calendar reply failed: %s"
+#| msgid "Sending the iTip calendar reply failed: %s"
+msgid "Sending the iTIP calendar reply failed: %s"
 msgstr "Нисам успео да пошаљем одговор иТИП календара: %s"
 
-#: ../src/balsa-mime-widget.c:259
+#: ../src/balsa-mime-widget.c:257
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Грешка читања дела поруке: %s"
 
-#: ../src/balsa-mime-widget.c:286
+#: ../src/balsa-mime-widget.c:284
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Врста: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:290
+#: ../src/balsa-mime-widget.c:288
 #, c-format
 msgid "Content Type: %s"
 msgstr "Врста садржаја: %s"
 
-#: ../src/balsa-mime-widget.c:304
+#: ../src/balsa-mime-widget.c:302
 msgid "No open or view action defined for this content type"
 msgstr "Није одређена радња за отварање или преглед ове врсте садржаја"
 
-#: ../src/balsa-mime-widget.c:309
+#: ../src/balsa-mime-widget.c:307
 msgid "S_ave part"
 msgstr "Сачувај _део"
 
+#: ../src/balsa-print-object-default.c:152
 #: ../src/balsa-print-object-default.c:154
-#: ../src/balsa-print-object-default.c:156
-#: ../src/balsa-print-object-default.c:159
+#: ../src/balsa-print-object-default.c:157
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../src/balsa-print-object-default.c:164
-#: ../src/balsa-print-object-default.c:168
+#: ../src/balsa-print-object-default.c:162
+#: ../src/balsa-print-object-default.c:166
 msgid "File name:"
 msgstr "Назив датотеке:"
 
-#: ../src/balsa-print-object-text.c:493
+#: ../src/balsa-print-object-text.c:491
 msgid "Full Name"
 msgstr "Име и презиме"
 
-#: ../src/balsa-print-object-text.c:495
+#: ../src/balsa-print-object-text.c:493
 msgid "Nick Name"
 msgstr "Надимак"
 
-#: ../src/balsa-print-object-text.c:497
+#: ../src/balsa-print-object-text.c:495
 msgid "First Name"
 msgstr "Име"
 
-#: ../src/balsa-print-object-text.c:499
+#: ../src/balsa-print-object-text.c:497
 msgid "Last Name"
 msgstr "Презиме"
 
-#: ../src/balsa-print-object-text.c:501
+#: ../src/balsa-print-object-text.c:499
 msgid "Organization"
 msgstr "Организација"
 
-#: ../src/balsa-print-object-text.c:504
-msgid "Email Address"
-msgstr "Адреса ел-поште"
-
-#: ../src/balsa-print-object-text.c:651
+#: ../src/balsa-print-object-text.c:649
 msgid "Summary"
 msgstr "Сажетак"
 
-#: ../src/balsa-print-object-text.c:653
+#: ../src/balsa-print-object-text.c:651
 msgid "Organizer"
 msgstr "Организатор"
 
-#: ../src/balsa-print-object-text.c:655
+#: ../src/balsa-print-object-text.c:653
 msgid "Start"
 msgstr "Почетак"
 
-#: ../src/balsa-print-object-text.c:657
+#: ../src/balsa-print-object-text.c:655
 msgid "End"
 msgstr "Крај"
 
-#: ../src/balsa-print-object-text.c:659
+#: ../src/balsa-print-object-text.c:657
 msgid "Location"
 msgstr "Место"
 
-#: ../src/balsa-print-object-text.c:668
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendees"
 msgstr "Званице"
 
-#: ../src/balsa-print-object-text.c:668
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendee"
 msgstr "Званица"
 
-#: ../src/balsa-print-object-text.c:682 ../src/sendmsg-window.c:2686
+#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2700
 msgid "Description"
 msgstr "Опис"
 
-#: ../src/filter-edit-callbacks.c:332
+#: ../src/filter-edit-callbacks.c:330
 msgid "One of the specified fields contains:"
 msgstr "Једно од задатих поља садржи:"
 
-#: ../src/filter-edit-callbacks.c:333
+#: ../src/filter-edit-callbacks.c:331
 msgid "None of the specified fields contains:"
 msgstr "Ниједно од задатих поља не садржи:"
 
-#: ../src/filter-edit-callbacks.c:335
+#: ../src/filter-edit-callbacks.c:333
 msgid "One of the regular expressions matches"
 msgstr "Један од регуларних израза одговара"
 
-#: ../src/filter-edit-callbacks.c:336
+#: ../src/filter-edit-callbacks.c:334
 msgid "None of the regular expressions matches"
 msgstr "Ниједан од регуларних израза не одговара"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:336
 msgid "Match when date is in the interval:"
 msgstr "Одговара када је датум у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:339
+#: ../src/filter-edit-callbacks.c:337
 msgid "Match when date is outside the interval:"
 msgstr "Одговара када датум није у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:341 ../src/filter-edit-callbacks.c:1136
+#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1134
 msgid "Match when one of these flags is set:"
 msgstr "Одговара када је нека од ових ознака постављена:"
 
-#: ../src/filter-edit-callbacks.c:342
+#: ../src/filter-edit-callbacks.c:340
 msgid "Match when none of these flags is set:"
 msgstr "Одговара када ниједна од ових ознака није постављена:"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:538
 msgid "You must specify the name of the user header to match on"
 msgstr "Морате да задате назив корисничког заглавља које се упоређује"
 
-#: ../src/filter-edit-callbacks.c:551
+#: ../src/filter-edit-callbacks.c:549
 msgid "You must specify at least one field for matching"
 msgstr "Морате да задате бар једно поље за упоређивање"
 
-#: ../src/filter-edit-callbacks.c:561
+#: ../src/filter-edit-callbacks.c:559
 msgid "You must provide a string"
 msgstr "Морате да обезбедите ниску"
 
-#: ../src/filter-edit-callbacks.c:569
+#: ../src/filter-edit-callbacks.c:567
 msgid "You must provide at least one regular expression"
 msgstr "Морате да обезбедите бар један регуларни израз"
 
-#: ../src/filter-edit-callbacks.c:582
+#: ../src/filter-edit-callbacks.c:580
 msgid "Low date is incorrect"
 msgstr "Почетни датум је неисправан"
 
-#: ../src/filter-edit-callbacks.c:593
+#: ../src/filter-edit-callbacks.c:591
 msgid "High date is incorrect"
 msgstr "Завршни датум је неисправан"
 
-#: ../src/filter-edit-callbacks.c:601
+#: ../src/filter-edit-callbacks.c:599
 msgid "Low date is greater than high date"
 msgstr "Почетни датум је већи од завршног"
 
-#: ../src/filter-edit-callbacks.c:902
+#: ../src/filter-edit-callbacks.c:900
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Грешка приказивања помоћи за услове: %s\n"
 
-#: ../src/filter-edit-callbacks.c:940
+#: ../src/filter-edit-callbacks.c:938
 msgid "Match Fields"
 msgstr "Поклопи поља"
 
-#: ../src/filter-edit-callbacks.c:954
+#: ../src/filter-edit-callbacks.c:952
 msgid "_All"
 msgstr "_Све"
 
-#: ../src/filter-edit-callbacks.c:955
+#: ../src/filter-edit-callbacks.c:953
 msgid "C_lear"
 msgstr "_Очисти"
 
-#: ../src/filter-edit-callbacks.c:957 ../src/main-window.c:3986
+#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3980
 msgid "_Body"
 msgstr "_Тело"
 
-#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3987
+#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3981
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3988
+#: ../src/filter-edit-callbacks.c:957 ../src/main-window.c:3982
 msgid "_From:"
 msgstr "_Шаље:"
 
-#: ../src/filter-edit-callbacks.c:960
+#: ../src/filter-edit-callbacks.c:958
 msgid "_Subject"
 msgstr "_Тема"
 
-#: ../src/filter-edit-callbacks.c:961 ../src/main-window.c:3990
-msgid "_Cc:"
-msgstr "_Копија:"
+#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3984
+msgid "_CC:"
+msgstr "_ЦЦ:"
 
-#: ../src/filter-edit-callbacks.c:963
+#: ../src/filter-edit-callbacks.c:961
 msgid "_User header:"
 msgstr "_Корисничко заглавље:"
 
-#: ../src/filter-edit-callbacks.c:994
+#: ../src/filter-edit-callbacks.c:992
 msgid "Unread"
 msgstr "Непрочитано"
 
-#: ../src/filter-edit-callbacks.c:1013
+#: ../src/filter-edit-callbacks.c:1011
 msgid "One of the specified f_ields contains"
 msgstr "Једно од задатих поља _садржи"
 
-#: ../src/filter-edit-callbacks.c:1024
+#: ../src/filter-edit-callbacks.c:1022
 msgid "Contain/Does _Not Contain"
 msgstr "Садржи/_не садржи"
 
-#: ../src/filter-edit-callbacks.c:1043
+#: ../src/filter-edit-callbacks.c:1041
 msgid "_One of the regular expressions matches"
 msgstr "_Један од регуларних израза одговара"
 
-#: ../src/filter-edit-callbacks.c:1079
+#: ../src/filter-edit-callbacks.c:1077
 msgid "One _Matches/None Matches"
 msgstr "_Један одговара/ниједан не одговара"
 
-#: ../src/filter-edit-callbacks.c:1090
+#: ../src/filter-edit-callbacks.c:1088
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Пробирање употребом регуларних израза још није примењено."
 
-#: ../src/filter-edit-callbacks.c:1105
+#: ../src/filter-edit-callbacks.c:1103
 msgid "Match when message date is in the interval:"
 msgstr "Одговара када је датум поруке у интервалу:"
 
-#: ../src/filter-edit-callbacks.c:1118
+#: ../src/filter-edit-callbacks.c:1116
 msgid "Inside/outside the date interval"
 msgstr "Унутар/ван интервала датума"
 
-#: ../src/filter-edit-callbacks.c:1159
+#: ../src/filter-edit-callbacks.c:1157
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Одговара када је једна ознака постављена/када ниједна ознака није постављена"
 
-#: ../src/filter-edit-callbacks.c:1178
+#: ../src/filter-edit-callbacks.c:1176
 msgid "Search T_ype:"
 msgstr "_Врста претраге:"
 
-#: ../src/filter-edit-callbacks.c:1256
+#: ../src/filter-edit-callbacks.c:1254
 msgid "Edit condition for filter: "
 msgstr "Уреди услов филтера: "
 
-#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1893
+#: ../src/filter-edit-callbacks.c:1473 ../src/save-restore.c:1873
 msgid "Filter with no condition was omitted"
 msgstr "Пропусник без услова је изостављен"
 
-#: ../src/filter-edit-callbacks.c:1502
+#: ../src/filter-edit-callbacks.c:1500
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Грешка приказивања помоћи филтера: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1701
+#: ../src/filter-edit-callbacks.c:1699
 msgid "New filter"
 msgstr "Нови филтер"
 
-#: ../src/filter-edit-callbacks.c:1830
+#: ../src/filter-edit-callbacks.c:1828
 msgid "No filter name specified."
 msgstr "Није наведен назив филтера."
 
-#: ../src/filter-edit-callbacks.c:1835
+#: ../src/filter-edit-callbacks.c:1833
 #, c-format
-msgid "Filter \"%s\" already exists."
-msgstr "Пропусник „%s“ већ постоји."
+#| msgid "Filter \"%s\" already exists."
+msgid "Filter “%s” already exists."
+msgstr "Филтер „%s“ већ постоји."
 
-#: ../src/filter-edit-callbacks.c:1845
+#: ../src/filter-edit-callbacks.c:1843
 msgid "Filter must have conditions."
 msgstr "Пропусник мора да има услове."
 
-#: ../src/filter-edit-callbacks.c:1931
+#: ../src/filter-edit-callbacks.c:1929
 msgid "Filter has matched"
 msgstr "Пропусник се поклапа"
 
-#: ../src/filter-edit-callbacks.c:1951
+#: ../src/filter-edit-callbacks.c:1949
 msgid "You must provide a sound to play"
 msgstr "Морате да обезбедите звук за пуштање"
 
-#: ../src/filter-edit-callbacks.c:2133
+#: ../src/filter-edit-callbacks.c:2131
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Пример: 31. децембар 2000. пишите као %s)"
 
-#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:405
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:388
 msgid "Simple"
 msgstr "Једноставно"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:96
 msgid "Regular Expression"
 msgstr "Регуларни изрази"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:97
 msgid "Date interval"
 msgstr "Интервал датума"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:98
 msgid "Flag condition"
 msgstr "Услов ознаке"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:102
 msgid "Copy to folder:"
 msgstr "Умножи у фасциклу:"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:103
 msgid "Move to folder:"
 msgstr "Премести у фасциклу:"
 
-#: ../src/filter-edit-dialog.c:106
+#: ../src/filter-edit-dialog.c:104
 msgid "Colorize"
 msgstr "Обоји"
 
-#: ../src/filter-edit-dialog.c:107
+#: ../src/filter-edit-dialog.c:105
 msgid "Print on printer:"
 msgstr "Штампај на штампачу:"
 
-#: ../src/filter-edit-dialog.c:108
+#: ../src/filter-edit-dialog.c:106
 msgid "Run program:"
 msgstr "Покрени програм:"
 
-#: ../src/filter-edit-dialog.c:109
+#: ../src/filter-edit-dialog.c:107
 msgid "Send to Trash"
 msgstr "Пошаљи у „смеће“"
 
-#: ../src/filter-edit-dialog.c:113
+#: ../src/filter-edit-dialog.c:111
 msgid "OR"
 msgstr "ИЛИ"
 
-#: ../src/filter-edit-dialog.c:114
+#: ../src/filter-edit-dialog.c:112
 msgid "AND"
 msgstr "И"
 
 #. The name entry
-#: ../src/filter-edit-dialog.c:260
+#: ../src/filter-edit-dialog.c:258
 msgid "_Filter name:"
 msgstr "Назив _филтера:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:274
+#: ../src/filter-edit-dialog.c:272
 msgid "Operation between conditions:"
 msgstr "Операција над условима:"
 
-#: ../src/filter-edit-dialog.c:311
+#: ../src/filter-edit-dialog.c:309
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../src/filter-edit-dialog.c:316
+#: ../src/filter-edit-dialog.c:314
 msgid "Ne_w"
 msgstr "Но_во"
 
-#: ../src/filter-edit-dialog.c:348
+#: ../src/filter-edit-dialog.c:346
 msgid "Foreground"
 msgstr "Прочеље"
 
-#: ../src/filter-edit-dialog.c:359
+#: ../src/filter-edit-dialog.c:357
 msgid "Background"
 msgstr "Позадина"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:385
+#: ../src/filter-edit-dialog.c:383
 msgid "Notification:"
 msgstr "Обавештење:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:397
+#: ../src/filter-edit-dialog.c:395
 msgid "Play sound:"
 msgstr "Пусти звук:"
 
-#: ../src/filter-edit-dialog.c:402
-msgid "Use Sound..."
-msgstr "Користи звук..."
+#: ../src/filter-edit-dialog.c:400
+#| msgid "Use Sound..."
+msgid "Use Sound…"
+msgstr "Користи звук…"
 
-#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1113
+#: ../src/filter-edit-dialog.c:403 ../src/mailbox-node.c:1111
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../src/filter-edit-dialog.c:420
-msgid "Popup text:"
+#: ../src/filter-edit-dialog.c:418
+#| msgid "Popup text:"
+msgid "Pop-up text:"
 msgstr "Прикажи текст:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:437
+#: ../src/filter-edit-dialog.c:435
 msgid "Action to perform:"
 msgstr "Радња за обављање:"
 
-#: ../src/filter-edit-dialog.c:491
+#: ../src/filter-edit-dialog.c:489
 msgid "Match"
 msgstr "Поклапање"
 
-#: ../src/filter-edit-dialog.c:494
+#: ../src/filter-edit-dialog.c:492
 msgid "Action"
 msgstr "Радња"
 
-#: ../src/filter-edit-dialog.c:505
-#| msgid "Revert"
+#: ../src/filter-edit-dialog.c:503
 msgid "Re_vert"
 msgstr "_Врати"
 
-#: ../src/filter-edit-dialog.c:556
+#: ../src/filter-edit-dialog.c:554
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Отворено је прозорче за покретање филтера. Затворите га да бисте могли да "
 "мењате филтере."
 
-#: ../src/filter-edit-dialog.c:569
-#| msgid "_Filters"
+#: ../src/filter-edit-dialog.c:567
 msgid "Filters"
 msgstr "Филтери"
 
-#: ../src/filter-edit-dialog.c:637
+#: ../src/filter-edit-dialog.c:635
 #, c-format
-msgid "Filter \"%s\" has no condition."
-msgstr "Пропусник „%s“ нема услов."
+#| msgid "Filter \"%s\" has no condition."
+msgid "Filter “%s” has no condition."
+msgstr "Филтер „%s“ нема услов."
 
-#: ../src/filter-export-callbacks.c:59
+#: ../src/filter-export-callbacks.c:57
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Не могу да извезем филтер %s, дошло је до грешке."
 
-#: ../src/filter-export-dialog.c:65
+#: ../src/filter-export-dialog.c:63
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
@@ -3710,38 +3942,46 @@ msgstr ""
 "Отворени су прозорчићи за покретање филтера, затворите их да бисте могли да "
 "мењате филтере."
 
-#: ../src/filter-export-dialog.c:77
-#| msgid "_Export Filters..."
+#: ../src/filter-export-dialog.c:75
 msgid "Export Filters"
 msgstr "Извези филтере"
 
-#: ../src/filter-run-callbacks.c:186
+#: ../src/filter-run-callbacks.c:184
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Грешка приказивања помоћи за покретање филтера: %s\n"
 
-#: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
+#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
 msgid "Error when applying filters"
 msgstr "Грешка при примени филтера"
 
-#: ../src/filter-run-callbacks.c:239 ../src/filter-run-callbacks.c:261
+#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
 #, c-format
-msgid "Filter applied to \"%s\"."
-msgstr "Пропусник је примењен на „%s“."
+#| msgid "Filter applied to \"%s\"."
+msgid "Filter applied to “%s”."
+msgstr "Филтер је примењен на „%s“."
 
-#: ../src/filter-run-callbacks.c:300
+#: ../src/filter-run-callbacks.c:298
 #, c-format
+#| msgid ""
+#| "The destination mailbox of the filter \"%s\" is \"%s\".\n"
+#| "You can't associate it with the same mailbox (that causes recursion)."
 msgid ""
-"The destination mailbox of the filter \"%s\" is \"%s\".\n"
-"You can't associate it with the same mailbox (that causes recursion)."
+"The destination mailbox of the filter “%s” is “%s”.\n"
+"You can’t associate it with the same mailbox (that causes recursion)."
 msgstr ""
 "Одредишно сандуче за филтер „%s“ је „%s“.\n"
 "Не можете га придружити са истим сандучетом (то изазива дубачење)."
 
-#: ../src/filter-run-callbacks.c:308
+#: ../src/filter-run-callbacks.c:306
 #, c-format
+#| msgid ""
+#| "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
+#| "This happens for example when you use regular expressions match with IMAP "
+#| "mailboxes, it is done by a very slow method; if possible, use substring "
+#| "match instead."
 msgid ""
-"The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
+"The filter “%s” is not compatible with the mailbox type of “%s”.\n"
 "This happens for example when you use regular expressions match with IMAP "
 "mailboxes, it is done by a very slow method; if possible, use substring "
 "match instead."
@@ -3750,49 +3990,43 @@ msgstr ""
 "Ово се догађа када нпр. користите регуларне изразе са ИМАП сандучићима, онда "
 "се користи веома спор начин; ако је могуће, користите обичне ниске."
 
-#: ../src/filter-run-dialog.c:194
-#| msgid "Balsa Filters of Mailbox: "
+#: ../src/filter-run-dialog.c:192
 msgid "Filters of Mailbox: "
 msgstr "Филтери сандучета: "
 
-#: ../src/filter-run-dialog.c:235
+#: ../src/filter-run-dialog.c:233
 msgid "On reception"
 msgstr "При пријему"
 
-#: ../src/filter-run-dialog.c:247
+#: ../src/filter-run-dialog.c:245
 msgid "On exit"
 msgstr "При излазу"
 
-#: ../src/filter-run-dialog.c:356
-#| msgid "Apply Selected"
+#: ../src/filter-run-dialog.c:354
 msgid "_Apply Selected"
 msgstr "_Примени изабрано"
 
-#: ../src/filter-run-dialog.c:372
-#| msgid "Edit the selected mailbox"
+#: ../src/filter-run-dialog.c:370
 msgid "Add selected filter to mailbox"
 msgstr "Додај изабрани филтер у сандуче"
 
-#: ../src/filter-run-dialog.c:382
-#| msgid "Remove duplicated messages from the current mailbox"
+#: ../src/filter-run-dialog.c:380
 msgid "Remove selected filter from mailbox"
 msgstr "Уклони изабрани филтер из сандучета"
 
-#: ../src/filter-run-dialog.c:424
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:422
 msgid "Move selected filter up"
 msgstr "Помери изабрани филтер горе"
 
-#: ../src/filter-run-dialog.c:434
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:432
 msgid "Move selected filter down"
 msgstr "Помери изабрани филтер доле"
 
-#: ../src/filter-run-dialog.c:440
+#: ../src/filter-run-dialog.c:438
 msgid "A_pply Now!"
 msgstr "_Примени сада!"
 
-#: ../src/filter-run-dialog.c:486
+#: ../src/filter-run-dialog.c:484
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -3800,94 +4034,101 @@ msgstr ""
 "Отворено је прозорче филтера, затворите га да бисте могли да покренете "
 "филтере над било ком сандучету"
 
-#: ../src/folder-conf.c:112
+#: ../src/folder-conf.c:110
 #, c-format
 msgid "Error displaying config help: %s\n"
 msgstr "Грешка приказивања помоћи подешавања: %s\n"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:299
 msgid "Remote IMAP folder"
 msgstr "Удаљена фасцикла ИМАП-а"
 
-#: ../src/folder-conf.c:305 ../src/folder-conf.c:801 ../src/mailbox-conf.c:550
+#: ../src/folder-conf.c:303 ../src/folder-conf.c:798 ../src/mailbox-conf.c:548
 msgid "_Update"
 msgstr "_Ажурирај"
 
-#: ../src/folder-conf.c:305
+#: ../src/folder-conf.c:303
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../src/folder-conf.c:332 ../src/mailbox-conf.c:1180
-#: ../src/mailbox-conf.c:1294
+#: ../src/folder-conf.c:329 ../src/mailbox-conf.c:1178
+#: ../src/mailbox-conf.c:1292
 msgid "_Basic"
 msgstr "_Основно"
 
-#: ../src/folder-conf.c:337
+#: ../src/folder-conf.c:334
 msgid "_Max number of connections:"
 msgstr "_Највећи број повезивања:"
 
-#: ../src/folder-conf.c:343 ../src/mailbox-conf.c:1354
+#: ../src/folder-conf.c:340 ../src/mailbox-conf.c:1352
 msgid "Enable _persistent cache"
 msgstr "Укључи _сталну оставу"
 
-#: ../src/folder-conf.c:350
+#: ../src/folder-conf.c:347
 msgid "Use IDLE command"
 msgstr "Користи наредбу „МИРУЈЕ“"
 
-#: ../src/folder-conf.c:357 ../src/mailbox-conf.c:1357
+#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1355
 msgid "Enable _bug workarounds"
 msgstr "Укључи заобилажење _грешке"
 
-#: ../src/folder-conf.c:364
+#: ../src/folder-conf.c:361
 msgid "Use STATUS for mailbox checking"
 msgstr "Користи „СТАЊЕ“ за проверу сандучета"
 
-#: ../src/folder-conf.c:370 ../src/mailbox-conf.c:1233
-#: ../src/mailbox-conf.c:1359
+#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1231
+#: ../src/mailbox-conf.c:1357
 msgid "_Advanced"
 msgstr "_Напредно"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:373
+#: ../src/folder-conf.c:370
 msgid "Descriptive _name:"
 msgstr "Описни _назив:"
 
 #. username
-#: ../src/folder-conf.c:388 ../src/mailbox-conf.c:1196
+#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1194
 msgid "Use_r name:"
 msgstr "Корисничко _име:"
 
-#: ../src/folder-conf.c:394
+#: ../src/folder-conf.c:391
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../src/folder-conf.c:401 ../src/mailbox-conf.c:1317
+#: ../src/folder-conf.c:398 ../src/mailbox-conf.c:1315
 msgid "_Anonymous access"
 msgstr "_Неприметни приступ"
 
-#: ../src/folder-conf.c:412
+#: ../src/folder-conf.c:409
 msgid "Subscribed _folders only"
 msgstr "Само _фасцикле претплате"
 
-#: ../src/folder-conf.c:415
-msgid "Always show _INBOX"
+#: ../src/folder-conf.c:412
+#| msgid "Always show _INBOX"
+msgid "Always show _Inbox"
 msgstr "_Увек прикажи „ДОЛАЗНО“"
 
-#: ../src/folder-conf.c:418
+#: ../src/folder-conf.c:415
 msgid "Pr_efix:"
 msgstr "Пр_ефикс:"
 
-#: ../src/folder-conf.c:565
+#: ../src/folder-conf.c:562
 msgid "Select parent folder"
 msgstr "Изабери родитељску фасциклу"
 
-#: ../src/folder-conf.c:644
+#: ../src/folder-conf.c:641
 #, c-format
+#| msgid ""
+#| "Renaming INBOX is special!\n"
+#| "You will create a subfolder %s in %s\n"
+#| "containing the messages from INBOX.\n"
+#| "INBOX and its subfolders will remain.\n"
+#| "What would you like to do?"
 msgid ""
-"Renaming INBOX is special!\n"
+"Renaming Inbox is special!\n"
 "You will create a subfolder %s in %s\n"
-"containing the messages from INBOX.\n"
-"INBOX and its subfolders will remain.\n"
+"containing the messages from Inbox.\n"
+"Inbox and its subfolders will remain.\n"
 "What would you like to do?"
 msgstr ""
 "Преименовање фасцикле „ДОЛАЗНО“ је нешто посебно!\n"
@@ -3896,29 +4137,30 @@ msgstr ""
 "„ДОЛАЗНО“ и њене подфасцикле ће остати.\n"
 "Шта желите да урадите?"
 
-#: ../src/folder-conf.c:651
+#: ../src/folder-conf.c:648
 msgid "Question"
 msgstr "Питање"
 
-#: ../src/folder-conf.c:655
-msgid "Rename INBOX"
+#: ../src/folder-conf.c:652
+#| msgid "Rename INBOX"
+msgid "Rename Inbox"
 msgstr "Преименуј „ДОЛАЗНО“"
 
-#: ../src/folder-conf.c:657
+#: ../src/folder-conf.c:654
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../src/folder-conf.c:682
+#: ../src/folder-conf.c:679
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Нисам успео да преименујем фасциклу. Ево зашто: %s"
 
-#: ../src/folder-conf.c:734
+#: ../src/folder-conf.c:731
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Нисам успео да направим фасциклу. Ево зашто: %s"
 
-#: ../src/folder-conf.c:781
+#: ../src/folder-conf.c:778
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3926,68 +4168,69 @@ msgstr ""
 "Фасцикла ИМАП-а која није сандуче\n"
 "нема особине које се могу мењати."
 
-#: ../src/folder-conf.c:797
+#: ../src/folder-conf.c:794
 msgid "Remote IMAP subfolder"
 msgstr "Удаљена подфасцикла ИМАП-а"
 
-#: ../src/folder-conf.c:801
+#: ../src/folder-conf.c:798
 msgid "_Create"
 msgstr "_Направи"
 
-#: ../src/folder-conf.c:832
+#: ../src/folder-conf.c:828
 msgid "Create subfolder"
 msgstr "Направи подфасциклу"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:840
+#: ../src/folder-conf.c:836
 msgid "_Folder name:"
 msgstr "Назив _фасцикле:"
 
-#: ../src/folder-conf.c:846
+#: ../src/folder-conf.c:842
 msgid "Host:"
 msgstr "Домаћин:"
 
-#: ../src/folder-conf.c:855
+#: ../src/folder-conf.c:851
 msgid "Subfolder of:"
 msgstr "Подфасцикла:"
 
-#: ../src/folder-conf.c:860
-msgid "_Browse..."
-msgstr "_Разгледај..."
+#: ../src/folder-conf.c:856
+#| msgid "_Browse..."
+msgid "_Browse…"
+msgstr "_Разгледај…"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:870
 msgid "read-only"
 msgstr "само за читање"
 
-#: ../src/folder-conf.c:875
+#: ../src/folder-conf.c:871
 msgid "read-write"
 msgstr "читање-писање"
 
-#: ../src/folder-conf.c:876
+#: ../src/folder-conf.c:872
 msgid "admin"
 msgstr "администратор"
 
-#: ../src/folder-conf.c:877
+#: ../src/folder-conf.c:873
 msgid "post"
 msgstr "уписивање"
 
-#: ../src/folder-conf.c:878
+#: ../src/folder-conf.c:874
 msgid "append"
 msgstr "прикачињање"
 
-#: ../src/folder-conf.c:879
+#: ../src/folder-conf.c:875
 msgid "delete"
 msgstr "брисање"
 
-#: ../src/folder-conf.c:880
+#: ../src/folder-conf.c:876
 msgid "special"
 msgstr "посебно"
 
-#: ../src/folder-conf.c:886
+#: ../src/folder-conf.c:882
 msgid "Permissions:"
 msgstr "Овлашћења:"
 
-#: ../src/folder-conf.c:893
+#: ../src/folder-conf.c:889
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -3995,40 +4238,43 @@ msgstr ""
 "\n"
 "детаљнија овлашћења су доступна само за отворене фасцикле"
 
-#: ../src/folder-conf.c:900
+#: ../src/folder-conf.c:896
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
 msgid ""
 "\n"
-"the server does not support ACL's"
+"the server does not support ACLs"
 msgstr ""
 "\n"
 "сервер не подржава АЦЛ-е"
 
-#: ../src/folder-conf.c:909
+#: ../src/folder-conf.c:905
 msgid "mine: "
 msgstr "моје: "
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:943
 msgid "Quota:"
 msgstr "Удео:"
 
-#: ../src/folder-conf.c:951
+#: ../src/folder-conf.c:947
 msgid "quota information available only for open folders"
 msgstr "податак о уделу је доступан само за отворене фасцикле"
 
-#: ../src/folder-conf.c:956
+#: ../src/folder-conf.c:952
 msgid "the server does not support quotas"
 msgstr "сервер не подржава уделе"
 
-#: ../src/folder-conf.c:958
+#: ../src/folder-conf.c:954
 msgid "no limits"
 msgstr "без ограничења"
 
-#: ../src/folder-conf.c:963
+#: ../src/folder-conf.c:959
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s од %s (%.1f%%) је искоришћено"
 
-#: ../src/folder-conf.c:1000
+#: ../src/folder-conf.c:996
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4036,59 +4282,84 @@ msgstr ""
 "Ова фасцикла није смештена у подешавањима. Ја још увек не знам како да је "
 "уклоним са удаљеног сервера."
 
-#: ../src/folder-conf.c:1009
+#: ../src/folder-conf.c:1005
 #, c-format
+#| msgid ""
+#| "This will remove the folder \"%s\" from the list.\n"
+#| "You may use \"New IMAP Folder\" later to add this folder again.\n"
 msgid ""
-"This will remove the folder \"%s\" from the list.\n"
-"You may use \"New IMAP Folder\" later to add this folder again.\n"
+"This will remove the folder “%s” from the list.\n"
+"You may use “New IMAP Folder” later to add this folder again.\n"
 msgstr ""
 "Ово ће уклонити фасциклу „%s“ са списка.\n"
 "Касније можете користити ставку „Нова фасцикла ИМАП-а“ да поново додате ову "
 "фасциклу.\n"
 
-#: ../src/folder-conf.c:1017
+#: ../src/folder-conf.c:1013
 msgid "Confirm"
 msgstr "Потврди"
 
-#: ../src/information-dialog.c:233
-msgid "Information - Balsa"
+#: ../src/information-dialog.c:231
+#| msgid "Information - Balsa"
+msgid "Information — Balsa"
 msgstr "Информација — Балса"
 
-#: ../src/information-dialog.c:237 ../src/main-window.c:4007
+#: ../src/information-dialog.c:235 ../src/main-window.c:4001
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: ../src/information-dialog.c:238
+#: ../src/information-dialog.c:236
 msgid "Cl_ose"
 msgstr "_Затвори"
 
-#: ../src/information-dialog.c:361
+#: ../src/information-dialog.c:358
 #, c-format
 msgid "WARNING: "
 msgstr "УПОЗОРЕЊЕ: "
 
-#: ../src/information-dialog.c:364
+#: ../src/information-dialog.c:361
 #, c-format
 msgid "ERROR: "
 msgstr "ГРЕШКА: "
 
-#: ../src/information-dialog.c:367
+#: ../src/information-dialog.c:364
 #, c-format
 msgid "FATAL: "
 msgstr "КОБНО: "
 
-#: ../src/mailbox-conf.c:222
+#: ../src/mailbox-conf.c:203 ../src/mailbox-conf.c:1437
+#: ../src/pref-manager.c:374 ../src/pref-manager.c:3311
+msgid "Never"
+msgstr "Никад"
+
+#: ../src/mailbox-conf.c:204 ../src/mailbox-conf.c:1438
+msgid "If Possible"
+msgstr "Ако је могуће"
+
+#: ../src/mailbox-conf.c:205
+msgid "Required"
+msgstr "Увек"
+
+#: ../src/mailbox-conf.c:220
 msgid "Use _SSL"
 msgstr "Користи _ССЛ"
 
-#: ../src/mailbox-conf.c:350
+#: ../src/mailbox-conf.c:225
+msgid "Use _TLS:"
+msgstr "Користи _ТЛС:"
+
+#: ../src/mailbox-conf.c:348
 msgid "No mailbox selected."
 msgstr "Ниједно сандуче није изабрано."
 
-#: ../src/mailbox-conf.c:380
+#: ../src/mailbox-conf.c:378
 #, c-format
+#| msgid ""
+#| "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+#| "If you really want to remove it, assign its function\n"
+#| "to some other mailbox."
 msgid ""
-"Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+"Mailbox “%s” is used by Balsa and I cannot remove it.\n"
 "If you really want to remove it, assign its function\n"
 "to some other mailbox."
 msgstr ""
@@ -4096,12 +4367,18 @@ msgstr ""
 "Ако заиста желите да га уклоним, доделите његову функцију\n"
 "неком другом сандучету."
 
-#: ../src/mailbox-conf.c:390
+#: ../src/mailbox-conf.c:388
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
+#| "also delete the disk file or files associated with this mailbox.\n"
+#| "If you do not remove the file on disk you may \"Add  Mailbox\" to access "
+#| "the mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
-"also delete the disk file or files associated with this mailbox.\n"
-"If you do not remove the file on disk you may \"Add  Mailbox\" to access the "
+"This will remove the mailbox “%s” from the list of mailboxes. You may also "
+"delete the disk file or files associated with this mailbox.\n"
+"If you do not remove the file on disk you may “Add Mailbox” to access the "
 "mailbox again.\n"
 "What would you like to do?"
 msgstr ""
@@ -4111,21 +4388,28 @@ msgstr ""
 "бисте поново приступили сандучету.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:400
 msgid "Remove from _list"
 msgstr "Уклони са _списка"
 
-#: ../src/mailbox-conf.c:403
+#: ../src/mailbox-conf.c:401
 msgid "Remove from list and _disk"
 msgstr "Уклони са списка и са _диска"
 
-#: ../src/mailbox-conf.c:411
+#: ../src/mailbox-conf.c:409
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" and all its messages from your IMAP "
+#| "server.  If %s has subfolders, it will still appear as a node in the "
+#| "folder tree.\n"
+#| "You may use \"New IMAP subfolder\" later to add a mailbox with this "
+#| "name.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" and all its messages from your IMAP "
-"server.  If %s has subfolders, it will still appear as a node in the folder "
+"This will remove the mailbox “%s” and all its messages from your IMAP "
+"server. If %s has subfolders, it will still appear as a node in the folder "
 "tree.\n"
-"You may use \"New IMAP subfolder\" later to add a mailbox with this name.\n"
+"You may use “New IMAP subfolder” later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
 "Ово ће уклонити сандуче „%s“ и све његове поруке са сервера ИМАП-а. Ако %s "
@@ -4134,15 +4418,19 @@ msgstr ""
 "под овим именом.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:424
+#: ../src/mailbox-conf.c:422
 msgid "_Remove from server"
 msgstr "_Уклони са сервера"
 
-#: ../src/mailbox-conf.c:431
+#: ../src/mailbox-conf.c:429
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
+#| "You may use \"Add Mailbox\" later to access this mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.\n"
-"You may use \"Add Mailbox\" later to access this mailbox again.\n"
+"This will remove the mailbox “%s” from the list of mailboxes.\n"
+"You may use “Add Mailbox” later to access this mailbox again.\n"
 "What would you like to do?"
 msgstr ""
 "Ово ће уклонити сандуче „%s“ са списка сандучића.\n"
@@ -4150,21 +4438,21 @@ msgstr ""
 "сандучету.\n"
 "Шта бисте желели да урадим?"
 
-#: ../src/mailbox-conf.c:440
+#: ../src/mailbox-conf.c:438
 msgid "_Remove from list"
 msgstr "_Уклони са списка"
 
-#: ../src/mailbox-conf.c:484
+#: ../src/mailbox-conf.c:482
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Нисам успео да обришем фасциклу. Ево зашто: %s"
 
-#: ../src/mailbox-conf.c:780
+#: ../src/mailbox-conf.c:778
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: ../src/mailbox-conf.c:920
+#: ../src/mailbox-conf.c:918
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4173,72 +4461,72 @@ msgstr ""
 "Нисам успео да преименујем „%s“ у „%s“:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1105
+#: ../src/mailbox-conf.c:1103
 msgid "_Mailbox Name:"
 msgstr "_Назив сандучета:"
 
-#: ../src/mailbox-conf.c:1114
+#: ../src/mailbox-conf.c:1112
 #, c-format
 msgid "Local %s Mailbox Properties"
 msgstr "Својства месног „%s“ сандучета"
 
-#: ../src/mailbox-conf.c:1115
+#: ../src/mailbox-conf.c:1113
 #, c-format
 msgid "New Local %s Mailbox"
 msgstr "Ново месно „%s“ сандуче"
 
-#: ../src/mailbox-conf.c:1157
+#: ../src/mailbox-conf.c:1155
 msgid "Remote Mailbox Configurator"
 msgstr "Подешавач удаљеног сандучета"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1183 ../src/mailbox-conf.c:1297
+#: ../src/mailbox-conf.c:1181 ../src/mailbox-conf.c:1295
 msgid "Mailbox _name:"
 msgstr "Назив _сандучета:"
 
 #. password field
-#: ../src/mailbox-conf.c:1202 ../src/mailbox-conf.c:1329
+#: ../src/mailbox-conf.c:1200 ../src/mailbox-conf.c:1327
 msgid "Pass_word:"
 msgstr "Ло_зинка:"
 
-#: ../src/mailbox-conf.c:1209
+#: ../src/mailbox-conf.c:1207
 msgid "_Delete messages from server after download"
 msgstr "_Обриши поруке са сервера након преузимања"
 
-#: ../src/mailbox-conf.c:1215
+#: ../src/mailbox-conf.c:1213
 msgid "_Enable check for new mail"
 msgstr "_Укључи проверу за новом поштом"
 
-#: ../src/mailbox-conf.c:1220
+#: ../src/mailbox-conf.c:1218
 msgid "_Filter messages through procmail"
 msgstr "_Пропусти поруке кроз „procmail“"
 
-#: ../src/mailbox-conf.c:1224
+#: ../src/mailbox-conf.c:1222
 msgid "Fi_lter Command:"
 msgstr "Наредба за _пропуштање:"
 
-#: ../src/mailbox-conf.c:1237
+#: ../src/mailbox-conf.c:1235
 msgid "Disable _APOP"
 msgstr "Искључи _АПОП"
 
 #. username
-#: ../src/mailbox-conf.c:1310
+#: ../src/mailbox-conf.c:1308
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: ../src/mailbox-conf.c:1334
+#: ../src/mailbox-conf.c:1332
 msgid "F_older path:"
 msgstr "_Путања фасцикле:"
 
-#: ../src/mailbox-conf.c:1418
+#: ../src/mailbox-conf.c:1416
 msgid "_Identity:"
 msgstr "_Личност:"
 
-#: ../src/mailbox-conf.c:1441 ../src/pref-manager.c:3336
+#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:3313
 msgid "Always"
 msgstr "Увек"
 
-#: ../src/mailbox-conf.c:1445
+#: ../src/mailbox-conf.c:1443
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4246,24 +4534,25 @@ msgstr ""
 "_Дешифруј и провери\n"
 "потписе самостално:"
 
-#: ../src/mailbox-conf.c:1472
+#: ../src/mailbox-conf.c:1470
 msgid "Show _Recipient column instead of Sender"
 msgstr "Прикажи колону _примаоца уместо пошиљаоца"
 
-#: ../src/mailbox-conf.c:1486
+#: ../src/mailbox-conf.c:1484
 msgid "_Subscribe for new mail check"
 msgstr "_Претплати се за проверу нове поште"
 
-#: ../src/mailbox-node.c:319
+#: ../src/mailbox-node.c:317
 msgid "The folder edition to be written."
 msgstr "Издање фасцикле за упис."
 
-#: ../src/mailbox-node.c:499
+#: ../src/mailbox-node.c:497
 #, c-format
-msgid "Scanning %s. Please wait..."
-msgstr "Прегледам „%s“. Молим сачекајте..."
+#| msgid "Scanning %s. Please wait..."
+msgid "Scanning %s. Please wait…"
+msgstr "Прегледам „%s“. Сачекајте…"
 
-#: ../src/mailbox-node.c:515
+#: ../src/mailbox-node.c:513
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4272,87 +4561,95 @@ msgstr ""
 "Прегледање „%s“ није успело: %s\n"
 "Проверите повезаност на мрежу."
 
-#: ../src/mailbox-node.c:517
+#: ../src/mailbox-node.c:515
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Прегледање „%s“ није успело: %s"
 
+#: ../src/mailbox-node.c:1063
+#| msgid "Local _mbox mailbox..."
+msgid "Local _mbox mailbox…"
+msgstr "Месно сандуче „_mbox“…"
+
 #: ../src/mailbox-node.c:1065
-msgid "Local _mbox mailbox..."
-msgstr "Месно сандуче „_mbox“..."
+#| msgid "Local Mail_dir mailbox..."
+msgid "Local Mail_dir mailbox…"
+msgstr "Месно сандуче „Mail_dir“…"
 
 #: ../src/mailbox-node.c:1067
-msgid "Local Mail_dir mailbox..."
-msgstr "Месно сандуче „Mail_dir“..."
+#| msgid "Local M_H mailbox..."
+msgid "Local M_H mailbox…"
+msgstr "Месно сандуче „M_H“…"
 
 #: ../src/mailbox-node.c:1069
-msgid "Local M_H mailbox..."
-msgstr "Месно сандуче „M_H“..."
+#| msgid "Remote _IMAP mailbox..."
+msgid "Remote _IMAP mailbox…"
+msgstr "Удаљено сандуче _ИМАП-а…"
 
-#: ../src/mailbox-node.c:1071
-msgid "Remote _IMAP mailbox..."
-msgstr "Удаљено сандуче _ИМАП-а..."
+#: ../src/mailbox-node.c:1072
+#| msgid "Remote IMAP folder"
+msgid "Remote IMAP _folder…"
+msgstr "Удаљена _фасцикла ИМАП-а…"
 
 #: ../src/mailbox-node.c:1074
-msgid "Remote IMAP _folder..."
-msgstr "Удаљена _фасцикла ИМАП-а..."
-
-#: ../src/mailbox-node.c:1076
-msgid "Remote IMAP _subfolder..."
-msgstr "Удаљена подфа_сцикла ИМАП-а..."
+#| msgid "Remote IMAP subfolder"
+msgid "Remote IMAP _subfolder…"
+msgstr "Удаљена _подфасцикла ИМАП-а…"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1087 ../src/mailbox-node.c:1103
+#: ../src/mailbox-node.c:1085 ../src/mailbox-node.c:1101
 msgid "_Rescan"
 msgstr "Поново п_регледај"
 
-#: ../src/mailbox-node.c:1097
-msgid "_Properties..."
-msgstr "_Својства..."
+#: ../src/mailbox-node.c:1095
+#| msgid "_Properties"
+msgid "_Properties…"
+msgstr "_Својства…"
 
-#: ../src/mailbox-node.c:1127
+#: ../src/mailbox-node.c:1125
 msgid "_Subscribe"
 msgstr "Пре_тплати се"
 
-#: ../src/mailbox-node.c:1129
+#: ../src/mailbox-node.c:1127
 msgid "_Unsubscribe"
 msgstr "_Поништи претплату"
 
-#: ../src/mailbox-node.c:1135
+#: ../src/mailbox-node.c:1133
 msgid "Mark as _Inbox"
 msgstr "Означи као „_долазно“"
 
-#: ../src/mailbox-node.c:1137
+#: ../src/mailbox-node.c:1135
 msgid "_Mark as Sentbox"
 msgstr "Означи као „_одлазно“"
 
-#: ../src/mailbox-node.c:1139
+#: ../src/mailbox-node.c:1137
 msgid "Mark as _Trash"
 msgstr "Означи као „_смеће“"
 
-#: ../src/mailbox-node.c:1141
+#: ../src/mailbox-node.c:1139
 msgid "Mark as D_raftbox"
 msgstr "Означи као „с_кице“"
 
-#: ../src/mailbox-node.c:1144
+#: ../src/mailbox-node.c:1142
 msgid "_Empty trash"
 msgstr "_Избаци смеће"
 
-#: ../src/mailbox-node.c:1149
+#: ../src/mailbox-node.c:1147
 msgid "_Edit/Apply filters"
 msgstr "_Уреди/примени филтере"
 
-#: ../src/mailbox-node.c:1236
+#: ../src/mailbox-node.c:1234
 #, c-format
-msgid "The path \"%s\" does not lead to a mailbox."
+#| msgid "The path \"%s\" does not lead to a mailbox."
+msgid "The path “%s” does not lead to a mailbox."
 msgstr "Путања „%s“ не води ка сандучету."
 
-#: ../src/mailbox-node.c:1249
+#: ../src/mailbox-node.c:1247
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Месно сандуче „%s“ је учитано као: %s\n"
 
-#: ../src/mailbox-node.c:1280
+#: ../src/mailbox-node.c:1278
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Месна фасцикла „%s“\n"
@@ -4365,31 +4662,31 @@ msgstr ""
 "Балса тренутно шаље поруку.\n"
 "Да прекинем слање?"
 
-#: ../src/main-window.c:444
+#: ../src/main-window.c:445
 msgid "Subject or Sender Contains:"
 msgstr "Тема или пошиљалац садрже:"
 
-#: ../src/main-window.c:445
+#: ../src/main-window.c:446
 msgid "Subject or Recipient Contains:"
 msgstr "Тема или прималац садрже:"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:447
 msgid "Subject Contains:"
 msgstr "Тема садржи:"
 
-#: ../src/main-window.c:447
+#: ../src/main-window.c:448
 msgid "Body Contains:"
 msgstr "Тело поруке садржи:"
 
-#: ../src/main-window.c:448
+#: ../src/main-window.c:449
 msgid "Older than (days):"
 msgstr "Старије од (у данима):"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:450
 msgid "Old at most (days):"
 msgstr "Старо барем (у данима):"
 
-#: ../src/main-window.c:965
+#: ../src/main-window.c:964
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <danilo prevod org>\n"
@@ -4399,29 +4696,30 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: ../src/main-window.c:976
+#: ../src/main-window.c:975
 msgid "The Balsa email client is part of the GNOME desktop environment."
-msgstr "Програм за ел-пошту, Балса, је део Гномовог радног окружења."
+msgstr "Програм за е-пошту, Балса, је део Гномовог радног окружења."
 
 #. license ?
-#: ../src/main-window.c:981
+#: ../src/main-window.c:980
 msgid "About Balsa"
 msgstr "О Балси"
 
-#: ../src/main-window.c:1003
-msgid "Balsa closes files and connections.Please wait..."
-msgstr "Балса је затворила датотеке и везе. Сачекајте..."
+#: ../src/main-window.c:1002
+#| msgid "Balsa closes files and connections.Please wait..."
+msgid "Balsa closes files and connections. Please wait…"
+msgstr "Балса је затворила датотеке и везе. Сачекајте…"
 
-#: ../src/main-window.c:1396
+#: ../src/main-window.c:1393
 msgid "You can apply filters only on mailbox\n"
 msgstr "Пропуснике можете применити само на сандуче\n"
 
-#: ../src/main-window.c:1416
+#: ../src/main-window.c:1413
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Нисам успео да уклоним дупликате: %s"
 
-#: ../src/main-window.c:1422
+#: ../src/main-window.c:1419
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
@@ -4430,11 +4728,11 @@ msgstr[1] "Уклонио сам %d дупликата"
 msgstr[2] "Уклонио сам %d дупликата"
 msgstr[3] "Уклонио сам један дупликат"
 
-#: ../src/main-window.c:1427
+#: ../src/main-window.c:1424
 msgid "No duplicates found"
 msgstr "Нисам пронашао дупликате"
 
-#: ../src/main-window.c:2915
+#: ../src/main-window.c:2912
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -4443,36 +4741,37 @@ msgstr ""
 "Не могу да отворим сандуче!\n"
 "%s."
 
-#: ../src/main-window.c:2950
+#: ../src/main-window.c:2947
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам %s"
 
-#: ../src/main-window.c:3253 ../src/main-window.c:3272
-msgid "Checking Mail..."
-msgstr "Проверавам пошту..."
+#: ../src/main-window.c:3250 ../src/main-window.c:3268
+#| msgid "Checking Mail..."
+msgid "Checking Mail…"
+msgstr "Проверавам пошту…"
 
-#: ../src/main-window.c:3412
+#: ../src/main-window.c:3408
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "ИМАП сандуче: %s"
 
-#: ../src/main-window.c:3416
+#: ../src/main-window.c:3412
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Месно сандуче: %s"
 
-#: ../src/main-window.c:3580
+#: ../src/main-window.c:3576
 msgid "Finished Checking."
 msgstr "Провера је завршена."
 
-#: ../src/main-window.c:3645
+#: ../src/main-window.c:3641
 #, c-format
 msgid "Sending error: %s"
 msgstr "Грешка при слању: %s"
 
 # bug: plural-forms
-#: ../src/main-window.c:3709
+#: ../src/main-window.c:3705
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -4481,73 +4780,74 @@ msgstr[1] "Примили сте %d нове поруке."
 msgstr[2] "Примили сте %d нових порука."
 msgstr[3] "Примили сте једну нову поруку."
 
-#: ../src/main-window.c:3712
+#: ../src/main-window.c:3708
 msgid "You have new mail."
 msgstr "Имате нову пошту."
 
-#: ../src/main-window.c:3780 ../src/main-window.c:3816
+#: ../src/main-window.c:3776 ../src/main-window.c:3811
 msgid "Balsa: New mail"
 msgstr "Балса: Нова пошта"
 
-#: ../src/main-window.c:3940
+#: ../src/main-window.c:3934
 msgid "Search mailbox"
 msgstr "Претражи сандуче"
 
-#: ../src/main-window.c:3964
+#: ../src/main-window.c:3958
 msgid "_Search for:"
 msgstr "_Претражи:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3977
+#: ../src/main-window.c:3971
 msgid "In:"
 msgstr "У:"
 
-#: ../src/main-window.c:3989
+#: ../src/main-window.c:3983
 msgid "S_ubject"
 msgstr "Т_ема"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3994
+#: ../src/main-window.c:3988
 msgid "Show only matching messages"
 msgstr "Прикажи само одговарајуће поруке"
 
 #. Frame with OK button
-#: ../src/main-window.c:4015
+#: ../src/main-window.c:4009
 msgid "Open next matching message"
 msgstr "Отвори следећу одговарајућу поруку"
 
-#: ../src/main-window.c:4027
+#: ../src/main-window.c:4021
 msgid "_Reverse search"
 msgstr "_Обрнута претрага"
 
-#: ../src/main-window.c:4032
+#: ../src/main-window.c:4026
 msgid "_Wrap around"
 msgstr "_Преламај унаоколо"
 
-#: ../src/main-window.c:4250
+#: ../src/main-window.c:4244
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Не могу да отворим смеће: %s"
 
-#: ../src/main-window.c:4385
+#: ../src/main-window.c:4381
 #, c-format
-msgid "Balsa: %s (readonly)"
+#| msgid "Balsa: %s (readonly)"
+msgid "Balsa: %s (read-only)"
 msgstr "Балса: %s (само за читање)"
 
-#: ../src/main-window.c:4387
+#: ../src/main-window.c:4383
 #, c-format
 msgid "Balsa: %s"
 msgstr "Балса: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4884
+#: ../src/main-window.c:4880
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Прикажи сандуче: %s "
 
-#: ../src/main-window.c:4889
+#: ../src/main-window.c:4885
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
@@ -4556,7 +4856,7 @@ msgstr[1] "са %d поруке"
 msgstr[2] "са %d порука"
 msgstr[3] "са једном поруком"
 
-#: ../src/main-window.c:4896
+#: ../src/main-window.c:4892
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -4565,7 +4865,7 @@ msgstr[1] ", %d нове"
 msgstr[2] ", %d нових"
 msgstr[3] ", једна нова"
 
-#: ../src/main-window.c:4903
+#: ../src/main-window.c:4899
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -4574,304 +4874,310 @@ msgstr[1] ", %d скривене"
 msgstr[2] ", %d скривених"
 msgstr[3] ", једна скривена"
 
-#: ../src/main-window.c:4948
+#: ../src/main-window.c:4944
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Следећа непрочитана порука је у %s"
 
-#: ../src/main-window.c:4955
+#: ../src/main-window.c:4951
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Да ли желите да изаберете „%s“?"
 
-#: ../src/main.c:126 ../src/main.c:131 ../src/main.c:137 ../src/main.c:143
-#: ../src/main.c:149
+#: ../src/main.c:124 ../src/main.c:129 ../src/main.c:135 ../src/main.c:141
+#: ../src/main.c:147
 #, c-format
-msgid "Balsa cannot open your \"%s\" mailbox."
+#| msgid "Balsa cannot open your \"%s\" mailbox."
+msgid "Balsa cannot open your “%s” mailbox."
 msgstr "Балса не може да отвори ваше сандуче „%s“."
 
-#: ../src/main.c:126
+#: ../src/main.c:124
 msgid "Inbox"
 msgstr "Примљене"
 
-#: ../src/main.c:132
+#: ../src/main.c:130
 msgid "Outbox"
 msgstr "Послате"
 
-#: ../src/main.c:138
+#: ../src/main.c:136
 msgid "Sentbox"
 msgstr "За слање"
 
-#: ../src/main.c:144
+#: ../src/main.c:142
 msgid "Draftbox"
 msgstr "Нацрти"
 
-#: ../src/main.c:149
+#: ../src/main.c:147
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../src/main.c:403
-msgid "Compressing mail folders..."
-msgstr "Пакујем фасцикле поште..."
+#: ../src/main.c:401
+#| msgid "Compressing mail folders..."
+msgid "Compressing mail folders…"
+msgstr "Пакујем фасцикле поште…"
 
-#: ../src/main.c:657
-msgid "Get new mail on startup"
+#: ../src/main.c:665
+#| msgid "Get new mail on startup"
+msgid "Get new mail on start-up"
 msgstr "Преузима нове поруке при покретању"
 
-#: ../src/main.c:659
+#: ../src/main.c:667
 msgid "Compose a new email to EMAIL@ADDRESS"
-msgstr "Саставља нову поруку за „АДРЕСА@ЕЛ.ПОШТЕ“"
+msgstr "Саставља нову поруку за „АДРЕСА@Е-ПОШТЕ“"
 
-#: ../src/main.c:661
+#: ../src/main.c:669
 msgid "Attach file at URI"
 msgstr "Прилаже датотеку из путање"
 
-#: ../src/main.c:664
+#: ../src/main.c:672
 msgid "Opens MAILBOXNAME"
 msgstr "Отвара НАЗИВСАНДУЧЕТА"
 
-#: ../src/main.c:664
+#: ../src/main.c:672
 msgid "MAILBOXNAME"
 msgstr "НАЗИВСАНДУЧЕТА"
 
-#: ../src/main.c:667
+#: ../src/main.c:675
 msgid "Opens first unread mailbox"
 msgstr "Отвара прво непрочитано сандуче"
 
-#: ../src/main.c:670
-msgid "Opens default Inbox on startup"
+#: ../src/main.c:678
+#| msgid "Opens default Inbox on startup"
+msgid "Opens default Inbox on start-up"
 msgstr "Отвара основно сандуче „долазно“ при покретању"
 
-#: ../src/main.c:673
+#: ../src/main.c:681
 msgid "Prints number unread and unsent messages"
 msgstr "Исписује број непрочитаних и непослатих порука"
 
-#: ../src/main.c:675
+#: ../src/main.c:683
 msgid "Debug POP3 connection"
 msgstr "Поправља ПОП3 везу"
 
-#: ../src/main.c:677
+#: ../src/main.c:685
 msgid "Debug IMAP connection"
 msgstr "Поправља ИМАП везу"
 
-#: ../src/main.c:678
-#| msgid "Other options"
+#: ../src/main.c:686
 msgid "Show help options"
 msgstr "Приказује опције помоћи"
 
-#: ../src/main.c:679
-#| msgid "Show icon"
+#: ../src/main.c:687
 msgid "Show version"
 msgstr "Приказује издање"
 
-#: ../src/message-window.c:305
+#: ../src/message-window.c:303
 msgid "M_ove"
 msgstr "Пре_мести"
 
-#: ../src/message-window.c:747
+#: ../src/message-window.c:748
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Поруку шаље %s: %s"
 
-#: ../src/pref-manager.c:389
+#: ../src/pref-manager.c:372
 msgid "While retrieving messages"
 msgstr "Приликом преузимања порука"
 
-#: ../src/pref-manager.c:390
+#: ../src/pref-manager.c:373
 msgid "Until closed"
 msgstr "Док се не затвори"
 
-#: ../src/pref-manager.c:396
+#: ../src/pref-manager.c:379
 msgid "Message number"
 msgstr "Број поруке"
 
-#: ../src/pref-manager.c:400
+#: ../src/pref-manager.c:383
 msgid "Sender"
 msgstr "Пошиљалац"
 
-#: ../src/pref-manager.c:404
+#: ../src/pref-manager.c:387
 msgid "Flat"
 msgstr "Равно"
 
-#: ../src/pref-manager.c:406
+#: ../src/pref-manager.c:389
 msgid "JWZ"
 msgstr "Напредно"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:502
+#: ../src/pref-manager.c:485
 msgid "Balsa Preferences"
 msgstr "Поставке Балсе"
 
-#: ../src/pref-manager.c:555
+#: ../src/pref-manager.c:538
 msgid "Mail options"
 msgstr "Избори поште"
 
-#: ../src/pref-manager.c:557
+#: ../src/pref-manager.c:540
 msgid "Display options"
 msgstr "Опције приказа"
 
-#: ../src/pref-manager.c:559 ../src/pref-manager.c:2811
+#: ../src/pref-manager.c:542 ../src/pref-manager.c:2794
 msgid "Address books"
 msgstr "Адресари"
 
-#: ../src/pref-manager.c:563 ../src/toolbar-factory.c:166
+#: ../src/pref-manager.c:546 ../src/toolbar-factory.c:164
 msgid "Spelling"
 msgstr "Правопис"
 
-#: ../src/pref-manager.c:567
-msgid "Startup"
+#: ../src/pref-manager.c:550
+#| msgid "Startup"
+msgid "Start-up"
 msgstr "Покретање"
 
-#: ../src/pref-manager.c:569 ../src/pref-manager.c:2601
+#: ../src/pref-manager.c:552 ../src/pref-manager.c:2584
 msgid "Miscellaneous"
 msgstr "Разно"
 
-#: ../src/pref-manager.c:1386
+#: ../src/pref-manager.c:1373
 #, c-format
 msgid "%s (default)"
 msgstr "%s (основно)"
 
-#: ../src/pref-manager.c:1652
+#: ../src/pref-manager.c:1637
 msgid "Remote mailbox servers"
 msgstr "Удаљени сервери за пошту"
 
-#: ../src/pref-manager.c:1673 ../src/pref-manager.c:2832
-#: ../src/sendmsg-window.c:2656
+#: ../src/pref-manager.c:1658 ../src/pref-manager.c:2815
+#: ../src/sendmsg-window.c:2670
 msgid "Type"
 msgstr "Врста"
 
-#: ../src/pref-manager.c:1681
+#: ../src/pref-manager.c:1666
 msgid "Mailbox name"
 msgstr "Назив сандучета"
 
-#: ../src/pref-manager.c:1701 ../src/pref-manager.c:1774
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:1686 ../src/pref-manager.c:1758
+#: ../src/pref-manager.c:2858
 msgid "_Modify"
 msgstr "_Измени"
 
-#: ../src/pref-manager.c:1715
+#: ../src/pref-manager.c:1700
 msgid "Local mail directory"
 msgstr "Месни директоријум поште"
 
-#: ../src/pref-manager.c:1717
+#: ../src/pref-manager.c:1702
 msgid "Select your local mail directory"
 msgstr "Изаберите ваш месни директоријум поште"
 
-#: ../src/pref-manager.c:1738
+#: ../src/pref-manager.c:1722
 msgid "Outgoing mail servers"
 msgstr "Сервер одлазне поште"
 
-#: ../src/pref-manager.c:1760
+#: ../src/pref-manager.c:1744
 msgid "Server name"
 msgstr "Назив сервера"
 
-#: ../src/pref-manager.c:1800
+#: ../src/pref-manager.c:1783
 msgid "Mail servers"
 msgstr "Сервери поште"
 
-#: ../src/pref-manager.c:1802
+#: ../src/pref-manager.c:1785
 msgid "Incoming"
 msgstr "Долазна"
 
-#: ../src/pref-manager.c:1804
+#: ../src/pref-manager.c:1787
 msgid "Outgoing"
 msgstr "Одлазна"
 
-#: ../src/pref-manager.c:1831
+#: ../src/pref-manager.c:1814
 msgid "Checking"
 msgstr "Проверавам"
 
-#: ../src/pref-manager.c:1837
+#: ../src/pref-manager.c:1820
 msgid "_Check mail automatically every"
 msgstr "_Проверавај пошту сваких"
 
-#: ../src/pref-manager.c:1846 ../src/pref-manager.c:2624
-#: ../src/pref-manager.c:2683
+#: ../src/pref-manager.c:1829 ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2666
 msgid "minutes"
 msgstr "минута"
 
-#: ../src/pref-manager.c:1852
+#: ../src/pref-manager.c:1835
 msgid "Check _IMAP mailboxes"
 msgstr "Провери _ИМАП сандучиће"
 
-#: ../src/pref-manager.c:1857
-msgid "Check INBOX _only"
+#: ../src/pref-manager.c:1840
+#| msgid "Check INBOX _only"
+msgid "Check Inbox _only"
 msgstr "Провери _само сандуче „Долазна“"
 
-#: ../src/pref-manager.c:1863
+#: ../src/pref-manager.c:1846
 msgid "When mail arrives:"
 msgstr "Када пошта стигне:"
 
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:1851
 msgid "Display message"
 msgstr "Прикажи поруку"
 
-#: ../src/pref-manager.c:1873
+#: ../src/pref-manager.c:1856
 msgid "Play sound"
 msgstr "Пусти звук"
 
-#: ../src/pref-manager.c:1878
+#: ../src/pref-manager.c:1861
 msgid "Show icon"
 msgstr "Прикажи иконицу"
 
-#: ../src/pref-manager.c:1886
+#: ../src/pref-manager.c:1869
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Тихо провери у позадини (без порука у траци стања)"
 
-#: ../src/pref-manager.c:1890
+#: ../src/pref-manager.c:1873
 msgid "_POP message size limit:"
 msgstr "Ограничење величине _ПОП поруке:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1916
+#: ../src/pref-manager.c:1899
 msgid "Quoted and flowed text"
 msgstr "Цитирани и укључени текст"
 
-#: ../src/pref-manager.c:1921
+#: ../src/pref-manager.c:1904
 msgid "Mark quoted text"
 msgstr "Означи цитирани текст"
 
-#: ../src/pref-manager.c:1925
+#: ../src/pref-manager.c:1908
 msgid "Quoted text regular expression:"
 msgstr "Регуларни израз цитираног текста:"
 
-#: ../src/pref-manager.c:1933
+#: ../src/pref-manager.c:1916
 msgid "Wrap text at"
 msgstr "Преломи текст на"
 
-#: ../src/pref-manager.c:1941 ../src/pref-manager.c:2094
+#: ../src/pref-manager.c:1924 ../src/pref-manager.c:2077
 msgid "characters"
 msgstr "знакова"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1956
+#: ../src/pref-manager.c:1939
 msgid "Display of multipart/alternative parts"
 msgstr "Приказ делова вишеделних порука"
 
-#: ../src/pref-manager.c:1959
-msgid "Prefer text/plain over html"
-msgstr "Предност обичног текста над хтмл-ом"
+#: ../src/pref-manager.c:1942
+#| msgid "Prefer text/plain over html"
+msgid "Prefer text/plain over HTML"
+msgstr "Предност обичног текста над ХТМЛ-ом"
 
-#: ../src/pref-manager.c:1975
+#: ../src/pref-manager.c:1958
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Национални (8-битни) знакови у неисправним порукама без ознаке кодирања"
 
-#: ../src/pref-manager.c:1982
-msgid "display as \"?\""
+#: ../src/pref-manager.c:1965
+#| msgid "display as \"?\""
+msgid "display as “?”"
 msgstr "прикажи као „?“"
 
-#: ../src/pref-manager.c:1990
+#: ../src/pref-manager.c:1973
 msgid "display in codeset"
 msgstr "прикажи у кодном скупу"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:2017
+#: ../src/pref-manager.c:2000
 msgid "Message disposition notification requests"
 msgstr "Захтеви за обавештење о приспећу поруке"
 
-#: ../src/pref-manager.c:2019
+#: ../src/pref-manager.c:2002
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -4879,231 +5185,235 @@ msgstr ""
 "Када примим поруку за коју пошиљалац захтева обавештење о доспећу поруке, "
 "пошаљи ако:"
 
-#: ../src/pref-manager.c:2031
+#: ../src/pref-manager.c:2014
+#| msgid ""
+#| "The message header looks clean (the notify-to address is the return path, "
+#| "and I am in the \"To:\" or \"Cc:\" list)."
 msgid ""
 "The message header looks clean (the notify-to address is the return path, "
-"and I am in the \"To:\" or \"Cc:\" list)."
+"and I am in the “To:” or “CC:” list)."
 msgstr ""
 "Заглавље поруке изгледа чисто (адреса за обавештавање је повратна адреса, а "
 "ја сам на списку прималаца)."
 
-#: ../src/pref-manager.c:2045
+#: ../src/pref-manager.c:2028
 msgid "The message header looks suspicious."
 msgstr "Заглавље поруке изгледа сумњиво."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2062
 msgid "Word wrap"
 msgstr "Прелом речи"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:2067
 msgid "Wrap outgoing text at"
 msgstr "Преломи текст на"
 
-#: ../src/pref-manager.c:2107
+#: ../src/pref-manager.c:2090
 msgid "Other options"
 msgstr "Остали избори"
 
-#: ../src/pref-manager.c:2112
+#: ../src/pref-manager.c:2095
 msgid "Reply prefix:"
 msgstr "Префикс одговора:"
 
-#: ../src/pref-manager.c:2115
+#: ../src/pref-manager.c:2098
 msgid "Automatically quote original when replying"
 msgstr "Сам цитирај извор при одговарању"
 
-#: ../src/pref-manager.c:2118
+#: ../src/pref-manager.c:2101
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Проследи поруку као прилог уместо да је цитираш"
 
-#: ../src/pref-manager.c:2121
+#: ../src/pref-manager.c:2104
 msgid "Copy outgoing messages to sentbox"
 msgstr "Умножи одлазеће поруке у „Послато“"
 
-#: ../src/pref-manager.c:2123
+#: ../src/pref-manager.c:2106
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Дугме за слање увек смешта поруку у „Одлазно“"
 
-#: ../src/pref-manager.c:2126
+#: ../src/pref-manager.c:2109
 msgid "Edit headers in external editor"
 msgstr "Измени заглавља у спољашњем уређивачу"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2111
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Укључи ХТМЛ делове као текст при одговарању или прослеђивању"
 
-#: ../src/pref-manager.c:2145
+#: ../src/pref-manager.c:2128
 msgid "Layout"
 msgstr "Распоред"
 
-#: ../src/pref-manager.c:2147
+#: ../src/pref-manager.c:2130
 msgid "Sort and thread"
 msgstr "Поређај и утемачи"
 
-#: ../src/pref-manager.c:2149 ../src/print-gtk.c:499
+#: ../src/pref-manager.c:2132 ../src/print-gtk.c:497
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/pref-manager.c:2151
+#: ../src/pref-manager.c:2134
 msgid "Colors"
 msgstr "Боје"
 
-#: ../src/pref-manager.c:2153 ../src/pref-manager.c:2240
+#: ../src/pref-manager.c:2136 ../src/pref-manager.c:2223
 msgid "Format"
 msgstr "Облик"
 
-#: ../src/pref-manager.c:2155
+#: ../src/pref-manager.c:2138
 msgid "Status messages"
 msgstr "Поруке о стању"
 
-#: ../src/pref-manager.c:2180 ../src/toolbar-prefs.c:173
+#: ../src/pref-manager.c:2163 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Главни прозор"
 
-#: ../src/pref-manager.c:2183
+#: ../src/pref-manager.c:2166
 msgid "Use preview pane"
 msgstr "Користи површ за преглед"
 
-#: ../src/pref-manager.c:2185
+#: ../src/pref-manager.c:2168
 msgid "Show mailbox statistics in left pane"
 msgstr "Прикажи статистику сандучета на левој површи"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2172
 msgid "Automatically view message when mailbox opened"
 msgstr "Сам прикажи поруку чим се отвори сандуче"
 
-#: ../src/pref-manager.c:2192
+#: ../src/pref-manager.c:2175
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr "Питај ме пре него изабереш друго сандуче за приказ непрочитане поруке"
 
-#: ../src/pref-manager.c:2198
-msgid "PageUp/PageDown keys scroll text by"
+#: ../src/pref-manager.c:2181
+#| msgid "PageUp/PageDown keys scroll text by"
+msgid "Page Up/Page Down keys scroll text by"
 msgstr "Тастерима „Страница горе/Страница доле“ померај текст за"
 
-#: ../src/pref-manager.c:2206
+#: ../src/pref-manager.c:2189
 msgid "percent"
 msgstr "процента"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2203
 msgid "Display progress dialog"
 msgstr "Прикажи прозорче напредовања"
 
-#: ../src/pref-manager.c:2245
+#: ../src/pref-manager.c:2228
 msgid "Date encoding (for strftime):"
 msgstr "Запис датума (за „strftime“):"
 
-#: ../src/pref-manager.c:2247
+#: ../src/pref-manager.c:2230
 msgid "Selected headers:"
 msgstr "Изабрана заглавља:"
 
-#: ../src/pref-manager.c:2269
+#: ../src/pref-manager.c:2252
 msgid "Information messages"
 msgstr "Поруке обавештења"
 
-#: ../src/pref-manager.c:2274
+#: ../src/pref-manager.c:2257
 msgid "Information messages:"
 msgstr "Поруке обавештења:"
 
-#: ../src/pref-manager.c:2278
+#: ../src/pref-manager.c:2261
 msgid "Warning messages:"
 msgstr "Поруке упозорења:"
 
-#: ../src/pref-manager.c:2282
+#: ../src/pref-manager.c:2265
 msgid "Error messages:"
 msgstr "Поруке грешака:"
 
-#: ../src/pref-manager.c:2286
+#: ../src/pref-manager.c:2269
 msgid "Fatal error messages:"
 msgstr "Поруке кобних грешака:"
 
-#: ../src/pref-manager.c:2290
+#: ../src/pref-manager.c:2273
 msgid "Debug messages:"
 msgstr "Поруке о поправљању:"
 
-#: ../src/pref-manager.c:2315
+#: ../src/pref-manager.c:2298
 msgid "Message colors"
 msgstr "Боје порука"
 
-#: ../src/pref-manager.c:2321
+#: ../src/pref-manager.c:2304
 #, c-format
 msgid "Quote level %d color"
 msgstr "Боја %d. нивоа цитирања"
 
-#: ../src/pref-manager.c:2334
+#: ../src/pref-manager.c:2317
 msgid "Link color"
 msgstr "Боја везе"
 
-#: ../src/pref-manager.c:2336
+#: ../src/pref-manager.c:2319
 msgid "Hyperlink color"
 msgstr "Боја хипервезе"
 
-#: ../src/pref-manager.c:2422 ../src/print-gtk.c:508
+#: ../src/pref-manager.c:2405 ../src/print-gtk.c:506
 msgid "Fonts"
 msgstr "Слова"
 
-#: ../src/pref-manager.c:2428
+#: ../src/pref-manager.c:2411
 msgid "Use system fonts"
 msgstr "Користи словни лик са система"
 
-#: ../src/pref-manager.c:2436
+#: ../src/pref-manager.c:2419
 msgid "Message font:"
 msgstr "Слова поруке:"
 
-#: ../src/pref-manager.c:2443
+#: ../src/pref-manager.c:2426
 msgid "Subject font:"
 msgstr "Слова теме:"
 
-#: ../src/pref-manager.c:2451
+#: ../src/pref-manager.c:2434
 msgid "Use default font size"
 msgstr "Користи основну величину слова"
 
-#: ../src/pref-manager.c:2507
+#: ../src/pref-manager.c:2490
 msgid "Sorting and threading"
 msgstr "Ређање и темачење"
 
-#: ../src/pref-manager.c:2511
+#: ../src/pref-manager.c:2494
 msgid "Default sort column:"
 msgstr "Основна колона ређања:"
 
-#: ../src/pref-manager.c:2515
+#: ../src/pref-manager.c:2498
 msgid "Default threading style:"
 msgstr "Основни приказ нити:"
 
-#: ../src/pref-manager.c:2520
+#: ../src/pref-manager.c:2503
 msgid "Expand threads on open"
 msgstr "Рашири нити приликом отварања"
 
-#: ../src/pref-manager.c:2573
+#: ../src/pref-manager.c:2556
 msgid "Miscellaneous spelling settings"
 msgstr "Разна подешавања правописа"
 
-#: ../src/pref-manager.c:2575
+#: ../src/pref-manager.c:2558
 msgid "Check signature"
 msgstr "Провери потпис"
 
-#: ../src/pref-manager.c:2576
+#: ../src/pref-manager.c:2559
 msgid "Check quoted"
 msgstr "Провери цитирано"
 
-#: ../src/pref-manager.c:2603
+#: ../src/pref-manager.c:2586
 msgid "Debug"
 msgstr "Поправи"
 
-#: ../src/pref-manager.c:2604
+#: ../src/pref-manager.c:2587
 msgid "Empty trash on exit"
 msgstr "Испразни смеће при изласку"
 
-#: ../src/pref-manager.c:2611
+#: ../src/pref-manager.c:2594
 msgid "Close mailbox if unused more than"
 msgstr "Сам затвори сандуче ако се не користи више од"
 
-#: ../src/pref-manager.c:2639
+#: ../src/pref-manager.c:2622
 msgid "Deleting messages"
 msgstr "Брисање порука"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2644
+#: ../src/pref-manager.c:2627
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5113,181 +5423,187 @@ msgstr ""
 "употребом Мејлбокс %s скривање порука:"
 
 # bug: plural-forms
-#: ../src/pref-manager.c:2656
+#: ../src/pref-manager.c:2639
 msgid "Hide messages marked as deleted"
 msgstr "Скривене поруке означене као обрисане"
 
-#: ../src/pref-manager.c:2658
+#: ../src/pref-manager.c:2641
 msgid "The following settings are global:"
 msgstr "Следећа подешавања су општа:"
 
-#: ../src/pref-manager.c:2664
+#: ../src/pref-manager.c:2647
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Избаци обрисане поруке приликом затварања сандучета"
 
-#: ../src/pref-manager.c:2671
-msgid "...and if unused more than"
-msgstr "...и ако се не користи више од"
+#: ../src/pref-manager.c:2654
+#| msgid "...and if unused more than"
+msgid "…and if unused more than"
+msgstr "…и ако се не користи више од"
 
-#: ../src/pref-manager.c:2695 ../src/toolbar-prefs.c:195
+#: ../src/pref-manager.c:2678 ../src/toolbar-prefs.c:192
 msgid "Message window"
 msgstr "Прозор поруке"
 
-#: ../src/pref-manager.c:2700
+#: ../src/pref-manager.c:2683
 msgid "After moving a message:"
 msgstr "Након премештања поруке:"
 
-#: ../src/pref-manager.c:2726
-msgid "Startup options"
+#: ../src/pref-manager.c:2709
+#| msgid "Startup options"
+msgid "Start-up options"
 msgstr "Опције покретања"
 
-#: ../src/pref-manager.c:2729
-msgid "Open Inbox upon startup"
+#: ../src/pref-manager.c:2712
+#| msgid "Open Inbox upon startup"
+msgid "Open Inbox upon start-up"
 msgstr "Отвори „Долазно“ при покретању"
 
-#: ../src/pref-manager.c:2731
-msgid "Check mail upon startup"
+#: ../src/pref-manager.c:2714
+#| msgid "Check mail upon startup"
+msgid "Check mail upon start-up"
 msgstr "Провери пошту при покретању"
 
-#: ../src/pref-manager.c:2733
+#: ../src/pref-manager.c:2716
 msgid "Remember open mailboxes between sessions"
 msgstr "Запамти отворене сандучиће између две сесије"
 
-#: ../src/pref-manager.c:2747
+#: ../src/pref-manager.c:2730
 msgid "Folder scanning"
 msgstr "Прегледање фасцикле"
 
-#: ../src/pref-manager.c:2749
+#: ../src/pref-manager.c:2732
+#| msgid ""
+#| "Choose depth 1 for fast startup; this defers scanning some folders.  To "
+#| "see more of the tree at startup, choose a greater depth."
 msgid ""
-"Choose depth 1 for fast startup; this defers scanning some folders.  To see "
-"more of the tree at startup, choose a greater depth."
+"Choose depth 1 for fast start-up; this defers scanning some folders. To see "
+"more of the tree at start-up, choose a greater depth."
 msgstr ""
 "Изаберите дубину 1 за брже покретање; ово одлаже претрагу неких фасцикли. Да "
 "видите више при покретању, изаберите већу дубину."
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2743
 msgid "Scan local folders to depth"
 msgstr "Прегледај месне фасцикле до дубине"
 
-#: ../src/pref-manager.c:2772
+#: ../src/pref-manager.c:2755
 msgid "Scan IMAP folders to depth"
 msgstr "Прегледај ИМАП фасцикле до дубине"
 
-#: ../src/pref-manager.c:2840
+#: ../src/pref-manager.c:2823
 msgid "Address book name"
 msgstr "Име адресара"
 
-#: ../src/pref-manager.c:2848
+#: ../src/pref-manager.c:2831
 msgid "Auto-complete"
 msgstr "Сам доврши"
 
-#: ../src/pref-manager.c:2881
+#: ../src/pref-manager.c:2864
 msgid "_Set as default"
 msgstr "_Постави као основно"
 
-#: ../src/pref-manager.c:3188
-msgid "Remote POP3 mailbox..."
-msgstr "Удаљено ПОП3 сандуче..."
+#: ../src/pref-manager.c:3165
+#| msgid "Remote POP3 mailbox..."
+msgid "Remote POP3 mailbox…"
+msgstr "Удаљено ПОП3 сандуче…"
 
-#: ../src/pref-manager.c:3192
-msgid "Remote IMAP mailbox..."
-msgstr "Удаљено ИМАП сандуче..."
+#: ../src/pref-manager.c:3169
+#| msgid "Remote IMAP mailbox..."
+msgid "Remote IMAP mailbox…"
+msgstr "Удаљено ИМАП сандуче…"
 
-#: ../src/pref-manager.c:3196
-msgid "Remote IMAP folder..."
-msgstr "Удаљена ИМАП фасцикла..."
+#: ../src/pref-manager.c:3173
+#| msgid "Remote IMAP folder"
+msgid "Remote IMAP folder…"
+msgstr "Удаљена фасцикла ИМАП-а…"
 
-#: ../src/pref-manager.c:3315
+#: ../src/pref-manager.c:3292
 msgid "Show nothing"
 msgstr "не приказуј ништа"
 
-#: ../src/pref-manager.c:3317
+#: ../src/pref-manager.c:3294
 msgid "Show dialog"
 msgstr "прикажи прозорче"
 
-#: ../src/pref-manager.c:3319
+#: ../src/pref-manager.c:3296
 msgid "Show in list"
 msgstr "прикажи у списку"
 
-#: ../src/pref-manager.c:3321
+#: ../src/pref-manager.c:3298
 msgid "Show in status bar"
 msgstr "прикажи на траци стања"
 
-#: ../src/pref-manager.c:3323
+#: ../src/pref-manager.c:3300
 msgid "Print to console"
 msgstr "испиши у конзоли"
 
-#: ../src/pref-manager.c:3335
+#: ../src/pref-manager.c:3312
 msgid "Ask me"
 msgstr "питај ме"
 
-#: ../src/pref-manager.c:3467
+#: ../src/pref-manager.c:3444
 msgid "Default layout"
 msgstr "Основни распоред"
 
-#: ../src/pref-manager.c:3468
+#: ../src/pref-manager.c:3445
 msgid "Wide message layout"
 msgstr "Широки приказ поруке"
 
-#: ../src/pref-manager.c:3469
+#: ../src/pref-manager.c:3446
 msgid "Wide screen layout"
 msgstr "Широки приказ екрана"
 
-#: ../src/pref-manager.c:3477
+#: ../src/pref-manager.c:3454
 msgid "Show next unread message"
 msgstr "Прикажи следећу непрочитану поруку"
 
-#: ../src/pref-manager.c:3478
+#: ../src/pref-manager.c:3455
 msgid "Show next message"
 msgstr "Прикажи следећу поруку"
 
-#: ../src/pref-manager.c:3479
+#: ../src/pref-manager.c:3456
 msgid "Close message window"
 msgstr "Затвори прозор поруке"
 
-#: ../src/pref-manager.c:3532
+#: ../src/pref-manager.c:3509
 #, c-format
 msgid "Error displaying %s: %s\n"
 msgstr "Грешка приказивања „%s“: %s\n"
 
-#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
+#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
+#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
 msgid "Signed and encrypted matter"
 msgstr "Потписана и шифрована садржина"
 
-#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
+#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
 msgid "Signed matter"
 msgstr "Потписана садржина"
 
-#: ../src/print-gtk.c:156
+#: ../src/print-gtk.c:154
 msgid "Encrypted matter"
 msgstr "Шифрована садржина"
 
-#: ../src/print-gtk.c:199
+#: ../src/print-gtk.c:197
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Ово је непосредно %s потписани %s део поруке:"
 
-#: ../src/print-gtk.c:201
+#: ../src/print-gtk.c:199
 msgid "OpenPGP"
 msgstr "ОпенПГП"
 
-#: ../src/print-gtk.c:354
+#: ../src/print-gtk.c:352
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
-msgstr[0] ""
-"Не могу да штампам %d. страницу зато што документ има само %d страницу."
-msgstr[1] ""
-"Не могу да штампам %d. страницу зато што документ има само %d странице."
-msgstr[2] ""
-"Не могу да штампам %d. страницу зато што документ има само %d страница."
-msgstr[3] ""
-"Не могу да штампам %d. страницу зато што документ има само једну страницу."
+msgstr[0] "Не могу да штампам %d. страницу зато што документ има само %d страницу."
+msgstr[1] "Не могу да штампам %d. страницу зато што документ има само %d странице."
+msgstr[2] "Не могу да штампам %d. страницу зато што документ има само %d страница."
+msgstr[3] "Не могу да штампам %d. страницу зато што документ има само једну страницу."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -5295,72 +5611,72 @@ msgstr[3] ""
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:392
+#: ../src/print-gtk.c:390
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:448
+#: ../src/print-gtk.c:446
 msgid "inch"
 msgstr "инч"
 
-#: ../src/print-gtk.c:455
+#: ../src/print-gtk.c:453
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:529
+#: ../src/print-gtk.c:527
 msgid "_Header Font:"
 msgstr "Слова _заглавља:"
 
-#: ../src/print-gtk.c:532
+#: ../src/print-gtk.c:530
 msgid "B_ody Font:"
 msgstr "Слова _садржаја:"
 
-#: ../src/print-gtk.c:535
+#: ../src/print-gtk.c:533
 msgid "_Footer Font:"
 msgstr "Слова _подножја:"
 
-#: ../src/print-gtk.c:542
+#: ../src/print-gtk.c:540
 msgid "Highlighting"
 msgstr "Истицање"
 
-#: ../src/print-gtk.c:557
+#: ../src/print-gtk.c:555
 msgid "Highlight _cited text"
 msgstr "Истакни _цитирани текст"
 
-#: ../src/print-gtk.c:566
+#: ../src/print-gtk.c:564
 msgid "Highlight _structured phrases"
 msgstr "Истакни _сређене изразе"
 
-#: ../src/print-gtk.c:577
+#: ../src/print-gtk.c:575
 msgid "Margins"
 msgstr "Ивице"
 
-#: ../src/print-gtk.c:599
+#: ../src/print-gtk.c:597
 msgid "_Top"
 msgstr "_Горе"
 
-#: ../src/print-gtk.c:605
+#: ../src/print-gtk.c:603
 msgid "_Bottom"
 msgstr "_Доле"
 
-#: ../src/print-gtk.c:617
+#: ../src/print-gtk.c:615
 msgid "_Left"
 msgstr "_Лево"
 
-#: ../src/print-gtk.c:623
+#: ../src/print-gtk.c:621
 msgid "_Right"
 msgstr "_Десно"
 
-#: ../src/print-gtk.c:749
+#: ../src/print-gtk.c:747
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Грешка штампања поруке: %s"
 
-#: ../src/save-restore.c:594
+#: ../src/save-restore.c:587
 msgid "Error during filters loading: "
 msgstr "Грешка при учитавању филтера: "
 
-#: ../src/save-restore.c:596
+#: ../src/save-restore.c:589
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5369,28 +5685,35 @@ msgstr ""
 "Грешка при учитавању филтера: %s\n"
 "Пропусници су можда неисправни."
 
-#: ../src/save-restore.c:717
-msgid "The option not to recognize \"format=flowed\" text has been removed."
+#: ../src/save-restore.c:710
+#| msgid "The option not to recognize \"format=flowed\" text has been removed."
+msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr "Избор којим се занемарују поља „format=flowed“ је уклоњен."
 
-#: ../src/save-restore.c:996
+#: ../src/save-restore.c:986
+#| msgid ""
+#| "The option not to send \"format=flowed\" text is now on the Options menu "
+#| "of the compose window."
 msgid ""
-"The option not to send \"format=flowed\" text is now on the Options menu of "
+"The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
 msgstr ""
 "Избор којим се не шаље „format=flowed“ текст се сада налази у изборнику "
 "Избори прозора за писање порука."
 
-#: ../src/save-restore.c:1028
+#: ../src/save-restore.c:1018
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Избор за захтевање обавештења се сада налази у изборнику Избори прозора за "
 "писање порука."
 
-#: ../src/save-restore.c:1105
+#: ../src/save-restore.c:1095
+#| msgid ""
+#| "This version of Balsa uses a new user interface; if you have changed "
+#| "Balsa's keyboard accelerators, you will need to set them again."
 msgid ""
-"This version of Balsa uses a new user interface; if you have changed Balsa's "
+"This version of Balsa uses a new user interface; if you have changed Balsa’s "
 "keyboard accelerators, you will need to set them again."
 msgstr ""
 "Ово издање Балсе користи ново корисничко сучеље; ако сте изменили Балсине "
@@ -5508,7 +5831,6 @@ msgid "_Polish"
 msgstr "_пољски"
 
 #: ../src/sendmsg-window.c:211
-#| msgid "_Portugese"
 msgid "_Portuguese"
 msgstr "_португалски"
 
@@ -5574,8 +5896,11 @@ msgstr "(Без имена)"
 
 #: ../src/sendmsg-window.c:524
 #, c-format
+#| msgid ""
+#| "The message to '%s' is modified.\n"
+#| "Save message to Draftbox?"
 msgid ""
-"The message to '%s' is modified.\n"
+"The message to “%s” is modified.\n"
 "Save message to Draftbox?"
 msgstr ""
 "Порука за „%s“ је измењена.\n"
@@ -5589,12 +5914,18 @@ msgstr "Гномов уређивач текста није одређен у в
 msgid "Select Identity"
 msgstr "Изабери личност"
 
-#: ../src/sendmsg-window.c:1403
+#: ../src/sendmsg-window.c:1407
 #, c-format
+#| msgid ""
+#| "Saying yes will not send the file `%s' itself, but just a MIME message/"
+#| "external-body reference.  Note that the recipient must have proper "
+#| "permissions to see the `real' file.\n"
+#| "\n"
+#| "Do you really want to attach this file as reference?"
 msgid ""
-"Saying yes will not send the file `%s' itself, but just a MIME message/"
-"external-body reference.  Note that the recipient must have proper "
-"permissions to see the `real' file.\n"
+"Saying yes will not send the file “%s” itself, but just a MIME message/"
+"external-body reference. Note that the recipient must have proper "
+"permissions to see the “real” file.\n"
 "\n"
 "Do you really want to attach this file as reference?"
 msgstr ""
@@ -5604,76 +5935,85 @@ msgstr ""
 "\n"
 "Да ли заиста желите да приложите ову датотеку као позивање?"
 
-#: ../src/sendmsg-window.c:1416
+#: ../src/sendmsg-window.c:1420
 msgid "Attach as Reference?"
 msgstr "Приложи као позивање?"
 
-#: ../src/sendmsg-window.c:1537
-msgid "Choose charset"
+#: ../src/sendmsg-window.c:1541
+#| msgid "Choose charset"
+msgid "Choose character set"
 msgstr "Изаберите скуп знакова"
 
-#: ../src/sendmsg-window.c:1545
+#: ../src/sendmsg-window.c:1549
 #, c-format
+#| msgid ""
+#| "File\n"
+#| "%s\n"
+#| "is not encoded in US-ASCII or UTF-8.\n"
+#| "Please choose the charset used to encode the file."
 msgid ""
 "File\n"
 "%s\n"
 "is not encoded in US-ASCII or UTF-8.\n"
-"Please choose the charset used to encode the file."
+"Please choose the character set used to encode the file."
 msgstr ""
 "Датотека\n"
 "%s\n"
 "није кодирана у УС-АСКРИ или УТФ-8.\n"
 "Молим изаберите скуп знакова којим је кодирана ова датотека."
 
-#: ../src/sendmsg-window.c:1565
+#: ../src/sendmsg-window.c:1569
 msgid "Attach as MIME type:"
 msgstr "Приложи као МИМЕ врсту:"
 
-#: ../src/sendmsg-window.c:1626
+#: ../src/sendmsg-window.c:1630
 #, c-format
-msgid "Character set for file %s changed from \"%s\" to \"%s\"."
+#| msgid "Character set for file %s changed from \"%s\" to \"%s\"."
+msgid "Character set for file %s changed from “%s” to “%s”."
 msgstr "Скуп знакова за датотеку „%s“ је измењен из „%s“ у „%s“."
 
-#: ../src/sendmsg-window.c:1669 ../src/sendmsg-window.c:5014
+#: ../src/sendmsg-window.c:1673 ../src/sendmsg-window.c:5027
 msgid "(no subject)"
 msgstr "(без наслова)"
 
-#: ../src/sendmsg-window.c:1707
+#: ../src/sendmsg-window.c:1711
 #, c-format
 msgid "Cannot create file URI object for %s"
 msgstr "Не могу да направим предмет путање датотеке за %s"
 
-#: ../src/sendmsg-window.c:1715
+#: ../src/sendmsg-window.c:1719
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../src/sendmsg-window.c:1755
+#: ../src/sendmsg-window.c:1759
 msgid "forwarded message"
 msgstr "прослеђена порука"
 
-#: ../src/sendmsg-window.c:1760
+#: ../src/sendmsg-window.c:1764
 #, c-format
-msgid "Message from %s, subject: \"%s\""
+#| msgid "Message from %s, subject: \"%s\""
+msgid "Message from %s, subject: “%s”"
 msgstr "Поруку шаље %s, тема: „%s“"
 
-#: ../src/sendmsg-window.c:1838 ../src/sendmsg-window.c:1911
+#: ../src/sendmsg-window.c:1842 ../src/sendmsg-window.c:1915
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../src/sendmsg-window.c:1923
-msgid "Open..."
-msgstr "Отвори..."
+#: ../src/sendmsg-window.c:1927
+#| msgid "_Open"
+msgid "Open…"
+msgstr "Отвори…"
 
-#: ../src/sendmsg-window.c:1935
+#: ../src/sendmsg-window.c:1939
 msgid "(URL)"
 msgstr "(Адреса)"
 
-#: ../src/sendmsg-window.c:1991
+#: ../src/sendmsg-window.c:1995
 msgid "Attach file"
 msgstr "Приложи датотеку"
 
-#: ../src/sendmsg-window.c:2104 ../src/sendmsg-window.c:2207
-#: ../src/sendmsg-window.c:6855
+#: ../src/sendmsg-window.c:2108 ../src/sendmsg-window.c:2211
+#: ../src/sendmsg-window.c:6857
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -5681,150 +6021,158 @@ msgstr ""
 "Неуспешно укључивање поруке.\n"
 "Могући разлог: недовољно простора за привремени смештај"
 
-#: ../src/sendmsg-window.c:2428
+#: ../src/sendmsg-window.c:2430
 msgid "F_rom:"
 msgstr "_Шаље:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2565
+#: ../src/sendmsg-window.c:2580
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../src/sendmsg-window.c:2592
-msgid "F_cc:"
-msgstr "У _датотеку:"
+#: ../src/sendmsg-window.c:2607
+msgid "F_CC:"
+msgstr "Ф_ЦЦ:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2618
+#: ../src/sendmsg-window.c:2633
 msgid "_Attachments:"
 msgstr "_Прилози:"
 
-#: ../src/sendmsg-window.c:2663
+#: ../src/sendmsg-window.c:2677
 msgid "Mode"
 msgstr "Начин"
 
-#: ../src/sendmsg-window.c:3010
+#: ../src/sendmsg-window.c:3023
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Не могу да сачувам прилог: %s"
 
-#: ../src/sendmsg-window.c:3034
+#: ../src/sendmsg-window.c:3047
 msgid "No subject"
 msgstr "Без теме"
 
-#: ../src/sendmsg-window.c:3068
+#: ../src/sendmsg-window.c:3081
 #, c-format
-msgid "inlined file \"%s\" (%s)"
+#| msgid "inlined file \"%s\" (%s)"
+msgid "inlined file “%s” (%s)"
 msgstr "непосредна датотека „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3071
+#: ../src/sendmsg-window.c:3084
 #, c-format
-msgid "attached file \"%s\" (%s)"
+#| msgid "attached file \"%s\" (%s)"
+msgid "attached file “%s” (%s)"
 msgstr "приложена датотека „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3075
+#: ../src/sendmsg-window.c:3088
 #, c-format
 msgid "inlined %s part"
 msgstr "непосредан %s део"
 
-#: ../src/sendmsg-window.c:3077
+#: ../src/sendmsg-window.c:3090
 #, c-format
 msgid "attached %s part"
 msgstr "приложен %s део"
 
-#: ../src/sendmsg-window.c:3145
+#: ../src/sendmsg-window.c:3158
 #, c-format
-msgid "message from %s, subject \"%s\""
+#| msgid "message from %s, subject \"%s\""
+msgid "message from %s, subject “%s”"
 msgstr "поруку шаље %s, тема „%s“"
 
-#: ../src/sendmsg-window.c:3272
+#: ../src/sendmsg-window.c:3285
 msgid "quoted"
 msgstr "цитирано"
 
-#: ../src/sendmsg-window.c:3277 ../src/sendmsg-window.c:3280
+#: ../src/sendmsg-window.c:3290 ../src/sendmsg-window.c:3293
 msgid "quoted attachment"
 msgstr "цитирани прилог"
 
-#: ../src/sendmsg-window.c:3306
+#: ../src/sendmsg-window.c:3319
 msgid "Select parts for quotation"
 msgstr "Изабери делове за цитирање"
 
-#: ../src/sendmsg-window.c:3317
+#: ../src/sendmsg-window.c:3330
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Изаберите делове поруке који ће бити цитирани у одговору"
 
-#: ../src/sendmsg-window.c:3470
+#: ../src/sendmsg-window.c:3483
 msgid "you"
 msgstr "ви"
 
-#: ../src/sendmsg-window.c:3479
+#: ../src/sendmsg-window.c:3492
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------прослеђена порука коју шаље %s------\n"
 
-#: ../src/sendmsg-window.c:3516
+#: ../src/sendmsg-window.c:3529
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "ИБ поруке: %s\n"
 
-#: ../src/sendmsg-window.c:3522
+#: ../src/sendmsg-window.c:3535
 msgid "References:"
 msgstr "Позивања:"
 
-#: ../src/sendmsg-window.c:3533
+#: ../src/sendmsg-window.c:3546
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Дана %s, %s је написао:\n"
 
-#: ../src/sendmsg-window.c:3535
+#: ../src/sendmsg-window.c:3548
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s је написао:\n"
 
-#: ../src/sendmsg-window.c:3648
+#: ../src/sendmsg-window.c:3661
 msgid "No signature found!"
 msgstr "Нисам пронашао потпис!"
 
-#: ../src/sendmsg-window.c:3789
+#: ../src/sendmsg-window.c:3802
 msgid "Could not save message."
 msgstr "Не могу да сачувам поруку."
 
-#: ../src/sendmsg-window.c:3796
+#: ../src/sendmsg-window.c:3809
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Не могу да отворим скице: %s"
 
-#: ../src/sendmsg-window.c:3821
+#: ../src/sendmsg-window.c:3834
 msgid "Message saved."
 msgstr "Порука је сачувана."
 
-#: ../src/sendmsg-window.c:4445 ../src/sendmsg-window.c:4453
-#: ../src/sendmsg-window.c:4460 ../src/sendmsg-window.c:4467
-#: ../src/sendmsg-window.c:4491
+#: ../src/sendmsg-window.c:4458 ../src/sendmsg-window.c:4466
+#: ../src/sendmsg-window.c:4473 ../src/sendmsg-window.c:4480
+#: ../src/sendmsg-window.c:4504
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Не могу да приложим датотеку „%s“: %s."
 
-#: ../src/sendmsg-window.c:4446
+#: ../src/sendmsg-window.c:4459
 msgid "not an absolute path"
 msgstr "није апсолутна путања"
 
-#: ../src/sendmsg-window.c:4454
+#: ../src/sendmsg-window.c:4467
 msgid "not in your directory"
 msgstr "није у вашем директоријуму"
 
-#: ../src/sendmsg-window.c:4461
+#: ../src/sendmsg-window.c:4474
 msgid "does not exist"
 msgstr "не постоји"
 
-#: ../src/sendmsg-window.c:4492
+#: ../src/sendmsg-window.c:4505
 msgid "not in current directory"
 msgstr "није у текућем директоријуму"
 
-#: ../src/sendmsg-window.c:4542
+#: ../src/sendmsg-window.c:4555
+#| msgid ""
+#| "The link that you selected created\n"
+#| "a \"Blind copy\" (Bcc) address.\n"
+#| "Please check that the address\n"
+#| "is appropriate."
 msgid ""
 "The link that you selected created\n"
-"a \"Blind copy\" (Bcc) address.\n"
+"a “Blind copy” (BCC) address.\n"
 "Please check that the address\n"
 "is appropriate."
 msgstr ""
@@ -5833,45 +6181,44 @@ msgstr ""
 "Молим проверите да ли је адреса\n"
 "одговарајућа."
 
-#: ../src/sendmsg-window.c:4624
+#: ../src/sendmsg-window.c:4637
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Не могу да отворим датотеку %s.\n"
 
-#: ../src/sendmsg-window.c:4675
+#: ../src/sendmsg-window.c:4688
 msgid "Include file"
 msgstr "Укључи датотеку"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4860
+#: ../src/sendmsg-window.c:4873
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Не могу да учитам сличицу заглавља „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4863
+#: ../src/sendmsg-window.c:4876
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Не могу да учитам Х-сличицу заглавља „%s“: %s"
 
-#: ../src/sendmsg-window.c:4971
-#| msgid "No subject"
+#: ../src/sendmsg-window.c:4984
 msgid "No Subject"
 msgstr "Нема теме"
 
-#: ../src/sendmsg-window.c:4976
+#: ../src/sendmsg-window.c:4989
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: ../src/sendmsg-window.c:4997
+#: ../src/sendmsg-window.c:5010
 msgid "You did not specify a subject for this message"
 msgstr "Нисте навели тему за ову поруку"
 
-#: ../src/sendmsg-window.c:4998
+#: ../src/sendmsg-window.c:5011
 msgid "If you would like to provide one, enter it below."
 msgstr "Ако желите, упишите је испод."
 
-#: ../src/sendmsg-window.c:5091
+#: ../src/sendmsg-window.c:5104
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -5882,19 +6229,19 @@ msgstr ""
 "свим примаоцима. Да бисте заштитили вашу приватност, порука би могла бити "
 "„%s“ шифрована."
 
-#: ../src/sendmsg-window.c:5113
+#: ../src/sendmsg-window.c:5126
 msgid "Send _encrypted"
 msgstr "Пошаљи _шифровану"
 
-#: ../src/sendmsg-window.c:5128
+#: ../src/sendmsg-window.c:5141
 msgid "Send _unencrypted"
 msgstr "Пошаљи _нешифровану"
 
-#: ../src/sendmsg-window.c:5188
+#: ../src/sendmsg-window.c:5201
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Изабрали сте ОпенПГП безбедност за ову поруку.\n"
 
-#: ../src/sendmsg-window.c:5193
+#: ../src/sendmsg-window.c:5206
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -5902,12 +6249,12 @@ msgstr ""
 "Текст поруке ће бити послат и као обичан текст и ако ХТМЛ, сали само обичан "
 "текст може бити потписан.\n"
 
-#: ../src/sendmsg-window.c:5198
+#: ../src/sendmsg-window.c:5211
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "Порука садржи прилоге, који не могу бити потписани или шифровани.\n"
 
-#: ../src/sendmsg-window.c:5202
+#: ../src/sendmsg-window.c:5215
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -5915,36 +6262,37 @@ msgstr ""
 "Треба да изаберете МИМЕ режим ако читава порука треба да буде шифрована. Да "
 "ли заиста желите да наставите?"
 
-#: ../src/sendmsg-window.c:5227
+#: ../src/sendmsg-window.c:5240
 #, c-format
-msgid "sending message with gpg mode %d"
-msgstr "шаљем поруку у гпг режиму %d"
+#| msgid "sending message with gpg mode %d"
+msgid "sending message with GPG mode %d"
+msgstr "шаљем поруку у ГПГ режиму %d"
 
-#: ../src/sendmsg-window.c:5266
+#: ../src/sendmsg-window.c:5268
 msgid "Message could not be created"
 msgstr "Не могу да направим поруку"
 
-#: ../src/sendmsg-window.c:5268
+#: ../src/sendmsg-window.c:5270
 msgid "Message could not be queued in outbox"
 msgstr "Порука не може бити стављена у ред у одлазном"
 
-#: ../src/sendmsg-window.c:5270
+#: ../src/sendmsg-window.c:5272
 msgid "Message could not be saved in sentbox"
 msgstr "Порука не може бити сачувана у послатом"
 
-#: ../src/sendmsg-window.c:5272
+#: ../src/sendmsg-window.c:5274
 msgid "Message could not be sent"
 msgstr "Не могу да пошаљем поруку"
 
-#: ../src/sendmsg-window.c:5275
+#: ../src/sendmsg-window.c:5277
 msgid "Message could not be signed"
 msgstr "Не могу да потпишем поруку"
 
-#: ../src/sendmsg-window.c:5277
+#: ../src/sendmsg-window.c:5279
 msgid "Message could not be encrypted"
 msgstr "Не могу да шифрујем поруку"
 
-#: ../src/sendmsg-window.c:5283
+#: ../src/sendmsg-window.c:5285
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -5953,186 +6301,184 @@ msgstr ""
 "Нисам успео да пошаљем: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5288
+#: ../src/sendmsg-window.c:5290
 #, c-format
 msgid "Send failed: %s"
 msgstr "Нисам успео да пошаљем: %s"
 
-#: ../src/sendmsg-window.c:5387
+#: ../src/sendmsg-window.c:5389
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Не могу да одложим поруку: %s"
 
-#: ../src/sendmsg-window.c:5408
+#: ../src/sendmsg-window.c:5410
 msgid "Message postponed."
 msgstr "Порука је одложена."
 
-#: ../src/sendmsg-window.c:5413
+#: ../src/sendmsg-window.c:5415
 msgid "Could not postpone message."
 msgstr "Не могу да одложим поруку."
 
-#: ../src/sendmsg-window.c:5625
+#: ../src/sendmsg-window.c:5627
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Грешка покретања провере правописа: %s"
 
-#: ../src/sendmsg-window.c:6376
+#: ../src/sendmsg-window.c:6378
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Одговор за %s: %s"
 
-#: ../src/sendmsg-window.c:6381
+#: ../src/sendmsg-window.c:6383
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Проследи поруку за %s: %s"
 
-#: ../src/sendmsg-window.c:6385
+#: ../src/sendmsg-window.c:6387
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Нова порука за %s: %s"
 
-#: ../src/sendmsg-window.c:6555
+#: ../src/sendmsg-window.c:6557
 msgid "_Language"
 msgstr "_Језик"
 
-#: ../src/spell-check.c:213
+#: ../src/spell-check.c:211
 msgid "Spell check"
 msgstr "Правопис"
 
-#: ../src/spell-check.c:341
+#: ../src/spell-check.c:339
 msgid "C_hange"
 msgstr "_Измени"
 
-#: ../src/spell-check.c:343
+#: ../src/spell-check.c:341
 msgid "Replace the current word with the selected suggestion"
 msgstr "Замените текућу реч изабраним предлогом"
 
-#: ../src/spell-check.c:349
+#: ../src/spell-check.c:347
 msgid "Change _All"
 msgstr "Измени _све"
 
-#: ../src/spell-check.c:351
+#: ../src/spell-check.c:349
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Замените све појаве текуће речи изабраним предлогом"
 
-#: ../src/spell-check.c:357
+#: ../src/spell-check.c:355
 msgid "_Ignore"
 msgstr "_Занемари"
 
-#: ../src/spell-check.c:359
+#: ../src/spell-check.c:357
 msgid "Skip the current word"
 msgstr "Прескочите текућу реч"
 
-#: ../src/spell-check.c:364
+#: ../src/spell-check.c:362
 msgid "I_gnore All"
 msgstr "Занемари _све"
 
-#: ../src/spell-check.c:366
+#: ../src/spell-check.c:364
 msgid "Skip all occurrences of the current word"
 msgstr "Прескочите све појаве текуће речи"
 
-#: ../src/spell-check.c:371
+#: ../src/spell-check.c:369
 msgid "_Learn"
 msgstr "_Научи"
 
-#: ../src/spell-check.c:373
+#: ../src/spell-check.c:371
 msgid "Add the current word to your personal dictionary"
 msgstr "Додајте текућу реч у лични речник"
 
-#: ../src/spell-check.c:378
+#: ../src/spell-check.c:376
 msgid "_Done"
 msgstr "_Урађено"
 
-#: ../src/spell-check.c:379
+#: ../src/spell-check.c:377
 msgid "Finish spell checking"
 msgstr "Завршите проверу правописа"
 
-#: ../src/spell-check.c:386
+#: ../src/spell-check.c:384
 msgid "Revert all changes and finish spell checking"
 msgstr "Вратите све измене и завршите проверу правописа"
 
-#: ../src/spell-check.c:1030
+#: ../src/spell-check.c:1028
 #, c-format
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "Балсина провера писања: Грешка „enchant“-а: %s\n"
 
-#: ../src/store-address.c:106
+#: ../src/store-address.c:104
 msgid "Store address: no addresses"
 msgstr "Складиштење адресе: нема адреса"
 
-#: ../src/store-address.c:206
+#: ../src/store-address.c:204
 msgid "Store Address"
 msgstr "Складишти адресу"
 
-#: ../src/store-address.c:248
-msgid "No address book selected...."
-msgstr "Није изабран адресар..."
+#: ../src/store-address.c:246
+#| msgid "No address book selected...."
+msgid "No address book selected…"
+msgstr "Није изабран адресар…"
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:259
 msgid "Address could not be written to this address book."
 msgstr "Не могу да упишем адресу у овај адресар."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:262
 msgid "Address book could not be accessed."
 msgstr "Не могу да приступим адресару."
 
-#: ../src/store-address.c:266
+#: ../src/store-address.c:264
 msgid "This mail address is already in this address book."
 msgstr "Ова адреса је већ наведена у адресару."
 
-#: ../src/store-address.c:269
+#: ../src/store-address.c:267
 msgid "Unexpected address book error. Report it."
 msgstr "Неочекивана грешка у адресару. Молим пријавите је."
 
-#: ../src/store-address.c:292
-#| msgid "Address Book"
+#: ../src/store-address.c:290
 msgid "Address Book:"
 msgstr "Адресар:"
 
-#: ../src/store-address.c:338
-#| msgid "From:"
+#: ../src/store-address.c:336
 msgid "From: "
 msgstr "Шаље: "
 
-#: ../src/store-address.c:339
+#: ../src/store-address.c:337
 msgid "To: "
 msgstr "Прима: "
 
-#: ../src/store-address.c:340
-msgid "Cc: "
-msgstr "Цц: "
+#: ../src/store-address.c:338
+msgid "CC: "
+msgstr "ЦЦ: "
 
-#: ../src/store-address.c:341
-#| msgid "Bcc:"
-msgid "Bcc: "
-msgstr "Бцц: "
+#: ../src/store-address.c:339
+msgid "BCC: "
+msgstr "БЦЦ: "
 
-#: ../src/toolbar-factory.c:142
+#: ../src/toolbar-factory.c:140
 msgid "Separator"
 msgstr "Раздвајач"
 
-#: ../src/toolbar-factory.c:143
+#: ../src/toolbar-factory.c:141
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:142
 msgid "Check"
 msgstr "Провери"
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:143
 msgid "Compose"
 msgstr "Нова"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:144
 msgid "Continue"
 msgstr "Настави"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:145
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Reply\n"
 "to all"
@@ -6140,7 +6486,7 @@ msgstr ""
 "Одгов.\n"
 "свима"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Reply\n"
 "to group"
@@ -6148,11 +6494,11 @@ msgstr ""
 "Одгов.\n"
 "групи"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:148
 msgid "Forward"
 msgstr "Проследи"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:151
 msgid ""
 "Next\n"
 "unread"
@@ -6160,7 +6506,7 @@ msgstr ""
 "Следећа\n"
 "непрочит."
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:152
 msgid ""
 "Next\n"
 "flagged"
@@ -6168,7 +6514,7 @@ msgstr ""
 "Следећа\n"
 "означена"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:153
 msgid ""
 "Previous\n"
 "part"
@@ -6176,7 +6522,7 @@ msgstr ""
 "Претходни\n"
 "део"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:154
 msgid ""
 "Next\n"
 "part"
@@ -6184,7 +6530,7 @@ msgstr ""
 "Следећи\n"
 "део"
 
-#: ../src/toolbar-factory.c:157
+#: ../src/toolbar-factory.c:155
 msgid ""
 "Trash /\n"
 "Delete"
@@ -6192,15 +6538,15 @@ msgstr ""
 "У смеће /\n"
 "Обриши"
 
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:156
 msgid "Postpone"
 msgstr "Одложи"
 
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:157
 msgid "Print"
 msgstr "Штампај"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:158
 msgid ""
 "Request\n"
 "MDN"
@@ -6208,31 +6554,31 @@ msgstr ""
 "Затевај\n"
 "МДН"
 
-#: ../src/toolbar-factory.c:161
+#: ../src/toolbar-factory.c:159
 msgid "Send"
 msgstr "Пошаљи"
 
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:160
 msgid "Exchange"
 msgstr "Размени"
 
-#: ../src/toolbar-factory.c:163
+#: ../src/toolbar-factory.c:161
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../src/toolbar-factory.c:164
+#: ../src/toolbar-factory.c:162
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:163
 msgid "Identity"
 msgstr "Личност"
 
-#: ../src/toolbar-factory.c:167
+#: ../src/toolbar-factory.c:165
 msgid "Close"
 msgstr "Затвори"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:166
 msgid ""
 "Toggle\n"
 "new"
@@ -6240,11 +6586,11 @@ msgstr ""
 "Измени\n"
 "нову"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:167
 msgid "Mark all"
 msgstr "Обележи све"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:168
 msgid ""
 "All\n"
 "headers"
@@ -6252,7 +6598,7 @@ msgstr ""
 "Сва\n"
 "заглавља"
 
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:169
 msgid ""
 "Reset\n"
 "Filter"
@@ -6260,31 +6606,32 @@ msgstr ""
 "Очисти\n"
 "филтер"
 
-#: ../src/toolbar-factory.c:172
-msgid "Msg Preview"
+#: ../src/toolbar-factory.c:170
+#| msgid "Msg Preview"
+msgid "Message Preview"
 msgstr "Преглед поруке"
 
-#: ../src/toolbar-factory.c:174
+#: ../src/toolbar-factory.c:172
 msgid "Sign"
 msgstr "Потпиши"
 
-#: ../src/toolbar-factory.c:175
+#: ../src/toolbar-factory.c:173
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../src/toolbar-factory.c:177
+#: ../src/toolbar-factory.c:175
 msgid "Undo"
 msgstr "Опозови"
 
-#: ../src/toolbar-factory.c:178
+#: ../src/toolbar-factory.c:176
 msgid "Redo"
 msgstr "Понови"
 
-#: ../src/toolbar-factory.c:179
+#: ../src/toolbar-factory.c:177
 msgid "Expunge"
 msgstr "Избаци"
 
-#: ../src/toolbar-factory.c:180
+#: ../src/toolbar-factory.c:178
 msgid ""
 "Empty\n"
 "Trash"
@@ -6292,110 +6639,250 @@ msgstr ""
 "Испразни\n"
 "смеће"
 
-#: ../src/toolbar-factory.c:181
+#: ../src/toolbar-factory.c:179
 msgid "Edit"
 msgstr "Измени"
 
-#: ../src/toolbar-factory.c:194
+#: ../src/toolbar-factory.c:192
 msgid "Queue"
 msgstr "Закажи"
 
-#: ../src/toolbar-factory.c:407
+#: ../src/toolbar-factory.c:405
 #, c-format
-msgid "Unknown toolbar icon \"%s\""
+#| msgid "Unknown toolbar icon \"%s\""
+msgid "Unknown toolbar icon “%s”"
 msgstr "Непозната иконица за алатку „%s“"
 
-#: ../src/toolbar-factory.c:484
+#: ../src/toolbar-factory.c:482
 msgid "Queue this message for sending"
 msgstr "Смести ову поруку за слање"
 
-#: ../src/toolbar-factory.c:496
+#: ../src/toolbar-factory.c:494
 msgid "Text Be_low Icons"
 msgstr "Текст _испод иконица"
 
-#: ../src/toolbar-factory.c:497
+#: ../src/toolbar-factory.c:495
 msgid "Priority Text Be_side Icons"
 msgstr "Текст _поред икона према важности"
 
-#: ../src/toolbar-factory.c:499
+#: ../src/toolbar-factory.c:497
 msgid "_Icons Only"
 msgstr "_Само иконице"
 
-#: ../src/toolbar-factory.c:500
+#: ../src/toolbar-factory.c:498
 msgid "_Text Only"
 msgstr "Само _текст"
 
-#: ../src/toolbar-factory.c:758
+#: ../src/toolbar-factory.c:760
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Користи основно _окружења (%s)"
 
-#: ../src/toolbar-factory.c:784
-msgid "_Customize Toolbars..."
-msgstr "_Прилагоди основне алатке..."
+#: ../src/toolbar-factory.c:786
+#| msgid "Customize Toolbars"
+msgid "_Customize Toolbars…"
+msgstr "_Прилагодите основне алатке…"
 
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
 msgid "Customize Toolbars"
 msgstr "Прилагодите основне алатке"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:181
 msgid "Compose window"
 msgstr "Прозор за писање"
 
-#: ../src/toolbar-prefs.c:197
+#: ../src/toolbar-prefs.c:194
 msgid "Toolbar options"
 msgstr "Избори алатки"
 
-#: ../src/toolbar-prefs.c:206
+#: ../src/toolbar-prefs.c:203
 msgid "_Wrap button labels"
 msgstr "_Преломи ознаке дугмића"
 
-#: ../src/toolbar-prefs.c:382
+#: ../src/toolbar-prefs.c:379
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Дошло је до грешке приликом приказивања помоћи за алатке: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:418
+#: ../src/toolbar-prefs.c:415
 msgid "Preview"
 msgstr "Преглед"
 
-#: ../src/toolbar-prefs.c:453
+#: ../src/toolbar-prefs.c:445
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Врати подразумеване алатке на палету"
 
 #. Style button
-#: ../src/toolbar-prefs.c:457
-msgid "Toolbar _style..."
-msgstr "Изглед палете _алата..."
+#: ../src/toolbar-prefs.c:449
+#| msgid "Toolbar _style..."
+msgid "Toolbar _style…"
+msgstr "Изглед палете _алата…"
 
-#: ../src/toolbar-prefs.c:474
+#: ../src/toolbar-prefs.c:466
 msgid "Available buttons"
 msgstr "Доступни дугмићи"
 
-#: ../src/toolbar-prefs.c:490
+#: ../src/toolbar-prefs.c:482
 msgid "Current toolbar"
 msgstr "Текуће алатке"
 
-#: ../src/toolbar-prefs.c:511
-#| msgid "Cut the selected text"
+#: ../src/toolbar-prefs.c:503
 msgid "Move selected item up"
 msgstr "Померите изабрану ставку горе"
 
-#: ../src/toolbar-prefs.c:521
-#| msgid "Save selected to folder..."
+#: ../src/toolbar-prefs.c:513
 msgid "Remove selected item from toolbar"
 msgstr "Уклоните изабрану ставку са траке алата"
 
-#: ../src/toolbar-prefs.c:529
+#: ../src/toolbar-prefs.c:521
 msgid "Add selected item to toolbar"
 msgstr "Додајте изабрану ставку на траку алата"
 
-#: ../src/toolbar-prefs.c:536
-#| msgid "Save selected to folder..."
+#: ../src/toolbar-prefs.c:528
 msgid "Move selected item down"
 msgstr "Померите изабрану ставку доле"
 
+#~ msgid "Bcc:"
+#~ msgstr "Невидљива копија:"
+
+#~ msgid "Cc"
+#~ msgstr "Копија"
+
+#~ msgid "_Bcc:"
+#~ msgstr "_Невидљива копија:"
+
+#~ msgid "greek"
+#~ msgstr "грчки"
+
+#~ msgid "hebrew"
+#~ msgstr "хебрејски"
+
+#~ msgid "turkish"
+#~ msgstr "турски"
+
+#~ msgid "thai"
+#~ msgstr "тајландски"
+
+#~ msgid "russian"
+#~ msgstr "руски"
+
+#~ msgid "ukrainian"
+#~ msgstr "украјински"
+
+#~ msgid "korean"
+#~ msgstr "корејски"
+
+#~ msgid ""
+#~ "Could not send the message to %s:\n"
+#~ "%d: %s\n"
+#~ "Message left in your outbox.\n"
+#~ msgstr ""
+#~ "Не могу да пошаљем поруку за %s:\n"
+#~ "%d: %s\n"
+#~ "Порука је задржана у сандучету „Одлазна“.\n"
+
+#~ msgid ""
+#~ "Message submission problem, placing it into your outbox.\n"
+#~ "System will attempt to resubmit the message until you delete it."
+#~ msgstr ""
+#~ "Проблем са слањем поруке, смештам је у „Одлазну“.\n"
+#~ "Систем ће покушавати са поновним слањем поруке све док је не обришете."
+
+#~ msgid "From: %d <%s>"
+#~ msgstr "Шаље: %d <%s>"
+
+#~ msgid "From %s: %d %s"
+#~ msgstr "Шаље %s: %d %s"
+
+#~ msgid "To: %d <%s>"
+#~ msgstr "Прима: %d <%s>"
+
+#~ msgid "To %s: %d %s"
+#~ msgstr "Прима %s: %d %s"
+
+#~ msgid ""
+#~ "SMTP server refused connection.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "СМТП сервер је одбио везу.\n"
+#~ "Проверите вашу интернет везу."
+
+#~ msgid ""
+#~ "SMTP server cannot be reached.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "СМТП сервер не може бити приступљен.\n"
+#~ "Проверите вашу интернет везу."
+
+#~ msgid "Message left in Outbox (try again later)"
+#~ msgstr "Остала је порука у сандучету (покушајте касније)"
+
+#~ msgid ""
+#~ "SMTP server problem (%d): %s\n"
+#~ "Message is left in outbox."
+#~ msgstr ""
+#~ "Проблем СМТП сервера (%d): %s\n"
+#~ "Порука је остала у одлазном."
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Адреса ел-поште"
+
+#~ msgid "_Reply..."
+#~ msgstr "_Одговори..."
+
+#~ msgid "_Store Address..."
+#~ msgstr "_Ускладишти адресу..."
+
+#~ msgid "_Save..."
+#~ msgstr "_Сачувај..."
+
+#~ msgid "_Copy to folder..."
+#~ msgstr "_Умножи у фасциклу..."
+
+#~ msgid "Reply..."
+#~ msgstr "Одговори..."
+
+#~ msgid "Fcc:"
+#~ msgstr "Умножак датотеке:"
+
+#~ msgid "Save..."
+#~ msgstr "Сачувај..."
+
+#~ msgid "Print..."
+#~ msgstr "Штампај..."
+
+#~ msgid "_Cc:"
+#~ msgstr "_Копија:"
+
+#~ msgid "Remote IMAP _folder..."
+#~ msgstr "Удаљена _фасцикла ИМАП-а..."
+
+#~ msgid "Remote IMAP _subfolder..."
+#~ msgstr "Удаљена подфа_сцикла ИМАП-а..."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Својства..."
+
+#~ msgid "Remote IMAP folder..."
+#~ msgstr "Удаљена ИМАП фасцикла..."
+
+#~ msgid "Open..."
+#~ msgstr "Отвори..."
+
+#~ msgid "F_cc:"
+#~ msgstr "У _датотеку:"
+
+#~ msgid "Cc: "
+#~ msgstr "Цц: "
+
+#~| msgid "Bcc:"
+#~ msgid "Bcc: "
+#~ msgstr "Бцц: "
+
+#~ msgid "_Customize Toolbars..."
+#~ msgstr "_Прилагоди основне алатке..."
+
 #~ msgid ""
 #~ "Problem Creating Mailboxes\n"
 #~ "%s"
@@ -6412,9 +6899,6 @@ msgstr "Померите изабрану ставку доле"
 #~ msgid "Rubrica Address Book"
 #~ msgstr "Адресар рубрике"
 
-#~ msgid "_Properties"
-#~ msgstr "_Својства"
-
 #~ msgid "Edit address book properties"
 #~ msgstr "Уредите својства адресара"
 
@@ -6496,9 +6980,6 @@ msgstr "Померите изабрану ставку доле"
 #~ "Балсина провера писања: Нисам успео да саставим регуларни израз цитираног "
 #~ "текста\n"
 
-#~ msgid "_Save"
-#~ msgstr "_Сачувај"
-
 #~ msgid "Save this address and close the dialog?"
 #~ msgstr "Да сачувам ову адресу и затворим прозорче?"
 
diff --git a/po/sr latin po b/po/sr latin po
index bb53b94..3d73769 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,18 +1,18 @@
 # Serbian translation of balsa
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2017.
 # This file is distributed under the same license as the balsa package.
 # Maintainer: Danilo Šegan <dsegan gmx net>
 # Miloš Popović <gpopac gmail com>, 2012.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2012—2016.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2012—2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-07 05:12+0000\n"
-"PO-Revision-Date: 2016-09-11 07:55+0200\n"
+"POT-Creation-Date: 2017-02-08 03:26+0000\n"
+"PO-Revision-Date: 2017-02-25 19:06+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
-"Language-Team: srpski <gnome-sr googlegroups org>\n"
+"Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,268 +26,278 @@ msgid "Balsa"
 msgstr "Balsa"
 
 #: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
-msgid "E-Mail utility"
-msgstr "Alat za el-poštu"
+#| msgid "E-Mail utility"
+msgid "Email utility"
+msgstr "Alat za e-poštu"
 
 #: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
 msgid "Mail Client"
-msgstr "Program za el-poštu"
+msgstr "Program za e-poštu"
 
 #: ../balsa.desktop.in.in.h:4 ../balsa-mailto-handler.desktop.in.in.h:4
 msgid "Balsa Mail Client"
-msgstr "Program el-pošte Balsa"
+msgstr "Program e-pošte Balsa"
 
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldif.c:332
+#: ../libbalsa/address-book-extern.c:209 ../libbalsa/address-book-ldif.c:330
 msgid "No-Id"
 msgstr "Bez-IB"
 
-#: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:374
-#: ../libbalsa/address-book-ldap.c:500 ../libbalsa/address-book-ldif.c:311
-#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
-#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:406
+#: ../libbalsa/address-book-extern.c:214 ../libbalsa/address-book-extern.c:372
+#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:309
+#: ../libbalsa/address-book-ldif.c:333 ../libbalsa/address-book-ldif.c:352
+#: ../libbalsa/address-book-ldif.c:356 ../libbalsa/address-book-vcard.c:158
+#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
+#: ../libbalsa/rfc6350.c:112
 msgid "No-Name"
 msgstr "Bez-imena"
 
-#: ../libbalsa/address-book-ldap.c:283
+#: ../libbalsa/address-book-ldap.c:280
 msgid "SASL Interaction\n"
 msgstr "SASL međudejstvo\n"
 
-#: ../libbalsa/address-book-ldap.c:330
+#: ../libbalsa/address-book-ldap.c:327
 msgid "TLS requested but not compiled in"
 msgstr "Tražen je TLS ali nije ugrađen"
 
-#: ../libbalsa/address-book-ldap.c:609
+#: ../libbalsa/address-book-ldap.c:606
 msgid "Undefined location of user address book"
 msgstr "Nije određena putanja do vašeg adresara"
 
-#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book-osmo.c:146
+#, c-format
+#| msgid "Removing duplicates failed: %s"
+msgid "Reading Osmo contacts failed: %s"
+msgstr "Čitanje Osmo kontakta nije uspelo: %s"
+
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Nema greške"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:313
 msgid "Cannot read from address book"
 msgstr "Ne mogu da čitam iz adresara"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:314
 msgid "Cannot write to address book"
 msgstr "Ne mogu da pišem u adresar"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:315
 msgid "Cannot connect to the server"
 msgstr "Ne mogu da se povežem sa serverom"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:316
 msgid "Cannot search in the address book"
 msgstr "Ne mogu da pretražujem adresar"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:318
 msgid "Cannot add duplicate entry"
 msgstr "Ne mogu da dodam isti unos dva puta"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:320
 msgid "Cannot find address in address book"
 msgstr "Ne mogu da nađem adresu u adresaru"
 
-#: ../libbalsa/address-book.c:323 ../src/main-window.c:2916
-#: ../src/main-window.c:4252 ../src/sendmsg-window.c:3797
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2913
+#: ../src/main-window.c:4246 ../src/sendmsg-window.c:3810
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:750
+#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:741
 #: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3504
+#: ../src/sendmsg-window.c:3517
 msgid "To:"
 msgstr "Prima:"
 
-#: ../libbalsa/address-view.c:163 ../src/balsa-mime-widget-message.c:752
+#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:743
 #: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:718
-#: ../src/sendmsg-window.c:3512
-msgid "Cc:"
-msgstr "Kopija:"
+#: ../src/sendmsg-window.c:3525
+#| msgid "Cc:"
+msgid "CC:"
+msgstr "CC:"
 
-#: ../libbalsa/address-view.c:164 ../src/balsa-mime-widget-message.c:754
+#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:745
 #: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:718
-msgid "Bcc:"
-msgstr "Nevidljiva kopija:"
+msgid "BCC:"
+msgstr "BCC:"
 
-#: ../libbalsa/address-view.c:165
+#: ../libbalsa/address-view.c:163
 msgid "Reply To:"
 msgstr "Odgovori:"
 
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:952
 msgid "D_isplayed Name:"
 msgstr "Prikazano _ime:"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:953
 msgid "_First Name:"
 msgstr "_Ime:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:954
 msgid "_Last Name:"
 msgstr "_Prezime:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:955
 msgid "_Nickname:"
 msgstr "_Nadimak:"
 
-#: ../libbalsa/address.c:958
+#: ../libbalsa/address.c:956
 msgid "O_rganization:"
 msgstr "O_rganizacija:"
 
-#: ../libbalsa/address.c:959
+#: ../libbalsa/address.c:957
 msgid "_Email Address:"
-msgstr "Adresa _el-pošte:"
+msgstr "Adresa _e-pošte:"
 
-#: ../libbalsa/address.c:978 ../src/filter-edit-callbacks.c:1071
+#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1069
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1841
-#: ../libbalsa/message.c:845
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1839
+#: ../libbalsa/message.c:843
 msgid "(No subject)"
 msgstr "(bez naslova)"
 
-#: ../libbalsa/body.c:395 ../libbalsa/body.c:442
+#: ../libbalsa/body.c:393 ../libbalsa/body.c:440
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Ne mogu da izgradim izlazni tok"
 
-#: ../libbalsa/body.c:574
+#: ../libbalsa/body.c:572
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Ne mogu da pročitam ugrađenu poruku"
 
-#: ../libbalsa/filter-error.c:48
+#: ../libbalsa/filter-error.c:46
 msgid "Syntax error in the filter configuration file"
 msgstr "Greška sintakse u datoteci podešavanja filtera"
 
-#: ../libbalsa/filter-error.c:49
+#: ../libbalsa/filter-error.c:47
 msgid "Unable to allocate memory"
 msgstr "Ne mogu da dodelim memoriju"
 
-#: ../libbalsa/filter-error.c:50
+#: ../libbalsa/filter-error.c:48
 msgid "Error in regular expression syntax"
 msgstr "Greška u sintaksi regularnog izraza"
 
-#: ../libbalsa/filter-error.c:51
+#: ../libbalsa/filter-error.c:49
 msgid "Attempt to apply an invalid filter"
 msgstr "Pokušavam da primenim neispravan filter"
 
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:985
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:983
 msgid "To"
 msgstr "Prima"
 
-#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:353
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:351
 msgid "From"
 msgstr "Šalje"
 
-#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:369
-#: ../src/pref-manager.c:397
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
+#: ../src/pref-manager.c:380
 msgid "Subject"
 msgstr "Tema"
 
-#: ../libbalsa/filter-funcs.c:386
-msgid "Cc"
-msgstr "Kopija"
+#: ../libbalsa/filter-funcs.c:384
+msgid "CC"
+msgstr "CC"
 
-#: ../libbalsa/filter-funcs.c:387
+#: ../libbalsa/filter-funcs.c:385
 msgid "Body"
 msgstr "Telo"
 
-#: ../libbalsa/filter-funcs.c:392
+#: ../libbalsa/filter-funcs.c:390
 #, c-format
 msgid "Header:%s"
 msgstr "Zaglavlje:%s"
 
-#: ../libbalsa/filter-funcs.c:414
+#: ../libbalsa/filter-funcs.c:412
 msgid "New"
 msgstr "Novo"
 
-#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:992
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../libbalsa/filter-funcs.c:416 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:992
 msgid "Replied"
 msgstr "Odgovoreno"
 
-#: ../libbalsa/filter-funcs.c:417 ../src/filter-edit-callbacks.c:994
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:992
 msgid "Flagged"
 msgstr "Označeno"
 
-#: ../libbalsa/filter-funcs.c:441
+#: ../libbalsa/filter-funcs.c:439
 msgid "Not "
 msgstr "Nije "
 
-#: ../libbalsa/filter-funcs.c:457
+#: ../libbalsa/filter-funcs.c:455
 msgid "From %Y-%m-%d"
 msgstr "Od %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:463
+#: ../libbalsa/filter-funcs.c:461
 msgid "To %Y-%m-%d"
 msgstr "Do %d.%m.%Y"
 
-#: ../libbalsa/filter-funcs.c:471
+#: ../libbalsa/filter-funcs.c:469
 msgid "And"
 msgstr "I"
 
-#: ../libbalsa/filter-funcs.c:474
+#: ../libbalsa/filter-funcs.c:472
 msgid "Or"
 msgstr "Ili"
 
-#: ../libbalsa/filter-file.c:135
+#: ../libbalsa/filter-file.c:133
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Neispravni filteri %s za sanduče %s"
 
-#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:864
 msgid "Unable to load message body to match filter"
 msgstr "Ne mogu da učitam telo poruke koje odgovara filteru"
 
-#: ../libbalsa/filter.c:234
+#: ../libbalsa/filter.c:232
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Neispravan filter: %s"
 
-#: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Loš naziv sandučeta za filter: %s"
 
-#: ../libbalsa/filter.c:286
+#: ../libbalsa/filter.c:284
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Greška pri umnožavanju poruka: %s"
 
-#: ../libbalsa/filter.c:296
+#: ../libbalsa/filter.c:294
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Greška pri premeštanju poruka u smeće: %s"
 
-#: ../libbalsa/filter.c:309
+#: ../libbalsa/filter.c:307
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Greška pri premeštanju poruka: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:125
+#: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Ne mogu da dešifrujem MIME deo: greška u obradi"
 
-#: ../libbalsa/gmime-multipart-crypt.c:222
+#: ../libbalsa/gmime-multipart-crypt.c:220
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "Ne mogu da proverim višedelni/potpisani deo jer neki poddelovi nedostaju."
 
-#: ../libbalsa/gmime-multipart-crypt.c:248
+#: ../libbalsa/gmime-multipart-crypt.c:246
 #, c-format
-msgid "unsupported protocol '%s'"
+#| msgid "unsupported protocol '%s'"
+msgid "unsupported protocol “%s”"
 msgstr "nepodržan protokol „%s“"
 
-#: ../libbalsa/gmime-multipart-crypt.c:261
+#: ../libbalsa/gmime-multipart-crypt.c:259
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -295,20 +305,23 @@ msgstr ""
 "Ne mogu da proverim višedelni/potpisani deo: vrsta sadržaja potpisa se ne "
 "podudara sa protokolom."
 
-#: ../libbalsa/gmime-multipart-crypt.c:462
+#: ../libbalsa/gmime-multipart-crypt.c:455
 #, c-format
+#| msgid ""
+#| "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
+#| "'%s'."
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
-"'%s'."
+"“%s”."
 msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: nije podržano šifrovanje za "
 "protokol „%s“."
 
-#: ../libbalsa/gmime-multipart-crypt.c:463
+#: ../libbalsa/gmime-multipart-crypt.c:456
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:476
+#: ../libbalsa/gmime-multipart-crypt.c:469
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -316,30 +329,29 @@ msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: vrsta sadržaja ne odgovara "
 "protokolu."
 
-#: ../libbalsa/gmime-multipart-crypt.c:491
+#: ../libbalsa/gmime-multipart-crypt.c:484
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: neočekivana vrsta sadržaja"
 
-#: ../libbalsa/gmime-multipart-crypt.c:533
+#: ../libbalsa/gmime-multipart-crypt.c:526
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
 "Ne mogu da dešifrujem višedelni/šifrovani deo: ne mogu da obradim šifrovani "
 "sadržaj"
 
-#: ../libbalsa/html.c:68
+#: ../libbalsa/html.c:66
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Ne mogu da preuzmem HTML deo: %s"
 
-#: ../libbalsa/html.c:121
+#: ../libbalsa/html.c:119
 #, c-format
-#| msgid "Could not get an HTML part: %s"
 msgid "Could not convert HTML part to text: %s"
 msgstr "Ne mogu da pretvorim HTML deo u tekst: %s"
 
-#: ../libbalsa/html.c:402
+#: ../libbalsa/html.c:400
 msgid ""
 "This message part contains images from a remote server.\n"
 "To protect your privacy, Balsa has not downloaded them.\n"
@@ -349,7 +361,7 @@ msgstr ""
 "bi zaštitila vašu privatnost, Balsa ih nije preuzela.\n"
 "Možete ih preuzeti ukoliko verujete serveru."
 
-#: ../libbalsa/html.c:410 ../libbalsa/html.c:1078
+#: ../libbalsa/html.c:408 ../libbalsa/html.c:1076
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -359,195 +371,195 @@ msgstr ""
 "privatnost, Balsa ih nije preuzela. Možete ih preuzeti ukoliko verujete "
 "serveru."
 
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089
+#: ../libbalsa/html.c:417 ../libbalsa/html.c:1087
 msgid "_Download images"
 msgstr "Preuzmi _slike"
 
-#: ../libbalsa/html.c:421 ../libbalsa/html.c:1091 ../libbalsa/identity.c:1736
-#: ../src/ab-window.c:140 ../src/mailbox-conf.c:1162 ../src/mailbox-node.c:1115
-#: ../src/main-window.c:3945 ../src/toolbar-prefs.c:142
+#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1708
+#: ../src/ab-window.c:148 ../src/mailbox-conf.c:1160 ../src/mailbox-node.c:1113
+#: ../src/main-window.c:3939 ../src/toolbar-prefs.c:140
 msgid "_Close"
 msgstr "_Zatvori"
 
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1960
-#: ../libbalsa/mailbox_local.c:1962 ../src/sendmsg-window.c:3745
-#: ../src/sendmsg-window.c:3747
+#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1962
+#: ../libbalsa/mailbox_local.c:1964 ../src/sendmsg-window.c:3758
+#: ../src/sendmsg-window.c:3760
 msgid "Re:"
 msgstr "Re:"
 
-#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3685
-#: ../src/sendmsg-window.c:3686 ../src/sendmsg-window.c:3687
+#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3698
+#: ../src/sendmsg-window.c:3699 ../src/sendmsg-window.c:3700
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: ../libbalsa/identity.c:166
+#: ../libbalsa/identity.c:160
 msgid "New Identity"
 msgstr "Novi identitet"
 
-#: ../libbalsa/identity.c:346
+#: ../libbalsa/identity.c:340
 #, c-format
 msgid "Error executing signature generator %s"
 msgstr "Greška izvršavanja tvorca potpisa %s"
 
-#: ../libbalsa/identity.c:358
+#: ../libbalsa/identity.c:352
 #, c-format
-msgid "Cannot open signature file '%s' for reading"
+#| msgid "Cannot open signature file '%s' for reading"
+msgid "Cannot open signature file “%s” for reading"
 msgstr "Ne mogu da otvorim datoteku potpisa „%s“ radi čitanja"
 
-#: ../libbalsa/identity.c:364
+#: ../libbalsa/identity.c:358
 #, c-format
 msgid "Error reading signature from %s"
 msgstr "Greška čitanja potpisa iz %s"
 
-#: ../libbalsa/identity.c:369
+#: ../libbalsa/identity.c:363
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Potpis u „%s“ nije UTF-8 tekst."
 
-#: ../libbalsa/identity.c:488 ../libbalsa/libbalsa-gpgme-cb.c:159
-#: ../libbalsa/libbalsa-gpgme-cb.c:371 ../libbalsa/smtp-server.c:543
-#: ../src/ab-main.c:860 ../src/ab-window.c:133 ../src/address-book-config.c:239
-#: ../src/address-book-config.c:338 ../src/balsa-app.c:90
-#: ../src/balsa-index.c:2645 ../src/balsa-mblist.c:1878
-#: ../src/balsa-message.c:1791 ../src/balsa-mime-widget-callbacks.c:87
-#: ../src/filter-edit-callbacks.c:1241 ../src/filter-edit-dialog.c:404
-#: ../src/filter-edit-dialog.c:573 ../src/filter-export-dialog.c:81
-#: ../src/filter-run-dialog.c:313 ../src/folder-conf.c:306
-#: ../src/folder-conf.c:569 ../src/folder-conf.c:802 ../src/mailbox-conf.c:404
-#: ../src/mailbox-conf.c:425 ../src/mailbox-conf.c:441
-#: ../src/mailbox-conf.c:1125 ../src/pref-manager.c:508
-#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1542
-#: ../src/sendmsg-window.c:1994 ../src/sendmsg-window.c:3311
-#: ../src/sendmsg-window.c:4678 ../src/sendmsg-window.c:4975
-#: ../src/sendmsg-window.c:5132 ../src/spell-check.c:384
-#: ../src/store-address.c:210
+#: ../libbalsa/identity.c:480 ../libbalsa/libbalsa-gpgme-cb.c:157
+#: ../libbalsa/libbalsa-gpgme-cb.c:369 ../libbalsa/smtp-server.c:430
+#: ../src/ab-main.c:858 ../src/ab-window.c:141 ../src/address-book-config.c:239
+#: ../src/address-book-config.c:342 ../src/address-book-config.c:388
+#: ../src/balsa-app.c:88 ../src/balsa-index.c:2654 ../src/balsa-mblist.c:1896
+#: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
+#: ../src/filter-edit-callbacks.c:1239 ../src/filter-edit-dialog.c:402
+#: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
+#: ../src/filter-run-dialog.c:311 ../src/folder-conf.c:304
+#: ../src/folder-conf.c:566 ../src/folder-conf.c:799 ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:423 ../src/mailbox-conf.c:439
+#: ../src/mailbox-conf.c:1123 ../src/pref-manager.c:491
+#: ../src/sendmsg-window.c:533 ../src/sendmsg-window.c:1546
+#: ../src/sendmsg-window.c:1998 ../src/sendmsg-window.c:3324
+#: ../src/sendmsg-window.c:4691 ../src/sendmsg-window.c:4988
+#: ../src/sendmsg-window.c:5145 ../src/spell-check.c:382
+#: ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../libbalsa/identity.c:489 ../libbalsa/libbalsa-gpgme-cb.c:158
-#: ../libbalsa/libbalsa-gpgme-cb.c:370 ../libbalsa/smtp-server.c:542
-#: ../src/ab-window.c:132 ../src/balsa-app.c:89 ../src/balsa-message.c:1792
-#: ../src/balsa-mime-widget-callbacks.c:88 ../src/filter-edit-callbacks.c:1240
-#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:312 ../src/main-window.c:4038
-#: ../src/pref-manager.c:506 ../src/sendmsg-window.c:1541
-#: ../src/sendmsg-window.c:1995 ../src/sendmsg-window.c:3310
-#: ../src/sendmsg-window.c:4679 ../src/store-address.c:211
+#: ../libbalsa/identity.c:481 ../libbalsa/libbalsa-gpgme-cb.c:156
+#: ../libbalsa/libbalsa-gpgme-cb.c:368 ../libbalsa/smtp-server.c:429
+#: ../src/ab-window.c:140 ../src/balsa-app.c:87 ../src/balsa-message.c:1767
+#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1238
+#: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
+#: ../src/filter-run-dialog.c:310 ../src/main-window.c:4032
+#: ../src/pref-manager.c:489 ../src/sendmsg-window.c:1545
+#: ../src/sendmsg-window.c:1999 ../src/sendmsg-window.c:3323
+#: ../src/sendmsg-window.c:4692 ../src/store-address.c:209
 msgid "_OK"
 msgstr "U _redu"
 
-#: ../libbalsa/identity.c:501
+#: ../libbalsa/identity.c:493
 msgid "Current"
 msgstr "Trenutno"
 
-#: ../libbalsa/identity.c:755 ../libbalsa/smtp-server.c:265
+#: ../libbalsa/identity.c:743 ../libbalsa/smtp-server.c:192
 msgid "Default"
 msgstr "Osnovno"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:957
+#: ../libbalsa/identity.c:945
 msgid "_Face Path"
 msgstr "Putanja do _sličice"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:963
+#: ../libbalsa/identity.c:951
 msgid "_X-Face Path"
 msgstr "Putanja do _X-sličice"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:991
+#: ../libbalsa/identity.c:974
 msgid "General"
 msgstr "Opšte"
 
-#: ../libbalsa/identity.c:993
+#: ../libbalsa/identity.c:976
 msgid "_Identity name:"
 msgstr "_Ime identiteta:"
 
-#: ../libbalsa/identity.c:995
+#: ../libbalsa/identity.c:978
 msgid "_Full name:"
 msgstr "_Puno ime:"
 
-#: ../libbalsa/identity.c:997
+#: ../libbalsa/identity.c:980
 msgid "_Mailing address:"
 msgstr "_Poštanske adrese:"
 
-#: ../libbalsa/identity.c:999
+#: ../libbalsa/identity.c:982
 msgid "Reply _to:"
 msgstr "_Odgovori:"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:984
 msgid "_Domain:"
 msgstr "_Domen:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:1005
+#: ../libbalsa/identity.c:988
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../libbalsa/identity.c:1007
-msgid "_Bcc:"
-msgstr "_Nevidljiva kopija:"
+#: ../libbalsa/identity.c:990
+msgid "_BCC:"
+msgstr "_BCC:"
 
-#: ../libbalsa/identity.c:1009
+#: ../libbalsa/identity.c:992
 msgid "Reply _string:"
 msgstr "Niska za _odgovore:"
 
-#: ../libbalsa/identity.c:1011
+#: ../libbalsa/identity.c:994
 msgid "F_orward string:"
 msgstr "Niska za _prosleđivanje:"
 
-#: ../libbalsa/identity.c:1014
+#: ../libbalsa/identity.c:997
 msgid "send messages in both plain text and _HTML format"
 msgstr "šalji poruke i kao čist tekst i kao _HTML"
 
-#: ../libbalsa/identity.c:1017
-#| msgid "request _Message Disposition Notification by default"
+#: ../libbalsa/identity.c:1000
 msgid "request positive (successful) _Delivery Status Notification by default"
 msgstr "zahtevaj pozitivno (uspešno) _obaveštenje o stanju isporuke po osnovi"
 
-#: ../libbalsa/identity.c:1021
+#: ../libbalsa/identity.c:1004
 msgid "request _Message Disposition Notification by default"
 msgstr "zahtevaj _obaveštenje o prispeću poruke po osnovi"
 
-#: ../libbalsa/identity.c:1031
+#: ../libbalsa/identity.c:1013
 msgid "SMT_P server:"
 msgstr "SMT_P server:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1036
+#: ../libbalsa/identity.c:1017
 msgid "Signature"
 msgstr "Potpis"
 
-#: ../libbalsa/identity.c:1039
+#: ../libbalsa/identity.c:1020
 msgid "Signature _path"
 msgstr "Putanja do _potpisa"
 
-#: ../libbalsa/identity.c:1042
+#: ../libbalsa/identity.c:1023
 msgid "_Execute signature"
 msgstr "_Izvrši potpis"
 
-#: ../libbalsa/identity.c:1045
+#: ../libbalsa/identity.c:1026
 msgid "Incl_ude signature"
 msgstr "_Uključi potpis"
 
-#: ../libbalsa/identity.c:1048
+#: ../libbalsa/identity.c:1029
 msgid "Include signature when for_warding"
 msgstr "Uključi potpis pri _prosleđivanju"
 
-#: ../libbalsa/identity.c:1051
+#: ../libbalsa/identity.c:1032
 msgid "Include signature when rep_lying"
 msgstr "Uključi potpis pri _odgovaranju"
 
-#: ../libbalsa/identity.c:1054
+#: ../libbalsa/identity.c:1035
 msgid "_Add signature separator"
 msgstr "_Dodaj razdvajač potpisa"
 
-#: ../libbalsa/identity.c:1057
+#: ../libbalsa/identity.c:1038
 msgid "Prepend si_gnature"
 msgstr "Postavi potpis _na početak"
 
-#: ../libbalsa/identity.c:1063
+#: ../libbalsa/identity.c:1044
 msgid ""
 "Signing and encrypting messages are possible only if Balsa is built with "
 "cryptographic support."
@@ -555,34 +567,31 @@ msgstr ""
 "Potpisivanje i šifrovanje poruka je moguće samo ako je Balsa izgrađena sa "
 "podrškom za šifrovanje."
 
-#: ../libbalsa/identity.c:1068
+#: ../libbalsa/identity.c:1049
 msgid "Security"
 msgstr "Sigurnost"
 
-#: ../libbalsa/identity.c:1071
+#: ../libbalsa/identity.c:1052
 msgid "sign messages by default"
 msgstr "potpiši poruke po osnovi"
 
-#: ../libbalsa/identity.c:1074
+#: ../libbalsa/identity.c:1055
 msgid "encrypt messages by default"
 msgstr "šifruj poruke po osnovi"
 
-#: ../libbalsa/identity.c:1077
+#: ../libbalsa/identity.c:1058
 msgid "default protocol"
 msgstr "osnovni protokol"
 
-#: ../libbalsa/identity.c:1080
+#: ../libbalsa/identity.c:1061
 msgid "always trust GnuPG keys when encrypting"
 msgstr "uvek veruj GnuPG ključevima prilikom šifrovanja"
 
-#: ../libbalsa/identity.c:1083
+#: ../libbalsa/identity.c:1064
 msgid "remind me if messages can be encrypted"
 msgstr "podseti me ukoliko je moguće potpisati poruku"
 
-#: ../libbalsa/identity.c:1086
-#| msgid ""
-#| "use secret key with this id for signing (leave empty for automatic "
-#| "selection)"
+#: ../libbalsa/identity.c:1067
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -590,85 +599,85 @@ msgstr ""
 "koristi tajni ključ uz ovaj ib za potpisivanje\n"
 "(ostavite prazno za samostalno biranje)"
 
-#: ../libbalsa/identity.c:1220
+#: ../libbalsa/identity.c:1201
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Greška čitanja datoteke „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1230
+#: ../libbalsa/identity.c:1211
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Sličica zaglavlja „%s“ je prevelika (%lu bajta)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1240
+#: ../libbalsa/identity.c:1221
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Sličica zaglavlja „%s“ sadrži binarne podatke."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1260 ../src/balsa-message.c:1616
+#: ../libbalsa/identity.c:1241 ../src/balsa-message.c:1591
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Ne mogu da učitam sličicu: %s"
 
-#: ../libbalsa/identity.c:1439
+#: ../libbalsa/identity.c:1420
 msgid "Error: The identity does not have a name"
 msgstr "Greška: Identitet nema ime"
 
-#: ../libbalsa/identity.c:1449
+#: ../libbalsa/identity.c:1430
 msgid "Error: An identity with that name already exists"
 msgstr "Greška: Identitet sa tim imenom već postoji"
 
-#: ../libbalsa/identity.c:1644
+#: ../libbalsa/identity.c:1623
 msgid "Do you really want to delete the selected identity?"
 msgstr "Da li zaista želite da obrišete izabrani identitet?"
 
-#: ../libbalsa/identity.c:1683
+#: ../libbalsa/identity.c:1662
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Greška prikazivanja pomoći za ličnosti: %s\n"
 
-#: ../libbalsa/identity.c:1729
+#: ../libbalsa/identity.c:1701
 msgid "Manage Identities"
 msgstr "Upravljajte ličnostima"
 
-#: ../libbalsa/identity.c:1733 ../libbalsa/smtp-server.c:544
-#: ../src/address-book-config.c:237 ../src/address-book-config.c:336
-#: ../src/filter-edit-callbacks.c:1242 ../src/filter-edit-dialog.c:574
-#: ../src/filter-export-dialog.c:82 ../src/filter-run-dialog.c:314
-#: ../src/folder-conf.c:307 ../src/folder-conf.c:570 ../src/folder-conf.c:803
-#: ../src/main-window.c:3944 ../src/pref-manager.c:509
-#: ../src/toolbar-prefs.c:143
+#: ../libbalsa/identity.c:1705 ../libbalsa/smtp-server.c:431
+#: ../src/address-book-config.c:237 ../src/address-book-config.c:340
+#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1240
+#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
+#: ../src/filter-run-dialog.c:312 ../src/folder-conf.c:305
+#: ../src/folder-conf.c:567 ../src/folder-conf.c:800 ../src/main-window.c:3938
+#: ../src/pref-manager.c:492 ../src/toolbar-prefs.c:141
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. new button
-#: ../libbalsa/identity.c:1734 ../src/filter-edit-dialog.c:226
-#: ../src/mailbox-node.c:1080
+#: ../libbalsa/identity.c:1706 ../src/filter-edit-dialog.c:224
+#: ../src/mailbox-node.c:1078
 msgid "_New"
 msgstr "_Nova"
 
-#: ../libbalsa/identity.c:1735 ../src/ab-main.c:855
-#: ../src/filter-edit-callbacks.c:1075 ../src/filter-edit-dialog.c:320
+#: ../libbalsa/identity.c:1707 ../src/ab-main.c:853
+#: ../src/filter-edit-callbacks.c:1073 ../src/filter-edit-dialog.c:318
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../libbalsa/identity.c:2127
+#: ../libbalsa/identity.c:2091
 msgid "GnuPG MIME mode"
 msgstr "GnuPG MIME režim"
 
-#: ../libbalsa/identity.c:2129
+#: ../libbalsa/identity.c:2093
 msgid "GnuPG OpenPGP mode"
 msgstr "GnuPG OpenPGP režim"
 
-#: ../libbalsa/identity.c:2132
+#: ../libbalsa/identity.c:2096
 msgid "GpgSM S/MIME mode"
 msgstr "GpgSM S/MIME režim"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:290
+#: ../libbalsa/imap-server.c:288
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -678,80 +687,80 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:294
+#: ../libbalsa/imap-server.c:292
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Greška IMAP servera %s: %s"
 
-#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:353
+#: ../libbalsa/imap-server.c:527 ../libbalsa/server.c:357
 #, c-format
 msgid "Error looking up password for %s@%s: %s\n"
 msgstr "Greška traženja lozinke za %s@%s: %s\n"
 
-#: ../libbalsa/imap-server.c:531 ../libbalsa/server.c:355
+#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:359
 #, c-format
 msgid "Falling back\n"
 msgstr "Vraćam na staro\n"
 
-#: ../libbalsa/imap-server.c:541 ../libbalsa/imap-server.c:577
-#: ../libbalsa/server.c:364 ../libbalsa/server.c:398 ../libbalsa/server.c:443
-#: ../libbalsa/server.c:457
+#: ../libbalsa/imap-server.c:539 ../libbalsa/imap-server.c:575
+#: ../libbalsa/server.c:368 ../libbalsa/server.c:402 ../libbalsa/server.c:447
+#: ../libbalsa/server.c:461
 msgid "Balsa passwords"
 msgstr "Balsine lozinke"
 
-#: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:373
-#: ../libbalsa/server.c:450
+#: ../libbalsa/imap-server.c:548 ../libbalsa/server.c:377
+#: ../libbalsa/server.c:454
 #, c-format
 msgid "Error storing password for %s@%s: %s\n"
 msgstr "Greška skladištenja lozinke za %s@%s: %s\n"
 
-#: ../libbalsa/imap-server.c:628
+#: ../libbalsa/imap-server.c:626
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Ne mogu da se povežem na %s"
 
-#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#: ../libbalsa/imap-server.c:631 ../libbalsa/imap-server.c:636
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Ne mogu da se povežem na server: %s"
 
-#: ../libbalsa/imap-server.c:787
+#: ../libbalsa/imap-server.c:785
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Prekoračen je broj veza sa serverom „%s“"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "User ID"
 msgstr "IB korisnika"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Key ID"
 msgstr "IB ključa"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Length"
 msgstr "Dužina"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:137
+#: ../libbalsa/libbalsa-gpgme-cb.c:135
 msgid "Validity"
 msgstr "Ispravnost"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:154
+#: ../libbalsa/libbalsa-gpgme-cb.c:152
 msgid "Select key"
 msgstr "Izaberite ključ"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:175
+#: ../libbalsa/libbalsa-gpgme-cb.c:173
 #, c-format
 msgid "Select the private key for the signer %s"
 msgstr "Izaberite privatni ključ za potpisnika %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:180
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
 #, c-format
 msgid "Select the public key for the recipient %s"
 msgstr "Izaberite javni ključ za primaoca %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:185
+#: ../libbalsa/libbalsa-gpgme-cb.c:183
 #, c-format
 msgid ""
 "There seems to be no public key for recipient %s in your key ring.\n"
@@ -761,26 +770,27 @@ msgstr ""
 "Izgleda da u vašem privesku ključeva ne postoji javni ključ za primaoca „%s“.\n"
 "Ako ste sigurni da primalac poseduje drugačiji ključ, izaberite ga sa spiska."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:326
+#: ../libbalsa/libbalsa-gpgme-cb.c:324
 #, c-format
 msgid "Insufficient trust for recipient %s"
 msgstr "Nedovoljno poverenja za primaoca %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:330
+#: ../libbalsa/libbalsa-gpgme-cb.c:328
 #, c-format
-msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+#| msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgid "The validity of the key with user ID “%s” is “%s”."
 msgstr "Ispravnost ključa sa korisničkim IB-om „%s“ je „%s“."
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:341
+#: ../libbalsa/libbalsa-gpgme-cb.c:339
 msgid "Use this key anyway?"
 msgstr "Da ipak koristim ovaj ključ?"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:367
+#: ../libbalsa/libbalsa-gpgme-cb.c:365
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:395
+#: ../libbalsa/libbalsa-gpgme-cb.c:393
 #, c-format
 msgid ""
 "%s\n"
@@ -793,7 +803,7 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:400
+#: ../libbalsa/libbalsa-gpgme-cb.c:398
 #, c-format
 msgid ""
 "%s\n"
@@ -806,60 +816,62 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:240 ../libbalsa/libbalsa-gpgme.c:251
-#: ../libbalsa/libbalsa-gpgme.c:352 ../libbalsa/libbalsa-gpgme.c:474
-#: ../libbalsa/libbalsa-gpgme.c:566
+#: ../libbalsa/libbalsa-gpgme.c:238 ../libbalsa/libbalsa-gpgme.c:249
+#: ../libbalsa/libbalsa-gpgme.c:350 ../libbalsa/libbalsa-gpgme.c:472
+#: ../libbalsa/libbalsa-gpgme.c:564
 msgid "could not get data from stream"
 msgstr "ne mogu da dobavim podatke iz toka"
 
-#: ../libbalsa/libbalsa-gpgme.c:264 ../libbalsa/rfc3156.c:390
-#: ../libbalsa/rfc3156.c:395 ../libbalsa/rfc3156.c:571
-#: ../libbalsa/rfc3156.c:577
+#: ../libbalsa/libbalsa-gpgme.c:262 ../libbalsa/rfc3156.c:388
+#: ../libbalsa/rfc3156.c:393 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
 msgid "signature verification failed"
 msgstr "provera potpisa nije uspela"
 
-#: ../libbalsa/libbalsa-gpgme.c:360 ../libbalsa/libbalsa-gpgme.c:483
-#: ../libbalsa/libbalsa-gpgme.c:574
+#: ../libbalsa/libbalsa-gpgme.c:358 ../libbalsa/libbalsa-gpgme.c:481
+#: ../libbalsa/libbalsa-gpgme.c:572
 msgid "could not create new data object"
 msgstr "ne mogu da stvorim novi objekat podataka"
 
-#: ../libbalsa/libbalsa-gpgme.c:369
+#: ../libbalsa/libbalsa-gpgme.c:367
 msgid "signing failed"
 msgstr "potpisivanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:442
+#: ../libbalsa/libbalsa-gpgme.c:440
 #, c-format
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "mešanje potpisivanja i šifrovanja je određeno jedino za RFC 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:510
+#: ../libbalsa/libbalsa-gpgme.c:508
 msgid "signing and encryption failed"
 msgstr "potpisivanje i šifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:512
+#: ../libbalsa/libbalsa-gpgme.c:510
 msgid "encryption failed"
 msgstr "šifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:584 ../libbalsa/rfc3156.c:470
-#: ../libbalsa/rfc3156.c:475
+#: ../libbalsa/libbalsa-gpgme.c:582 ../libbalsa/rfc3156.c:468
+#: ../libbalsa/rfc3156.c:473
 msgid "decryption failed"
 msgstr "dešifrovanje nije uspelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:691
+#: ../libbalsa/libbalsa-gpgme.c:689
 msgid "could not create context"
 msgstr "ne mogu da obrazujem kontekst"
 
-#: ../libbalsa/libbalsa-gpgme.c:695
+#: ../libbalsa/libbalsa-gpgme.c:693
 #, c-format
-msgid "could not set protocol '%s'"
+#| msgid "could not set protocol '%s'"
+msgid "could not set protocol “%s”"
 msgstr "ne mogu da podesim protokol „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:758 ../libbalsa/libbalsa-gpgme.c:776
+#: ../libbalsa/libbalsa-gpgme.c:756 ../libbalsa/libbalsa-gpgme.c:774
 #, c-format
-msgid "could not list keys for \"%s\""
+#| msgid "could not list keys for \"%s\""
+msgid "could not list keys for “%s”"
 msgstr "ne mogu da pobrojim ključeve za „%s“"
 
-#: ../libbalsa/libbalsa-gpgme.c:794
+#: ../libbalsa/libbalsa-gpgme.c:792
 #, c-format
 msgid ""
 "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
@@ -867,12 +879,12 @@ msgstr ""
 "%s: ključ za „%s“ je prisutan, ali je istekao, isključen, opozvan ili "
 "neispravan"
 
-#: ../libbalsa/libbalsa-gpgme.c:799
+#: ../libbalsa/libbalsa-gpgme.c:797
 #, c-format
 msgid "%s: could not find a key for %s"
 msgstr "%s: ne mogu da nađem ključ za %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:806
+#: ../libbalsa/libbalsa-gpgme.c:804
 #, c-format
 msgid ""
 "%s: a key with id %s is present, but it is expired, disabled, revoked or "
@@ -881,61 +893,92 @@ msgstr ""
 "%s: ključ sa ib-om %s je prisutan, ali je istekao, isključen, opozvan ili "
 "neispravan"
 
-#: ../libbalsa/libbalsa-gpgme.c:811
+#: ../libbalsa/libbalsa-gpgme.c:809
 #, c-format
 msgid "%s: could not find a key with id %s"
 msgstr "%s: ne mogu da nađem ključ sa ib-om %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:829
+#: ../libbalsa/libbalsa-gpgme.c:827
 #, c-format
 msgid "%s: multiple keys for %s"
 msgstr "%s: više ključeva za %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:875
+#: ../libbalsa/libbalsa-gpgme.c:873
 #, c-format
-msgid "%s: insufficient validity for uid %s"
-msgstr "%s: nedovoljno valjanosti za uib %s"
+#| msgid "%s: insufficient validity for uid %s"
+msgid "%s: insufficient validity for UID %s"
+msgstr "%s: nedovoljno valjanosti za UIB %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:896 ../libbalsa/libbalsa-gpgme.c:910
+#: ../libbalsa/libbalsa-gpgme.c:894 ../libbalsa/libbalsa-gpgme.c:908
 #, c-format
-#| msgid "could not list keys for \"%s\""
 msgid "could not list keys"
 msgstr "ne mogu da pobrojim ključeve"
 
-#: ../libbalsa/libbalsa-conf.c:143
-msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+#: ../libbalsa/libbalsa-conf.c:141
+#| msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+msgid "Your Balsa configuration is now stored in “~/.balsa/config”."
 msgstr "Vaša podešavanja Balse su sada smeštena u „~/.balsa/config“."
 
-#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:4468
+#: ../libbalsa/libbalsa-vfs.c:554 ../src/sendmsg-window.c:4481
 #, c-format
 msgid "not a regular file"
 msgstr "nije obična datoteka"
 
-#: ../libbalsa/libbalsa-vfs.c:608
+#: ../libbalsa/libbalsa-vfs.c:606
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "Ne mogu da pokrenem, nedostaje program"
 
-#: ../libbalsa/libbalsa-vfs.c:674
+#: ../libbalsa/libbalsa-vfs.c:672
 #, c-format
 msgid "Open with %s"
 msgstr "Otvori programom „%s“"
 
-#: ../libbalsa/libbalsa-vfs.c:727
+#: ../libbalsa/libbalsa-vfs.c:725
 #, c-format
 msgid "Open _part with %s"
 msgstr "Pregledaj _deo pomoću „%s“"
 
-#: ../libbalsa/libbalsa.c:357
+#: ../libbalsa/libbalsa.c:366
 msgid "Invalid date"
 msgstr "Pogrešan datum"
 
-#: ../libbalsa/libbalsa.c:374 ../src/pref-manager.c:1383
-#: ../src/pref-manager.c:1479
+#: ../libbalsa/libbalsa.c:383 ../src/pref-manager.c:1370
+#: ../src/pref-manager.c:1466
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libbalsa/libbalsa.c:514
+#: ../libbalsa/libbalsa.c:525 ../libbalsa/libbalsa.c:630
+msgid "SSL/TLS certificate"
+msgstr "SSL/TLS uverenje"
+
+#: ../libbalsa/libbalsa.c:529 ../libbalsa/libbalsa.c:634
+msgid "_Accept Once"
+msgstr "_Prihvati jednom"
+
+#: ../libbalsa/libbalsa.c:530 ../libbalsa/libbalsa.c:635
+#| msgid "Accept&_Save"
+msgid "Accept & _Save"
+msgstr "Prihvati i _sačuvaj"
+
+#: ../libbalsa/libbalsa.c:531 ../libbalsa/libbalsa.c:636
+msgid "_Reject"
+msgstr "_Odbaci"
+
+#: ../libbalsa/libbalsa.c:541
+#, c-format
+#| msgid ""
+#| "Authenticity of this certificate could not be verified.\n"
+#| "<b>Reason:</b> %s\n"
+#| "<b>This certificate belongs to:</b>\n"
+msgid ""
+"<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
+"Reason: %s"
+msgstr ""
+"<big><b>Ne mogu da proverim verodostojnost ovog uverenja.</b></big>\n"
+"<b>Razlog:</b> %s"
+
+#: ../libbalsa/libbalsa.c:588
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
@@ -946,7 +989,7 @@ msgstr ""
 "<b>Razlog:</b> %s\n"
 "<b>Ovo uverenje pripada:</b>\n"
 
-#: ../libbalsa/libbalsa.c:526
+#: ../libbalsa/libbalsa.c:600
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -954,7 +997,7 @@ msgstr ""
 "\n"
 "<b>Ovo uverenje je izdao:</b>\n"
 
-#: ../libbalsa/libbalsa.c:537
+#: ../libbalsa/libbalsa.c:611
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -967,107 +1010,93 @@ msgstr ""
 "do %s\n"
 "<b>Otisak:</b> %s"
 
-#: ../libbalsa/libbalsa.c:556
-msgid "SSL/TLS certificate"
-msgstr "SSL/TLS uverenje"
-
-#: ../libbalsa/libbalsa.c:560
-msgid "_Accept Once"
-msgstr "_Prihvati jednom"
-
-#: ../libbalsa/libbalsa.c:561
-msgid "Accept&_Save"
-msgstr "Prihvati i _sačuvaj"
-
-#: ../libbalsa/libbalsa.c:562
-msgid "_Reject"
-msgstr "_Odbaci"
-
-#: ../libbalsa/libbalsa.c:609
+#: ../libbalsa/libbalsa.c:685
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Veza sa „%s“ je istekla. Da prekinem?"
 
-#: ../libbalsa/libbalsa.c:766
+#: ../libbalsa/libbalsa.c:842
 #, c-format
 msgid "No image data"
 msgstr "Nema slike"
 
-#: ../libbalsa/libbalsa.c:800
+#: ../libbalsa/libbalsa.c:876
 #, c-format
 msgid "Invalid input format"
 msgstr "Neispravan oblik na ulazu"
 
-#: ../libbalsa/libbalsa.c:804
+#: ../libbalsa/libbalsa.c:880
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Unutrašnje prekoračenje ostave"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:821
+#: ../libbalsa/libbalsa.c:897
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Neispravna X-sličica"
 
-#: ../libbalsa/mailbox.c:506
+#: ../libbalsa/mailbox.c:504
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Ne mogu da učitam sanduče „%s“"
 
-#: ../libbalsa/mailbox.c:513
+#: ../libbalsa/mailbox.c:511
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Ne postoji ova vrsta sandučeta: %s"
 
-#: ../libbalsa/mailbox.c:530
+#: ../libbalsa/mailbox.c:528
 #, c-format
-msgid "Bad local mailbox path \"%s\""
+#| msgid "Bad local mailbox path \"%s\""
+msgid "Bad local mailbox path “%s”"
 msgstr "Loša putanja mesnog sandučeta „%s“"
 
-#: ../libbalsa/mailbox.c:535
+#: ../libbalsa/mailbox.c:533
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Nisam mogao da stvorim sanduče vrste „%s“"
 
-#: ../libbalsa/mailbox.c:864
+#: ../libbalsa/mailbox.c:862
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Primenjujem pravila filtera na „%s“"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1027
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Umnožavam iz „%s“ u „%s“"
 
-#: ../libbalsa/mailbox.c:1959
+#: ../libbalsa/mailbox.c:1957
 #, c-format
 msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
 msgstr "biblbalsa_sanduče_dobavi_poruku: sanduče „%s“ je zatvoreno"
 
-#: ../libbalsa/mailbox.c:2164
+#: ../libbalsa/mailbox.c:2162
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Nisam uspeo da uklonim poruka iz sandučeta izvora"
 
-#: ../libbalsa/mailbox.c:2991
+#: ../libbalsa/mailbox.c:2989
 msgid "from unknown"
 msgstr "iz nepoznatog"
 
-#: ../libbalsa/mailbox.c:2993
-msgid "Loading..."
-msgstr "Učitavam..."
+#: ../libbalsa/mailbox.c:2991
+#| msgid "Loading..."
+msgid "Loading…"
+msgstr "Učitavam…"
 
-#: ../libbalsa/mailbox.c:3962
+#: ../libbalsa/mailbox.c:3960
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Pretražujem „%s“ za delimičnim porukama"
 
-#: ../libbalsa/mailbox.c:4052
+#: ../libbalsa/mailbox.c:4050
 msgid "Reconstructing message"
 msgstr "Rekonstruišem poruku"
 
-#: ../libbalsa/mailbox.c:4312
+#: ../libbalsa/mailbox.c:4310
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Nisam uspeo da uklonim dvostruke poruke iz sandučeta izvora"
@@ -1075,37 +1104,40 @@ msgstr "Nisam uspeo da uklonim dvostruke poruke iz sandučeta izvora"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:615
-msgid "IMAP connection has been severed. Reconnecting..."
-msgstr "IMAP veza je raskinuta. Ponovo se povezujem..."
+#: ../libbalsa/mailbox_imap.c:613
+#| msgid "IMAP connection has been severed. Reconnecting..."
+msgid "IMAP connection has been severed. Reconnecting…"
+msgstr "IMAP veza je raskinuta. Ponovo se povezujem…"
 
-#: ../libbalsa/mailbox_imap.c:618
+#: ../libbalsa/mailbox_imap.c:616
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Greška IMAP protokola. Pokušavam da uključim sređivanje problema."
 
-#: ../libbalsa/mailbox_imap.c:621
+#: ../libbalsa/mailbox_imap.c:619
 #, c-format
-msgid "IMAP server has shut the connection: %s Reconnecting..."
-msgstr "IMAP server je ugasio vezu: %s Ponovo se povezujem..."
+#| msgid "IMAP server has shut the connection: %s Reconnecting..."
+msgid "IMAP server has shut the connection: %s Reconnecting…"
+msgstr "IMAP server je ugasio vezu: %s Ponovo se povezujem…"
 
-#: ../libbalsa/mailbox_imap.c:633
+#: ../libbalsa/mailbox_imap.c:631
 #, c-format
-msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+#| msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+msgid "Async IMAP cmd %s could not be executed. Reconnecting…"
 msgstr ""
-"Neusklađena IMAP naredba „%s“ ne može biti izvršena. Ponovo se povezujem..."
+"Neusklađena IMAP naredba „%s“ ne može biti izvršena. Ponovo se povezujem…"
 
-#: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:505
-#: ../libbalsa/mailbox_mbox.c:739 ../libbalsa/mailbox_mh.c:541
+#: ../libbalsa/mailbox_imap.c:1122 ../libbalsa/mailbox_maildir.c:503
+#: ../libbalsa/mailbox_mbox.c:737 ../libbalsa/mailbox_mh.c:539
 #, c-format
 msgid "%s: Opening %s Refcount: %d\n"
 msgstr "%s: Otvaram %s Refbroj: %d\n"
 
-#: ../libbalsa/mailbox_imap.c:1211
+#: ../libbalsa/mailbox_imap.c:1209
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Preuzimam %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1610
+#: ../libbalsa/mailbox_imap.c:1608
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -1114,103 +1146,108 @@ msgstr ""
 "Naredba PRETRAŽI IMAP nije uspela za sanduče „%s“\n"
 "vraćam se na podrazumevani način pretrage"
 
-#: ../libbalsa/mailbox_imap.c:1670
+#: ../libbalsa/mailbox_imap.c:1668
 #, c-format
-msgid "No path found for mailbox \"%s\", using \"%s\""
+#| msgid "No path found for mailbox \"%s\", using \"%s\""
+msgid "No path found for mailbox “%s”, using “%s”"
 msgstr "Nisam pronašao putanju za sanduče „%s“, koristim „%s“"
 
-#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
+#: ../libbalsa/mailbox_imap.c:1796 ../libbalsa/mailbox_imap.c:1837
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Ne mogu da dobavim IMAP upravljanje"
 
-#: ../libbalsa/mailbox_imap.c:2443 ../libbalsa/mailbox_imap.c:2509
+#: ../libbalsa/mailbox_imap.c:2441 ../libbalsa/mailbox_imap.c:2507
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Greška dovlačenja poruke sa IMAP servera: %s"
 
-#: ../libbalsa/mailbox_imap.c:2477
+#: ../libbalsa/mailbox_imap.c:2475
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Preuzimam %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2521
+#: ../libbalsa/mailbox_imap.c:2519
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Ne mogu da napravim privremenu datoteku"
 
-#: ../libbalsa/mailbox_imap.c:2541
+#: ../libbalsa/mailbox_imap.c:2539
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Ne mogu da pišem u privremenu datoteku „%s“"
 
-#: ../libbalsa/mailbox_imap.c:2770 ../libbalsa/mailbox_imap.c:2889
+#: ../libbalsa/mailbox_imap.c:2768 ../libbalsa/mailbox_imap.c:2887
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Šaljem %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:3192
+#: ../libbalsa/mailbox_imap.c:3190
 msgid "Server-side threading not supported."
 msgstr "Nije podržano temačenje sa strane servera."
 
-#: ../libbalsa/mailbox_local.c:566
+#: ../libbalsa/mailbox_local.c:564
 #, c-format
-msgid "Failed to save cache file \"%s\": %s."
+#| msgid "Failed to save cache file \"%s\": %s."
+msgid "Failed to save cache file “%s”: %s."
 msgstr "Nisam uspeo da sačuvam datoteku ostave „%s“: %s."
 
-#: ../libbalsa/mailbox_local.c:600
+#: ../libbalsa/mailbox_local.c:598
 #, c-format
 msgid "Cache file for mailbox %s will be created"
 msgstr "Biće napravljena datoteka ostave za sanduče „%s“"
 
-#: ../libbalsa/mailbox_local.c:609
+#: ../libbalsa/mailbox_local.c:607
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Nisam uspeo da pročitam datoteku ostave „%s“: %s"
 
-#: ../libbalsa/mailbox_local.c:627 ../libbalsa/mailbox_local.c:646
-#: ../libbalsa/mailbox_local.c:670
+#: ../libbalsa/mailbox_local.c:625 ../libbalsa/mailbox_local.c:644
+#: ../libbalsa/mailbox_local.c:668
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Biće popravljena datoteka ostave za sanduče „%s“"
 
-#: ../libbalsa/mailbox_local.c:1243
+#: ../libbalsa/mailbox_local.c:1241
 #, c-format
 msgid "Filtering %s"
 msgstr "Razvrstavam %s"
 
-#: ../libbalsa/mailbox_local.c:1332
+#: ../libbalsa/mailbox_local.c:1330
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripremam %s"
 
-#: ../libbalsa/mailbox_local.c:2129
+#: ../libbalsa/mailbox_local.c:2131
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Nisam uspeo da otvorim „%s“. Greška broj %d, "
 
-#: ../libbalsa/mailbox_local.c:2151
+#: ../libbalsa/mailbox_local.c:2153
 #, c-format
-msgid "Failed to sync mailbox \"%s\""
+#| msgid "Failed to sync mailbox \"%s\""
+msgid "Failed to sync mailbox “%s”"
 msgstr "Nisam uspeo da uskladim sanduče „%s“"
 
-#: ../libbalsa/mailbox_maildir.c:193
+#: ../libbalsa/mailbox_maildir.c:191
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Sanduče %s ne izgleda kao sanduče vrste „Maildir“."
 
-#: ../libbalsa/mailbox_maildir.c:202
+#: ../libbalsa/mailbox_maildir.c:200
 #, c-format
-msgid "Could not create a MailDir directory at %s (%s)"
+#| msgid "Could not create a MailDir directory at %s (%s)"
+msgid "Could not create a Maildir directory at %s (%s)"
 msgstr "Ne mogu da stvorim „MailDir“ direktorijum u %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:210 ../libbalsa/mailbox_maildir.c:219
-#: ../libbalsa/mailbox_maildir.c:230
+#: ../libbalsa/mailbox_maildir.c:208 ../libbalsa/mailbox_maildir.c:217
+#: ../libbalsa/mailbox_maildir.c:228
 #, c-format
-msgid "Could not create a MailDir at %s (%s)"
+#| msgid "Could not create a MailDir at %s (%s)"
+msgid "Could not create a Maildir at %s (%s)"
 msgstr "Ne mogu da stvorim „MailDir“ u %s (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:337 ../libbalsa/mailbox_mh.c:291
+#: ../libbalsa/mailbox_maildir.c:335 ../libbalsa/mailbox_mh.c:289
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1219,8 +1256,8 @@ msgstr ""
 "Ne mogu da uklonim sadržaj %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:343 ../libbalsa/mailbox_mbox.c:316
-#: ../libbalsa/mailbox_mh.c:297
+#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mbox.c:314
+#: ../libbalsa/mailbox_mh.c:295
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1229,132 +1266,137 @@ msgstr ""
 "Ne mogu da uklonim %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:486 ../libbalsa/mailbox_mbox.c:686
-#: ../libbalsa/mailbox_mh.c:524
+#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:684
+#: ../libbalsa/mailbox_mh.c:522
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Sanduče ne postoji."
 
-#: ../libbalsa/mailbox_maildir.c:926 ../libbalsa/mailbox_mbox.c:1970
-#: ../libbalsa/mailbox_mh.c:1104
+#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1968
+#: ../libbalsa/mailbox_mh.c:1102
 #, c-format
 msgid "Data copy error"
 msgstr "Greška umnožavanja podataka"
 
-#: ../libbalsa/mailbox_mbox.c:201
+#: ../libbalsa/mailbox_mbox.c:199
 #, c-format
-msgid "Mailbox %s does not appear to be an Mbox mailbox."
+#| msgid "Mailbox %s does not appear to be an Mbox mailbox."
+msgid "Mailbox %s does not appear to be an mbox mailbox."
 msgstr "Sanduče „%s“ ne izgleda kao sanduče vrste „Mbox“."
 
-#: ../libbalsa/mailbox_mbox.c:419
+#: ../libbalsa/mailbox_mbox.c:417
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "Ne mogu da zapišem datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:431
+#: ../libbalsa/mailbox_mbox.c:429
 #, c-format
-msgid "Failed to create temporary file \"%s\": %s"
+#| msgid "Failed to create temporary file \"%s\": %s"
+msgid "Failed to create temporary file “%s”: %s"
 msgstr "Nisam uspeo da napravim privremenu datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:443
+#: ../libbalsa/mailbox_mbox.c:441
 #, c-format
-msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+#| msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+msgid "Failed to save cache file “%s”: %s. New version saved as “%s”"
 msgstr ""
-"Nisam uspeo da sačuvam datoteku ostave „%s“: %s.  Novo izdanje je sačuvano "
-"kao „%s“"
+"Nisam uspeo da sačuvam datoteku ostave „%s“: %s. Novo izdanje je sačuvano kao "
+"„%s“"
 
-#: ../libbalsa/mailbox_mbox.c:451
+#: ../libbalsa/mailbox_mbox.c:449
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "Ne mogu da razvežem datoteku „%s“: %s"
 
-#: ../libbalsa/mailbox_mbox.c:694
+#: ../libbalsa/mailbox_mbox.c:692
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Ne mogu da otvorim sanduče."
 
-#: ../libbalsa/mailbox_mbox.c:706
+#: ../libbalsa/mailbox_mbox.c:704
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Sanduče nije u „mbox“ zapisu."
 
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:712
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Ne mogu da zaključam sanduče."
 
-#: ../libbalsa/mailbox_mbox.c:1926
+#: ../libbalsa/mailbox_mbox.c:1924
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: ne mogu da otvorim %s."
 
-#: ../libbalsa/mailbox_mbox.c:1938
+#: ../libbalsa/mailbox_mbox.c:1936
 #, c-format
-msgid "%s: could not get new mime stream."
-msgstr "%s: ne mogu da dobavim novi mime tok."
+#| msgid "%s: could not get new mime stream."
+msgid "%s: could not get new MIME stream."
+msgstr "%s: ne mogu da dobavim novi MIME tok."
 
-#: ../libbalsa/mailbox_mbox.c:1946
+#: ../libbalsa/mailbox_mbox.c:1944
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: „%s“ nije u „mbox“ zapisu."
 
-#: ../libbalsa/mailbox_mh.c:172
+#: ../libbalsa/mailbox_mh.c:170
 #, c-format
-msgid "Mailbox %s does not appear to be a Mh mailbox."
+#| msgid "Mailbox %s does not appear to be a Mh mailbox."
+msgid "Mailbox %s does not appear to be an MH mailbox."
 msgstr "Sanduče „%s“ ne izgleda kao sanduče vrste „Mh“."
 
-#: ../libbalsa/mailbox_mh.c:182
+#: ../libbalsa/mailbox_mh.c:180
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Ne mogu da stvorim direktorijum vrste „MH“ u %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:194
+#: ../libbalsa/mailbox_mh.c:192
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Ne mogu da stvorim strukturu vrste „MH“ u %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1085
+#: ../libbalsa/mailbox_mh.c:1083
 #, c-format
 msgid "Cannot create message"
 msgstr "Ne mogu da napravim poruku"
 
-#: ../libbalsa/mailbox_mh.c:1129
+#: ../libbalsa/mailbox_mh.c:1127
 #, c-format
 msgid "Message rename error"
 msgstr "Greška preimenovanja poruke"
 
-#: ../libbalsa/mailbox_pop3.c:198
+#: ../libbalsa/mailbox_pop3.c:196
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Greška prilaganja poruke „%d“ iz „%s“ u „%s“: %s"
 
-#: ../libbalsa/mailbox_pop3.c:347
+#: ../libbalsa/mailbox_pop3.c:345
 #, c-format
 msgid "Saving POP message to %s failed"
 msgstr "Nisam uspeo da sačuvam POP poruku u „%s“"
 
-#: ../libbalsa/mailbox_pop3.c:354
+#: ../libbalsa/mailbox_pop3.c:352
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "Preuzimam poruku %d od %d"
 
 # bug: plural-forms
-#: ../libbalsa/mailbox_pop3.c:377
+#: ../libbalsa/mailbox_pop3.c:375
 #, c-format
 msgid "Received %ld kB of %ld"
 msgstr "Primljeno je %ld kB od %ld"
 
-#: ../libbalsa/mailbox_pop3.c:391
+#: ../libbalsa/mailbox_pop3.c:389
 #, c-format
 msgid "Saving POP message to %s failed."
 msgstr "Nisam uspeo da sačuvam POP poruku u „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:401
+#: ../libbalsa/mailbox_pop3.c:399
 #, c-format
 msgid "Transferring POP message to %s failed."
 msgstr "Nisam uspeo da prenesem POP poruku u „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:483
+#: ../libbalsa/mailbox_pop3.c:481
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
@@ -1363,107 +1405,126 @@ msgstr ""
 "Greška privremene datoteke POP3 sandučeta %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:508
+#: ../libbalsa/mailbox_pop3.c:506
 #, c-format
 msgid "POP3 mailbox %s error: %s\n"
 msgstr "Greška POP3 sandučeta %s: %s\n"
 
-#: ../libbalsa/mailbox_pop3.c:546
+#: ../libbalsa/mailbox_pop3.c:544
 #, c-format
-msgid "POP3 message %d oversized: %d kB - skipped."
+#| msgid "POP3 message %d oversized: %d kB - skipped."
+msgid "POP3 message %d oversized: %d kB — skipped."
 msgstr "Premašena je veličina POP3 poruke „%d“: %d kB — preskačem."
 
-#: ../libbalsa/mailbox_pop3.c:558
+#: ../libbalsa/mailbox_pop3.c:556
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
 msgstr "POP3 greška: ne mogu da otvorim „%s“ radi upisa."
 
-#: ../libbalsa/mailbox_pop3.c:566
+#: ../libbalsa/mailbox_pop3.c:564
 #, c-format
 msgid "POP3 error: cannot close %s."
 msgstr "POP3 greška: ne mogu da zatvorim „%s“."
 
-#: ../libbalsa/mailbox_pop3.c:601
+#: ../libbalsa/mailbox_pop3.c:599
 #, c-format
 msgid "POP3 error: %s."
 msgstr "POP3 greška: %s."
 
-#: ../libbalsa/message.c:617
+#: ../libbalsa/message.c:615
 #, c-format
-msgid "Mailbox (%s) is readonly: cannot change flags."
+#| msgid "Mailbox (%s) is readonly: cannot change flags."
+msgid "Mailbox (%s) is read-only: cannot change flags."
 msgstr "Sanduče (%s) je samo za čitanje: ne mogu da izmenim opcije."
 
 #: ../libbalsa/misc.c:596
-msgid "west european"
-msgstr "zapadnoevropski"
+#| msgid "west european"
+msgid "West European"
+msgstr "Zapadnoevropski"
 
 #: ../libbalsa/misc.c:598 ../libbalsa/misc.c:632
-msgid "east european"
-msgstr "istočnoevropski"
+#| msgid "east european"
+msgid "East European"
+msgstr "Istočnoevropski"
 
 #: ../libbalsa/misc.c:600
-msgid "south european"
-msgstr "južnoevropski"
+#| msgid "south european"
+msgid "South European"
+msgstr "Južnoevropski"
 
 #: ../libbalsa/misc.c:602
-msgid "north european"
-msgstr "severnoevropski"
+#| msgid "north european"
+msgid "North European"
+msgstr "Severnoevropski"
 
 #: ../libbalsa/misc.c:604 ../libbalsa/misc.c:634
-msgid "cyrillic"
-msgstr "ćirilični"
+#| msgid "cyrillic"
+msgid "Cyrillic"
+msgstr "Ćirilični"
 
 #: ../libbalsa/misc.c:606 ../libbalsa/misc.c:640
-msgid "arabic"
-msgstr "arapski"
+#| msgid "arabic"
+msgid "Arabic"
+msgstr "Arapski"
 
 #: ../libbalsa/misc.c:608 ../libbalsa/misc.c:636
-msgid "greek"
-msgstr "grčki"
+#| msgid "_Greek"
+msgid "Greek"
+msgstr "Grčki"
 
 #: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
-msgid "hebrew"
-msgstr "hebrejski"
+#| msgid "_Hebrew"
+msgid "Hebrew"
+msgstr "Hebrejski"
 
 #: ../libbalsa/misc.c:612
-msgid "turkish"
-msgstr "turski"
+#| msgid "_Turkish"
+msgid "Turkish"
+msgstr "Turski"
 
 #: ../libbalsa/misc.c:614
-msgid "nordic"
-msgstr "nordijski"
+#| msgid "nordic"
+msgid "Nordic"
+msgstr "Nordijski"
 
 #: ../libbalsa/misc.c:616
-msgid "thai"
-msgstr "tajlandski"
+msgid "Thai"
+msgstr "Tajlandski"
 
 #: ../libbalsa/misc.c:618 ../libbalsa/misc.c:642
-msgid "baltic"
-msgstr "baltički"
+#| msgid "baltic"
+msgid "Baltic"
+msgstr "Baltički"
 
 #: ../libbalsa/misc.c:620
-msgid "celtic"
-msgstr "keltski"
+#| msgid "celtic"
+msgid "Celtic"
+msgstr "Keltski"
 
 #: ../libbalsa/misc.c:622
-msgid "west europe (euro)"
-msgstr "zapadnoevropski (evro)"
+#| msgid "west europe (euro)"
+msgid "West European (euro)"
+msgstr "Zapadnoevropski (evro)"
 
 #: ../libbalsa/misc.c:624
-msgid "russian"
-msgstr "ruski"
+#| msgid "_Russian"
+msgid "Russian"
+msgstr "Ruski"
 
 #: ../libbalsa/misc.c:626
-msgid "ukrainian"
-msgstr "ukrajinski"
+#| msgid "_Ukrainian"
+msgid "Ukrainian"
+msgstr "Ukrajinski"
 
 #: ../libbalsa/misc.c:628
-msgid "japanese"
-msgstr "japanski"
+#| msgid "japanese"
+msgid "Japanese"
+msgstr "Japanski"
 
 #: ../libbalsa/misc.c:630
-msgid "korean"
-msgstr "korejski"
+#| msgid "_Korean"
+msgid "Korean"
+msgstr "Korejski"
 
 #: ../libbalsa/misc.c:823
 #, c-format
@@ -1481,8 +1542,9 @@ msgstr "Vreme je isteklo pri pokušaju da postavim katanac „fcntl“!"
 
 #: ../libbalsa/misc.c:966
 #, c-format
-msgid "Waiting for fcntl lock... %d"
-msgstr "Čekam na katanac „fcntl“... %d"
+#| msgid "Waiting for fcntl lock... %d"
+msgid "Waiting for fcntl lock… %d"
+msgstr "Čekam na katanac „fcntl“… %d"
 
 #: ../libbalsa/misc.c:994
 msgid "Timeout exceeded while attempting flock lock!"
@@ -1490,189 +1552,190 @@ msgstr "Vreme je isteklo pri pokušaju da postavim katanac „flock“!"
 
 #: ../libbalsa/misc.c:1001
 #, c-format
-msgid "Waiting for flock attempt... %d"
-msgstr "Čekam na pokušaj zaključavanja „flock“... %d"
+#| msgid "Waiting for flock attempt... %d"
+msgid "Waiting for flock attempt… %d"
+msgstr "Čekam na pokušaj zaključavanja „flock“… %d"
 
 #: ../libbalsa/misc.c:1283
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "LDAP katalog za %s"
 
-#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:699 ../libbalsa/rfc2445.c:718
-#: ../libbalsa/rfc3156.c:720
+#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:697 ../libbalsa/rfc2445.c:716
+#: ../libbalsa/rfc3156.c:718
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libbalsa/rfc2445.c:91
+#: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "zahteva radnju"
 
-#: ../libbalsa/rfc2445.c:92
+#: ../libbalsa/rfc2445.c:90
 msgid "accepted"
 msgstr "prihvaćeno"
 
-#: ../libbalsa/rfc2445.c:93
+#: ../libbalsa/rfc2445.c:91
 msgid "declined"
 msgstr "odbijeno"
 
-#: ../libbalsa/rfc2445.c:94
+#: ../libbalsa/rfc2445.c:92
 msgid "tentatively accepted"
 msgstr "prihvaćeno s rezervom"
 
-#: ../libbalsa/rfc2445.c:95
+#: ../libbalsa/rfc2445.c:93
 msgid "delegated"
 msgstr "izaslano"
 
-#: ../libbalsa/rfc2445.c:96
+#: ../libbalsa/rfc2445.c:94
 msgid "completed"
 msgstr "završeno"
 
-#: ../libbalsa/rfc2445.c:97
+#: ../libbalsa/rfc2445.c:95
 msgid "in process"
 msgstr "u toku"
 
-#: ../libbalsa/rfc2445.c:700
+#: ../libbalsa/rfc2445.c:698
 msgid "Event Notification"
 msgstr "Obaveštenje događaja"
 
-#: ../libbalsa/rfc2445.c:701
+#: ../libbalsa/rfc2445.c:699
 msgid "Event Request"
 msgstr "Zahtev događaja"
 
-#: ../libbalsa/rfc2445.c:702
+#: ../libbalsa/rfc2445.c:700
 msgid "Reply to Event Request"
 msgstr "Odgovori na zahtev događaja"
 
-#: ../libbalsa/rfc2445.c:703
+#: ../libbalsa/rfc2445.c:701
 msgid "Event Cancellation"
 msgstr "Brisanje događaja"
 
-#: ../libbalsa/rfc2445.c:719
+#: ../libbalsa/rfc2445.c:717
 msgid "chair"
 msgstr "predsednik"
 
-#: ../libbalsa/rfc2445.c:720
+#: ../libbalsa/rfc2445.c:718
 msgid "required participant"
 msgstr "obavezan učesnik"
 
-#: ../libbalsa/rfc2445.c:721
+#: ../libbalsa/rfc2445.c:719
 msgid "optional participant"
 msgstr "mogući učesnik"
 
-#: ../libbalsa/rfc2445.c:722
+#: ../libbalsa/rfc2445.c:720
 msgid "non-participant, information only"
 msgstr "ne-učestvujući, samo podatak"
 
-#: ../libbalsa/rfc3156.c:626 ../libbalsa/rfc3156.c:633
+#: ../libbalsa/rfc3156.c:624 ../libbalsa/rfc3156.c:631
 msgid "decryption and signature verification failed"
 msgstr "nije uspelo dešifrovanje i provera potpisa"
 
-#: ../libbalsa/rfc3156.c:659
+#: ../libbalsa/rfc3156.c:657
 msgid "The signature is valid."
 msgstr "Potpis je ispravan."
 
-#: ../libbalsa/rfc3156.c:661
+#: ../libbalsa/rfc3156.c:659
 msgid "The signature is valid but expired."
 msgstr "Potpis je ispravan ali je istekao."
 
-#: ../libbalsa/rfc3156.c:664
+#: ../libbalsa/rfc3156.c:662
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
 msgstr "Potpis je ispravan ali je ključ za potvrdu potpisa istekao."
 
-#: ../libbalsa/rfc3156.c:667
+#: ../libbalsa/rfc3156.c:665
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
 msgstr "Potpis je ispravan ali je ključ za potvrdu potpisa povučen."
 
-#: ../libbalsa/rfc3156.c:670
+#: ../libbalsa/rfc3156.c:668
 msgid "The signature is invalid."
 msgstr "Potpis nije ispravan."
 
-#: ../libbalsa/rfc3156.c:673
+#: ../libbalsa/rfc3156.c:671
 msgid "The signature could not be verified due to a missing key."
 msgstr "Potpis nije mogao da bude proveren zbog nepostojanja ključa."
 
-#: ../libbalsa/rfc3156.c:675
+#: ../libbalsa/rfc3156.c:673
 msgid "This part is not a real PGP signature."
 msgstr "Ovaj deo nije pravi PGP potpis."
 
-#: ../libbalsa/rfc3156.c:678
+#: ../libbalsa/rfc3156.c:676
 msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
 "Potpis nije mogao da bude proveren zbog neispravnog mehanizma šifrovanja."
 
-#: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1048
+#: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:1046
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
 msgstr "GnuPG ponovo izgrađuje bazu poverenika i trenutno je nedostupan."
 
-#: ../libbalsa/rfc3156.c:687
+#: ../libbalsa/rfc3156.c:685
 msgid "An error prevented the signature verification."
 msgstr "Greška je sprečila proveru potpisa."
 
-#: ../libbalsa/rfc3156.c:698
+#: ../libbalsa/rfc3156.c:696
 msgid "The user ID is of unknown validity."
 msgstr "Korisnički IB je nepoznate ispravnosti."
 
-#: ../libbalsa/rfc3156.c:700
+#: ../libbalsa/rfc3156.c:698
 msgid "The validity of the user ID is undefined."
 msgstr "Ispravnost korisničkog IB-a nije određena."
 
-#: ../libbalsa/rfc3156.c:702
+#: ../libbalsa/rfc3156.c:700
 msgid "The user ID is never valid."
 msgstr "Korisnički IB nikada nije ispravan."
 
-#: ../libbalsa/rfc3156.c:704
+#: ../libbalsa/rfc3156.c:702
 msgid "The user ID is marginally valid."
 msgstr "Korisnički IB je delom ispravan."
 
-#: ../libbalsa/rfc3156.c:706
+#: ../libbalsa/rfc3156.c:704
 msgid "The user ID is fully valid."
 msgstr "Korisnički IB je u potpunosti ispravan."
 
-#: ../libbalsa/rfc3156.c:708
+#: ../libbalsa/rfc3156.c:706
 msgid "The user ID is ultimately valid."
 msgstr "Korisnički IB je uvek ispravan."
 
-#: ../libbalsa/rfc3156.c:710 ../libbalsa/rfc3156.c:732
+#: ../libbalsa/rfc3156.c:708 ../libbalsa/rfc3156.c:730
 msgid "bad validity"
 msgstr "loša ispravnost"
 
-#: ../libbalsa/rfc3156.c:722
+#: ../libbalsa/rfc3156.c:720
 msgid "undefined"
 msgstr "neodređeno"
 
-#: ../libbalsa/rfc3156.c:724 ../libbalsa/rfc3156.c:759
+#: ../libbalsa/rfc3156.c:722 ../libbalsa/rfc3156.c:757
 #: ../src/address-book-config.c:197
 msgid "never"
 msgstr "nikad"
 
-#: ../libbalsa/rfc3156.c:726
+#: ../libbalsa/rfc3156.c:724
 msgid "marginal"
 msgstr "delom"
 
-#: ../libbalsa/rfc3156.c:728
+#: ../libbalsa/rfc3156.c:726
 msgid "full"
 msgstr "potpuno"
 
-#: ../libbalsa/rfc3156.c:730
+#: ../libbalsa/rfc3156.c:728
 msgid "ultimate"
 msgstr "uvek"
 
-#: ../libbalsa/rfc3156.c:742
+#: ../libbalsa/rfc3156.c:740
 msgid "PGP signature: "
 msgstr "PGP potpis: "
 
-#: ../libbalsa/rfc3156.c:744
+#: ../libbalsa/rfc3156.c:742
 msgid "S/MIME signature: "
 msgstr "S/MIME potpis: "
 
-#: ../libbalsa/rfc3156.c:746
+#: ../libbalsa/rfc3156.c:744
 msgid "(unknown protocol) "
 msgstr "(nepoznat protokol) "
 
-#: ../libbalsa/rfc3156.c:776
+#: ../libbalsa/rfc3156.c:774
 #, c-format
 msgid ""
 "\n"
@@ -1681,7 +1744,7 @@ msgstr ""
 "\n"
 "Ispravnost potpisa: %s"
 
-#: ../libbalsa/rfc3156.c:779
+#: ../libbalsa/rfc3156.c:777
 #, c-format
 msgid ""
 "\n"
@@ -1690,7 +1753,7 @@ msgstr ""
 "\n"
 "Potpisan: %s"
 
-#: ../libbalsa/rfc3156.c:781
+#: ../libbalsa/rfc3156.c:779
 #, c-format
 msgid ""
 "\n"
@@ -1699,7 +1762,7 @@ msgstr ""
 "\n"
 "Verovanje ključu vlasnika: %s"
 
-#: ../libbalsa/rfc3156.c:785
+#: ../libbalsa/rfc3156.c:783
 #, c-format
 msgid ""
 "\n"
@@ -1708,15 +1771,18 @@ msgstr ""
 "\n"
 "Otisak ključa: %s"
 
-#: ../libbalsa/rfc3156.c:799
+#: ../libbalsa/rfc3156.c:797
+#| msgid ""
+#| "\n"
+#| "User ID's:"
 msgid ""
 "\n"
-"User ID's:"
+"User IDs:"
 msgstr ""
 "\n"
 "IB korisnika:"
 
-#: ../libbalsa/rfc3156.c:802
+#: ../libbalsa/rfc3156.c:800
 msgid ""
 "\n"
 "User ID:"
@@ -1724,15 +1790,15 @@ msgstr ""
 "\n"
 "IB korisnika:"
 
-#: ../libbalsa/rfc3156.c:813
+#: ../libbalsa/rfc3156.c:811
 msgid " [Revoked]"
 msgstr " [Povučen]"
 
-#: ../libbalsa/rfc3156.c:815
+#: ../libbalsa/rfc3156.c:813
 msgid " [Invalid]"
 msgstr " [Neispravan]"
 
-#: ../libbalsa/rfc3156.c:842
+#: ../libbalsa/rfc3156.c:840
 #, c-format
 msgid ""
 "\n"
@@ -1741,7 +1807,7 @@ msgstr ""
 "\n"
 "Podključ je stvoren: %s"
 
-#: ../libbalsa/rfc3156.c:844
+#: ../libbalsa/rfc3156.c:842
 #, c-format
 msgid ""
 "\n"
@@ -1750,25 +1816,25 @@ msgstr ""
 "\n"
 "Podključ ističe: %s"
 
-#: ../libbalsa/rfc3156.c:853
+#: ../libbalsa/rfc3156.c:851
 msgid " revoked"
 msgstr " povučen"
 
-#: ../libbalsa/rfc3156.c:858
+#: ../libbalsa/rfc3156.c:856
 msgid " expired"
 msgstr " istekao"
 
-#: ../libbalsa/rfc3156.c:863
+#: ../libbalsa/rfc3156.c:861
 msgid " disabled"
 msgstr " isključen"
 
-#: ../libbalsa/rfc3156.c:868
+#: ../libbalsa/rfc3156.c:866
 msgid " invalid"
 msgstr " neispravan"
 
 #. ngettext: string begins with a single space, so no space
 #. * after the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:872
+#: ../libbalsa/rfc3156.c:870
 #, c-format
 msgid ""
 "\n"
@@ -1789,7 +1855,7 @@ msgstr[3] ""
 "\n"
 "Osobina podključa:%s"
 
-#: ../libbalsa/rfc3156.c:884
+#: ../libbalsa/rfc3156.c:882
 #, c-format
 msgid ""
 "\n"
@@ -1798,7 +1864,7 @@ msgstr ""
 "\n"
 "Izdavač: %s"
 
-#: ../libbalsa/rfc3156.c:888
+#: ../libbalsa/rfc3156.c:886
 #, c-format
 msgid ""
 "\n"
@@ -1807,7 +1873,7 @@ msgstr ""
 "\n"
 "Serijski broj izdavača: %s"
 
-#: ../libbalsa/rfc3156.c:891
+#: ../libbalsa/rfc3156.c:889
 #, c-format
 msgid ""
 "\n"
@@ -1816,12 +1882,12 @@ msgstr ""
 "\n"
 "IB lanca: %s"
 
-#: ../libbalsa/rfc3156.c:950
+#: ../libbalsa/rfc3156.c:948
 #, c-format
 msgid "Could not launch %s to query the public key %s."
 msgstr "Ne mogu da pokrenem „%s“ da bih propitao javni ključ „%s“."
 
-#: ../libbalsa/rfc3156.c:1000
+#: ../libbalsa/rfc3156.c:998
 #, c-format
 msgid ""
 "Running %s failed with return value %d:\n"
@@ -1830,7 +1896,7 @@ msgstr ""
 "Pokretanje „%s“ nije uspelo sa povratnom vrednošću „%d:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1007
+#: ../libbalsa/rfc3156.c:1005
 #, c-format
 msgid ""
 "Running %s successful:\n"
@@ -1839,132 +1905,90 @@ msgstr ""
 "Pokretanje „%s“ je uspelo:\n"
 "%s"
 
-#: ../libbalsa/rfc3156.c:1049
+#: ../libbalsa/rfc3156.c:1047
 msgid "Try again later."
 msgstr "Pokušajte kasnije."
 
-#: ../libbalsa/send.c:248 ../libbalsa/send.c:255
-msgid "Sending Mail..."
-msgstr "Šaljem poštu..."
-
-#: ../libbalsa/send.c:252 ../src/main-window.c:3257
-msgid "_Hide"
-msgstr "_Sakrij"
-
-#: ../libbalsa/send.c:961
+#: ../libbalsa/rfc6350.c:62
 #, c-format
-msgid ""
-"Could not send the message to %s:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
-msgstr ""
-"Ne mogu da pošaljem poruku za %s:\n"
-"%d: %s\n"
-"Poruka je zadržana u sandučetu „Odlazna“.\n"
+msgid "malformed card, BEGIN:VCARD expected"
+msgstr "loša kartica, očekivano je „BEGIN:VCARD“"
 
-#: ../libbalsa/send.c:1007
+#: ../libbalsa/rfc6350.c:100
 #, c-format
-msgid "Saving sent message to %s failed: %s"
-msgstr "Nisam uspeo da sačuvam poslatu poruku u „%s“: %s"
+msgid "malformed card, END:VCARD missing"
+msgstr "loša kartica, nedostaje „END:VCARD“"
 
-#: ../libbalsa/send.c:1037 ../libbalsa/send.c:1049
+#: ../libbalsa/rfc6350.c:259
 #, c-format
-msgid ""
-"Relaying refused:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
-msgstr ""
-"Prosleđivanje je odbijeno:\n"
-"%d: %s\n"
-"Poruka je ostala u odlaznoj pošti.\n"
+msgid "malformed line “%s”, missing “:”"
+msgstr "loš red „%s“, nedostaje „:“"
 
-#: ../libbalsa/send.c:1056
-msgid ""
-"Message submission problem, placing it into your outbox.\n"
-"System will attempt to resubmit the message until you delete it."
-msgstr ""
-"Problem sa slanjem poruke, smeštam je u „Odlaznu“.\n"
-"Sistem će pokušavati sa ponovnim slanjem poruke sve dok je ne obrišete."
+#: ../libbalsa/rfc6350.c:270
+#, c-format
+msgid "malformed line “%s”, empty name or value"
+msgstr "loš red „%s“, prazan naziv ili vrednost"
 
-#: ../libbalsa/send.c:1085
-msgid "Connected to MTA"
-msgstr "Povezan sam na APP"
+#: ../libbalsa/send.c:204 ../libbalsa/send.c:211
+#| msgid "Sending Mail..."
+msgid "Sending Mail…"
+msgstr "Šaljem poštu…"
 
-#. status code, mailbox
-#: ../libbalsa/send.c:1094
-#, c-format
-msgid "From: %d <%s>"
-msgstr "Šalje: %d <%s>"
+#: ../libbalsa/send.c:208 ../src/main-window.c:3254
+msgid "_Hide"
+msgstr "_Sakrij"
 
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1098
+#: ../libbalsa/send.c:797
 #, c-format
-msgid "From %s: %d %s"
-msgstr "Šalje %s: %d %s"
+#| msgid "Connected to MTA"
+msgid "Connected to MTA %s: %s"
+msgstr "Povezan sam na MTA „%s“: %s"
 
-#. status code, mailbox
-#: ../libbalsa/send.c:1109
+#: ../libbalsa/send.c:830
 #, c-format
-msgid "To: %d <%s>"
-msgstr "Prima: %d <%s>"
+msgid "Saving sent message to %s failed: %s"
+msgstr "Nisam uspeo da sačuvam poslatu poruku u „%s“: %s"
 
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1113
+#: ../libbalsa/send.c:847
 #, c-format
-msgid "To %s: %d %s"
-msgstr "Prima %s: %d %s"
-
-#: ../libbalsa/send.c:1151
-msgid "Disconnected"
-msgstr "Nepovezan"
-
-#: ../libbalsa/send.c:1382
-msgid ""
-"SMTP server refused connection.\n"
-"Check your internet connection."
-msgstr ""
-"SMTP server je odbio vezu.\n"
-"Proverite vašu internet vezu."
-
-#: ../libbalsa/send.c:1387
+#| msgid ""
+#| "Relaying refused:\n"
+#| "%d: %s\n"
+#| "Message left in your outbox.\n"
 msgid ""
-"SMTP server cannot be reached.\n"
-"Check your internet connection."
+"Sending message failed: %s\n"
+"Message left in your outbox."
 msgstr ""
-"SMTP server ne može biti pristupljen.\n"
-"Proverite vašu internet vezu."
-
-#: ../libbalsa/send.c:1396
-msgid "Message left in Outbox (try again later)"
-msgstr "Ostala je poruka u sandučetu (pokušajte kasnije)"
+"Slanje poruke nije uspelo: %s\n"
+"Poruka je ostala u odlaznoj pošti."
 
-#: ../libbalsa/send.c:1400
+#: ../libbalsa/send.c:857
 #, c-format
-msgid ""
-"SMTP server problem (%d): %s\n"
-"Message is left in outbox."
-msgstr ""
-"Problem SMTP servera (%d): %s\n"
-"Poruka je ostala u odlaznom."
+#| msgid "Scanning of %s failed: %s"
+msgid "Connecting MTA %s (%s) failed: %s"
+msgstr "Povezivanje MTA „%s“ (%s) nije uspelo: %s"
 
-#: ../libbalsa/send.c:1706 ../libbalsa/send.c:1775
+#: ../libbalsa/send.c:1018 ../libbalsa/send.c:1087
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Ne mogu da pročitam %s: %s"
 
-#: ../libbalsa/send.c:1709 ../libbalsa/send.c:1778
+#: ../libbalsa/send.c:1021 ../libbalsa/send.c:1090
 #, c-format
 msgid "Cannot read %s"
 msgstr "Ne mogu da pročitam „%s“"
 
-#: ../libbalsa/send.c:1739
+#: ../libbalsa/send.c:1051
 #, c-format
-msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
+#| msgid ""
+#| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
+msgid ""
+"Cannot determine character set for text file “%s”; sending as MIME type “%s”"
 msgstr ""
-"Ne mogu da odredim znakovni skup za tekstualnu datoteku „%s“; šaljem kao mime "
+"Ne mogu da odredim znakovni skup za tekstualnu datoteku „%s“; šaljem kao MIME "
 "vrstu „%s“"
 
-#: ../libbalsa/send.c:2114
+#: ../libbalsa/send.c:1469
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac."
@@ -1972,123 +1996,131 @@ msgstr[1] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primaoci."
 msgstr[2] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primaoci."
 msgstr[3] "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac."
 
-#: ../libbalsa/send.c:2202
+#: ../libbalsa/send.c:1557
 msgid "This message will not be encrypted for the BCC: recipient(s)."
 msgstr "Ova poruka neće biti šifrovana za nevidljivu kopiju: primalac(oci)."
 
 #. host, authentication method
-#: ../libbalsa/server.c:496
+#: ../libbalsa/server.c:501
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Prijavljujem se na „%s“ koristeći %s"
 
-#: ../libbalsa/smtp-server.c:383 ../src/mailbox-conf.c:205
-#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:391
-#: ../src/pref-manager.c:3334
-msgid "Never"
-msgstr "Nikad"
+#: ../libbalsa/smtp-server.c:298
+msgid "SMTP over SSL (SMTPS)"
+msgstr "SMTP preko SSL-a (SMTPS)"
 
-#: ../libbalsa/smtp-server.c:385 ../src/mailbox-conf.c:206
-#: ../src/mailbox-conf.c:1440
-msgid "If Possible"
-msgstr "Ako je moguće"
+#: ../libbalsa/smtp-server.c:299
+#| msgid "Required"
+msgid "TLS required"
+msgstr "TLS je potrebno"
 
-#: ../libbalsa/smtp-server.c:387 ../src/mailbox-conf.c:207
-msgid "Required"
-msgstr "Uvek"
+#: ../libbalsa/smtp-server.c:300
+msgid "TLS if possible (not recommended)"
+msgstr "TLS ako je moguće (ne preporučuje se)"
 
-#: ../libbalsa/smtp-server.c:423
+#: ../libbalsa/smtp-server.c:301
+msgid "None (not recommended)"
+msgstr "Ništa (ne preporučuje se)"
+
+#: ../libbalsa/smtp-server.c:324
 #, c-format
 msgid "Error displaying server help: %s\n"
 msgstr "Greška prikazivanja pomoći servera: %s\n"
 
-#: ../libbalsa/smtp-server.c:538
+#: ../libbalsa/smtp-server.c:425
 msgid "SMTP Server"
 msgstr "SMTP server"
 
-#: ../libbalsa/smtp-server.c:566
+#: ../libbalsa/smtp-server.c:453
 msgid "_Descriptive Name:"
 msgstr "Opisni _naziv:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:573 ../src/folder-conf.c:380
-#: ../src/mailbox-conf.c:1188 ../src/mailbox-conf.c:1303
+#: ../libbalsa/smtp-server.c:460 ../src/folder-conf.c:377
+#: ../src/mailbox-conf.c:1186 ../src/mailbox-conf.c:1301
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libbalsa/smtp-server.c:580
+#: ../libbalsa/smtp-server.c:467
 msgid "_User Name:"
 msgstr "_Korisničko ime:"
 
-#: ../libbalsa/smtp-server.c:587
+#: ../libbalsa/smtp-server.c:474
 msgid "_Pass Phrase:"
 msgstr "_Lozinka:"
 
-#: ../libbalsa/smtp-server.c:596 ../src/mailbox-conf.c:227
-msgid "Use _TLS:"
-msgstr "Koristi _TLS:"
+#: ../libbalsa/smtp-server.c:482
+#| msgid "Security"
+msgid "Se_curity:"
+msgstr "_Bezbednost:"
 
-#: ../libbalsa/smtp-server.c:601
+#: ../libbalsa/smtp-server.c:487
 msgid "C_ertificate Pass Phrase:"
 msgstr "Lozinka _uverenja:"
 
-#: ../libbalsa/smtp-server.c:613
+#: ../libbalsa/smtp-server.c:498
 msgid "Sp_lit message larger than"
 msgstr "_Podeli poruke veće od"
 
-#: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1897
+#: ../libbalsa/smtp-server.c:503 ../src/pref-manager.c:1880
 msgid "MB"
 msgstr "MB"
 
-#: ../libbalsa/source-viewer.c:130
+#: ../libbalsa/source-viewer.c:128
 msgid "Mailbox closed"
 msgstr "Sanduče je zatvoreno"
 
-#: ../libbalsa/source-viewer.c:235
+#: ../libbalsa/source-viewer.c:238
 msgid "Message Source"
 msgstr "Izvor poruke"
 
-#: ../libbalsa/source-viewer.c:247 ../src/main-window.c:2062
-#: ../src/message-window.c:847
+#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2059
+#: ../src/message-window.c:848
 #, c-format
 msgid "Error adding from %s: %s\n"
 msgstr "Greška dodavanja iz „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:68
+#: ../libinit_balsa/assistant_helper.c:66
 #, c-format
 msgid "Error loading %s: %s\n"
 msgstr "Greška učitavanja „%s“: %s\n"
 
-#: ../libinit_balsa/assistant_helper.c:203
+#: ../libinit_balsa/assistant_helper.c:201
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
 msgstr ""
 "Putanja „%s“ mora da se odnosi na koren sistema datoteka (počnite sa /)."
 
-#: ../libinit_balsa/assistant_helper.c:215
+#: ../libinit_balsa/assistant_helper.c:213
 #, c-format
+#| msgid ""
+#| "Couldn't create a directory: mkdir() failed on pathname \"%s\", with "
+#| "error \"%s\"."
 msgid ""
-"Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
-"\"%s\"."
+"Couldn’t create a directory: mkdir() failed on pathname “%s”, with error "
+"“%s”."
 msgstr ""
 "Ne mogu da stvorim direktorijum: nije uspela funkcija „mkdir()“ za naziv "
 "putanje „%s“, sa greškom „%s“."
 
-#: ../libinit_balsa/assistant_helper.c:227
-#: ../libinit_balsa/assistant_helper.c:250
+#: ../libinit_balsa/assistant_helper.c:225
+#: ../libinit_balsa/assistant_helper.c:248
 #, c-format
-msgid "The file with pathname \"%s\" is not a directory."
+#| msgid "The file with pathname \"%s\" is not a directory."
+msgid "The file with pathname “%s” is not a directory."
 msgstr "Datoteka sa nazivom putanje „%s“ nije direktorijum."
 
-#: ../libinit_balsa/assistant_helper.c:241
+#: ../libinit_balsa/assistant_helper.c:239
 #, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgid "Couldn’t create a directory: mkdir() failed on pathname “%s”."
 msgstr ""
 "Ne mogu da stvorim direktorijum: nije uspela funkcija „mkdir()“ za naziv "
 "putanje „%s“."
 
-#: ../libinit_balsa/assistant_init.c:51
+#: ../libinit_balsa/assistant_init.c:49
 msgid ""
 "This will exit Balsa.\n"
 "Do you really want to do this?"
@@ -2096,86 +2128,93 @@ msgstr ""
 "Ovim će se izaći iz Balse.\n"
 "Da li zaista želite to da uradite?"
 
-#: ../libinit_balsa/assistant_init.c:71
+#: ../libinit_balsa/assistant_init.c:69
 msgid "GnomeCard Address Book"
 msgstr "Adresar Gnomove kartice"
 
-#: ../libinit_balsa/assistant_init.c:78 ../libinit_balsa/assistant_init.c:86
-#: ../src/ab-window.c:235
+#: ../libinit_balsa/assistant_init.c:76 ../libinit_balsa/assistant_init.c:84
+#: ../src/ab-window.c:243
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../libinit_balsa/assistant_init.c:139
+#: ../libinit_balsa/assistant_init.c:137
 msgid "Configure Balsa"
 msgstr "Podesite Balsu"
 
-#: ../libinit_balsa/assistant_page_defclient.c:56
+#: ../libinit_balsa/assistant_page_defclient.c:54
 msgid "Use Balsa as default email client?"
 msgstr "Da koristim Balsu kao osnovni program za poštu?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:60
+#: ../libinit_balsa/assistant_page_defclient.c:58
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libinit_balsa/assistant_page_defclient.c:62
+#: ../libinit_balsa/assistant_page_defclient.c:60
 msgid "_No"
 msgstr "_Ne"
 
-#: ../libinit_balsa/assistant_page_defclient.c:96
+#: ../libinit_balsa/assistant_page_defclient.c:94
 msgid "Default Client"
 msgstr "Osnovni program"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Inbox:"
 msgstr "_Dolazna:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Outbox:"
 msgstr "_Odlazna:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Sentbox:"
 msgstr "_Poslane:"
 
-#: ../libinit_balsa/assistant_page_directory.c:50
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Draftbox:"
 msgstr "_Skice:"
 
-#: ../libinit_balsa/assistant_page_directory.c:51
+#: ../libinit_balsa/assistant_page_directory.c:49
 msgid "_Trash:"
 msgstr "Sme_će:"
 
-#: ../libinit_balsa/assistant_page_directory.c:85
+#: ../libinit_balsa/assistant_page_directory.c:83
 #, c-format
+#| msgid ""
+#| "The pathname \"%s\" must be specified canonically -- it must start with a "
+#| "'/'."
 msgid ""
-"The pathname \"%s\" must be specified canonically -- it must start with a "
-"'/'."
+"The pathname “%s” must be specified canonically — it must start with a “/”."
 msgstr "Putanja „%s“ mora da bude zadana u potpunosti – mora da počinje sa „/“."
 
-#: ../libinit_balsa/assistant_page_directory.c:125
+#: ../libinit_balsa/assistant_page_directory.c:123
 #, c-format
-msgid "Could not create mailbox at path \"%s\"\n"
+#| msgid "Could not create mailbox at path \"%s\"\n"
+msgid "Could not create mailbox at path “%s”\n"
 msgstr "Ne mogu da napravim sanduče na putanji „%s“\n"
 
-#: ../libinit_balsa/assistant_page_directory.c:157
+#: ../libinit_balsa/assistant_page_directory.c:155
 #, c-format
-msgid "The mailbox \"%s\" does not appear to be valid."
+#| msgid "The mailbox \"%s\" does not appear to be valid."
+msgid "The mailbox “%s” does not appear to be valid."
 msgstr "Sanduče „%s“ ne izgleda ispravno."
 
-#: ../libinit_balsa/assistant_page_directory.c:191
+#: ../libinit_balsa/assistant_page_directory.c:189
 #, c-format
+#| msgid ""
+#| "Problem verifying path \"%s\":\n"
+#| "%s"
 msgid ""
-"Problem verifying path \"%s\":\n"
+"Problem verifying path “%s”:\n"
 "%s"
 msgstr ""
 "Problem provere putanje „%s“:\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_directory.c:224
+#: ../libinit_balsa/assistant_page_directory.c:222
 msgid "_Verify locations"
 msgstr "_Proveri mesta"
 
-#: ../libinit_balsa/assistant_page_directory.c:258
+#: ../libinit_balsa/assistant_page_directory.c:256
 msgid ""
 "Please verify the locations of your default mail files. These will be "
 "created if necessary."
@@ -2183,100 +2222,108 @@ msgstr ""
 "Molim proverite mesta vaših osnovnih datoteka pošte. One će biti stvorene po "
 "potrebi."
 
-#: ../libinit_balsa/assistant_page_directory.c:322
+#: ../libinit_balsa/assistant_page_directory.c:320
 msgid "Mail Files"
 msgstr "Datoteke pošte"
 
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
+#| msgid ""
+#| "You've successfully set up Balsa. Have fun!\n"
+#| "   -- The Balsa development team"
 msgid ""
-"You've successfully set up Balsa. Have fun!\n"
+"You’ve successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
 msgstr ""
 "Uspešno ste podesili Balsu. Zabavite se!\n"
 "   — Razvojna ekipa Balse"
 
-#: ../libinit_balsa/assistant_page_finish.c:49
+#: ../libinit_balsa/assistant_page_finish.c:47
 msgid "All Done!"
 msgstr "Sve je urađeno!"
 
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
+#| msgid ""
+#| "The following settings are also needed (and you can find them later, if "
+#| "need be, in the Email application in the 'Preferences' and 'Identities' "
+#| "menu items)"
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
-"be, in the Email application in the 'Preferences' and 'Identities' menu "
+"be, in the Email application in the “Preferences” and “Identities” menu "
 "items)"
 msgstr ""
 "Sledeća podešavanja su takođe potrebna (možete ih pronaći kasnije, ako bude "
-"bilo potrebno, u programu el-pošte u stavkama izbornika „Postavke“ i "
+"bilo potrebno, u programu e-pošte u stavkama izbornika „Postavke“ i "
 "„Ličnosti“)"
 
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
 "have set this up for you):"
 msgstr ""
-" Ko vam obezbeđuje nalog el-pošte treba da bude u mogućnosti da vam da "
+" Ko vam obezbeđuje nalog e-pošte treba da bude u mogućnosti da vam da "
 "sledeće podatke (ako imate administratora mreže, možda je on ovo već "
 "podesio):"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "Yes, remember it"
 msgstr "Da, zapamti je"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
 msgid "No, type it in every time"
 msgstr "Ne, upiši je svaki put"
 
-#: ../libinit_balsa/assistant_page_user.c:103
+#: ../libinit_balsa/assistant_page_user.c:99
 msgid "Name of mail server for incoming _mail:"
 msgstr "Naziv servera pošte za dolaznu _poštu:"
 
-#: ../libinit_balsa/assistant_page_user.c:108
+#: ../libinit_balsa/assistant_page_user.c:104
 msgid "_Type of mail server:"
 msgstr "_Vrsta servera pošte:"
 
-#: ../libinit_balsa/assistant_page_user.c:112
+#: ../libinit_balsa/assistant_page_user.c:108
 msgid "Connect using _SSL:"
 msgstr "Poveži se koristeći _SSL:"
 
-#: ../libinit_balsa/assistant_page_user.c:115
+#: ../libinit_balsa/assistant_page_user.c:111
 msgid "Your email _login name:"
 msgstr "Vaše ime za _prijavljivanje:"
 
-#: ../libinit_balsa/assistant_page_user.c:118
+#: ../libinit_balsa/assistant_page_user.c:114
 msgid "Your _password:"
 msgstr "Vaša _lozinka:"
 
-#: ../libinit_balsa/assistant_page_user.c:126
+#: ../libinit_balsa/assistant_page_user.c:121
 msgid "_SMTP Server:"
 msgstr "_SMTP server:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:131
+#: ../libinit_balsa/assistant_page_user.c:125
 msgid "Your real _name:"
 msgstr "Vaše pravo _ime:"
 
-#: ../libinit_balsa/assistant_page_user.c:137
-msgid "Your _Email Address, for this email account:"
-msgstr "Vaša adresa _el-pošte, za ovaj nalog:"
+#: ../libinit_balsa/assistant_page_user.c:131
+#| msgid "Your _Email Address, for this email account:"
+msgid "Your _email address for this email account:"
+msgstr "Vaša adresa _e-pošte, za ovaj nalog:"
 
-#: ../libinit_balsa/assistant_page_user.c:142
+#: ../libinit_balsa/assistant_page_user.c:136
 msgid "_Remember your password:"
 msgstr "_Zapamtite vašu lozinku:"
 
-#: ../libinit_balsa/assistant_page_user.c:147
+#: ../libinit_balsa/assistant_page_user.c:141
 msgid "_Local mail directory:"
 msgstr "_Mesni direktorijum pošte:"
 
-#: ../libinit_balsa/assistant_page_user.c:165
+#: ../libinit_balsa/assistant_page_user.c:159
 msgid "User Settings"
 msgstr "Korisnička podešavanja"
 
-#: ../libinit_balsa/assistant_page_user.c:286
+#: ../libinit_balsa/assistant_page_user.c:278
 msgid "Default Identity"
 msgstr "Osnovna ličnost"
 
-#: ../libinit_balsa/assistant_page_user.c:326
+#: ../libinit_balsa/assistant_page_user.c:316
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2285,117 +2332,224 @@ msgstr ""
 "Problem sa mesnom poštom\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_welcome.c:29
+#: ../libinit_balsa/assistant_page_welcome.c:27
 msgid "Welcome to Balsa!"
 msgstr "Dobrodošli u Balsu!"
 
-#: ../libinit_balsa/assistant_page_welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:30
+#| msgid ""
+#| "Before you can send or receive email:\n"
+#| "\n"
+#| "-- either you should already have Internet access and an email account, "
+#| "provided by an Internet Service Provider, and you should have made that "
+#| "Internet connection on your computer\n"
+#| "\n"
+#| "-- or your Network Administrator at your place of work/study/similar may "
+#| "have set up your computer to connect to the network."
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
-"-- either you should already have Internet access and an email account, "
+"• either you should already have Internet access and an email account, "
 "provided by an Internet Service Provider, and you should have made that "
 "Internet connection on your computer\n"
 "\n"
-"-- or your Network Administrator at your place of work/study/similar may "
-"have set up your computer to connect to the network."
+"• or your network administrator at your place of work/study/similar may have "
+"set up your computer to connect to the network."
 msgstr ""
 "Pre nego što ćete moći da šaljete ili primate poštu:\n"
 "\n"
-"— trebalo bi već da imate pristup na Internet i nalog el-pošte, koji vam "
+"• trebalo bi već da imate pristup na Internet i nalog e-pošte, koji vam "
 "dostavlja vaš dostavljač internet usluga, i trebalo bi da ste uspostavili "
 "Internet vezu na vašem računaru\n"
 "\n"
-"— ili da je vaš administrator mreže na vašem radnom mestu/kancelariji već "
+"• ili da je vaš administrator mreže na vašem radnom mestu/kancelariji već "
 "podesio vaš računar za povezivanje na mrežu."
 
+#: ../libnetclient/net-client-smtp.c:135
+#, c-format
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
+msgid "remote server does not support STARTTLS"
+msgstr "udaljeni server ne podržava STARTTLS"
+
+#: ../libnetclient/net-client-smtp.c:388
+#, c-format
+msgid "no suitable authentication mechanism"
+msgstr "nema odgovarajućeg mehanizma potvrđivanja identiteta"
+
+#: ../libnetclient/net-client-smtp.c:509 ../libnetclient/net-client-smtp.c:576
+#: ../libnetclient/net-client-smtp.c:618
+#, c-format
+#| msgid "Mail server: %s\n"
+msgid "bad server reply: %s"
+msgstr "loš odgovor servera: %s"
+
+#: ../libnetclient/net-client-smtp.c:608
+#, c-format
+#| msgid "Sending error: %s"
+msgid "transient error %d: %s"
+msgstr "prolazna greška %d: %s"
+
+#: ../libnetclient/net-client-smtp.c:613
+#, c-format
+#| msgid "Sending error: %s"
+msgid "permanent error %d: %s"
+msgstr "stalna greška %d: %s"
+
+#: ../libnetclient/net-client.c:80 ../libnetclient/net-client.c:117
+#, c-format
+msgid "network client is already connected"
+msgstr "klijent mreže je već povezan"
+
+#: ../libnetclient/net-client.c:154 ../libnetclient/net-client.c:197
+#, c-format
+msgid "network client is not connected"
+msgstr "klijent mreže nije povezan"
+
+#: ../libnetclient/net-client.c:165
+#, c-format
+msgid "reply length %lu exceeds the maximum allowed length %lu"
+msgstr "dužina odgovora %lu prevazilazi najveću dozvoljenu dužinu %lu"
+
+#: ../libnetclient/net-client.c:180
+#, c-format
+msgid "connection lost"
+msgstr "veza je izgubljena"
+
+#: ../libnetclient/net-client.c:228
+#, c-format
+msgid "line too long"
+msgstr "red je predug"
+
+#: ../libnetclient/net-client.c:297
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing certificate: %s"
+msgstr "greška pokretanja uverenja: %s"
+
+#: ../libnetclient/net-client.c:307
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading certificate: %s"
+msgstr "greška učitavanja uverenja: %s"
+
+#: ../libnetclient/net-client.c:315
+#, c-format
+#| msgid "Error printing message: %s"
+msgid "error initializing key: %s"
+msgstr "greška pokretanja ključa: %s"
+
+#: ../libnetclient/net-client.c:371
+#, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading key: %s"
+msgstr "greška učitavanja ključa: %s"
+
+#: ../libnetclient/net-client.c:411
+#, c-format
+#| msgid "Disconnected"
+msgid "not connected"
+msgstr "nepovezan"
+
+#: ../libnetclient/net-client.c:413
+#, c-format
+msgid "connection is already encrypted"
+msgstr "veza je već šifrovana"
+
 #: ../sounds/balsa.soundlist.in.h:1
-msgid "Balsa E-mail reader"
-msgstr "Čitač el-pošte Balsa"
+#| msgid "Balsa E-mail reader"
+msgid "Balsa Email Reader"
+msgstr "Čitač e-pošte Balsa"
 
 #: ../sounds/balsa.soundlist.in.h:2
-msgid "Program startup"
+#| msgid "Program startup"
+msgid "Program start-up"
 msgstr "Pokretanje programa"
 
 #: ../sounds/balsa.soundlist.in.h:3
 msgid "New mail notification"
 msgstr "Obaveštenje o novoj pošti"
 
-#: ../src/ab-main.c:214 ../src/ab-window.c:694
+#: ../src/ab-main.c:212 ../src/ab-window.c:702
 msgid " address book: "
 msgstr " adresar: "
 
-#: ../src/ab-main.c:746
+#: ../src/ab-main.c:744
 msgid "_Name"
 msgstr "_Naziv"
 
-#: ../src/ab-main.c:762
+#: ../src/ab-main.c:760
 msgid "_Address"
 msgstr "_Adresa"
 
-#: ../src/ab-main.c:850 ../src/address-book-config.c:226
-#: ../src/address-book-config.c:327 ../src/filter-edit-dialog.c:500
-#: ../src/main-window.c:4002 ../src/pref-manager.c:507
+#: ../src/ab-main.c:848 ../src/address-book-config.c:226
+#: ../src/address-book-config.c:331 ../src/address-book-config.c:375
+#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3996
+#: ../src/pref-manager.c:490
 msgid "_Apply"
 msgstr "_Primeni"
 
-#: ../src/ab-main.c:888
+#: ../src/ab-main.c:886
 msgid "F_ilter:"
 msgstr "_Propusnik:"
 
-#: ../src/ab-window.c:176 ../src/filter-edit-dialog.c:209
-#: ../src/filter-export-dialog.c:93 ../src/filter-run-dialog.c:226
-#: ../src/filter-run-dialog.c:331
+#: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
+#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:224
+#: ../src/filter-run-dialog.c:329
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/ab-window.c:184
-msgid "E-Mail Address"
-msgstr "Adresa el-pošte"
+#: ../src/ab-window.c:192 ../src/balsa-print-object-text.c:502
+msgid "Email Address"
+msgstr "Adresa e-pošte"
 
 #. -- grid column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:285
+#: ../src/ab-window.c:293
 msgid "_Search for Name:"
 msgstr "_Traži ime:"
 
-#: ../src/ab-window.c:318
-#| msgid "Run Editor"
+#: ../src/ab-window.c:326
 msgid "Run _Editor"
 msgstr "Pokreni _uređivača"
 
-#: ../src/ab-window.c:324
-msgid "_Re-Import"
+#: ../src/ab-window.c:332
+#| msgid "_Re-Import"
+msgid "_Re-import"
 msgstr "_Ponovo uvezi"
 
 #. -- grid column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:358
+#: ../src/ab-window.c:366
 msgid "Send-To"
 msgstr "Pošalji"
 
 #. mode switching stuff
-#: ../src/ab-window.c:372
+#: ../src/ab-window.c:380
 msgid "Treat multiple addresses as:"
 msgstr "Smatraj više adresa kao:"
 
-#: ../src/ab-window.c:376
+#: ../src/ab-window.c:384
 msgid "alternative addresses for the same person"
 msgstr "alternativne adrese iste osobe"
 
-#: ../src/ab-window.c:381
+#: ../src/ab-window.c:389
 msgid "a distribution list"
 msgstr "spisak primalaca"
 
-#: ../src/ab-window.c:425
+#: ../src/ab-window.c:433
 #, c-format
 msgid "Could not launch %s: %s"
 msgstr "Ne mogu da pokrenem %s: %s"
 
-#: ../src/ab-window.c:722
+#: ../src/ab-window.c:730
 #, c-format
+#| msgid ""
+#| "Error opening address book '%s':\n"
+#| "%s"
 msgid ""
-"Error opening address book '%s':\n"
+"Error opening address book “%s”:\n"
 "%s"
 msgstr ""
 "Greška otvaranja adresara „%s“\n"
@@ -2413,117 +2567,138 @@ msgstr "kada kucam"
 msgid "when I hit the Escape key"
 msgstr "kada pritisnem taster „Eskejp“"
 
-#: ../src/address-book-config.c:225 ../src/address-book-config.c:326
+#: ../src/address-book-config.c:225 ../src/address-book-config.c:330
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Izmeni adresar „%s“"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:329
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:333
 #, c-format
 msgid "Add %s Address Book"
 msgstr "Dodaj adresar „%s“"
 
-#: ../src/address-book-config.c:230 ../src/address-book-config.c:330
-#: ../src/mailbox-conf.c:554 ../src/pref-manager.c:1698
-#: ../src/pref-manager.c:1771 ../src/pref-manager.c:2871
+#: ../src/address-book-config.c:230 ../src/address-book-config.c:334
+#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:552
+#: ../src/pref-manager.c:1683 ../src/pref-manager.c:1755
+#: ../src/pref-manager.c:2854
 msgid "_Add"
 msgstr "_Dodaj"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:249 ../src/address-book-config.c:368
-#: ../src/address-book-config.c:434 ../src/address-book-config.c:501
+#: ../src/address-book-config.c:249 ../src/address-book-config.c:400
+#: ../src/address-book-config.c:426 ../src/address-book-config.c:492
+#: ../src/address-book-config.c:559
 msgid "A_ddress Book Name:"
 msgstr "Naziv _adresara:"
 
-#: ../src/address-book-config.c:373
+#: ../src/address-book-config.c:374
+#, c-format
+#| msgid "Modify %s Address Book"
+msgid "Modify Osmo Address Book"
+msgstr "Izmeni adresar Osmoa"
+
+#: ../src/address-book-config.c:378
+#, c-format
+#| msgid "Add %s Address Book"
+msgid "Add Osmo Address Book"
+msgstr "Dodaj adresar Osmoa"
+
+#: ../src/address-book-config.c:431
 msgid "Load program location:"
 msgstr "Mesto programa za učitavanje:"
 
-#: ../src/address-book-config.c:378
+#: ../src/address-book-config.c:436
 msgid "Select load program for address book"
 msgstr "Izaberite program za učitavanje adresara"
 
-#: ../src/address-book-config.c:386
+#: ../src/address-book-config.c:444
 msgid "Save program location:"
 msgstr "Mesto programa za čuvanje:"
 
-#: ../src/address-book-config.c:391
+#: ../src/address-book-config.c:449
 msgid "Select save program for address book"
 msgstr "Izaberite program za čuvanje adresara"
 
-#: ../src/address-book-config.c:439
+#: ../src/address-book-config.c:497
 msgid "_Host Name"
 msgstr "_Naziv domaćina"
 
-#: ../src/address-book-config.c:444
+#: ../src/address-book-config.c:502
 msgid "Base Domain _Name"
 msgstr "Osnovni naziv _domena"
 
-#: ../src/address-book-config.c:449
+#: ../src/address-book-config.c:507
 msgid "_User Name (Bind DN)"
 msgstr "_Korisničko ime (Bind DN)"
 
-#: ../src/address-book-config.c:454
+#: ../src/address-book-config.c:512
 msgid "_Password"
 msgstr "_Lozinka"
 
-#: ../src/address-book-config.c:460
+#: ../src/address-book-config.c:518
 msgid "_User Address Book DN"
 msgstr "DN _korisničkog adresara"
 
-#: ../src/address-book-config.c:466
+#: ../src/address-book-config.c:524
 msgid "Enable _TLS"
 msgstr "Uključi _TLS"
 
-#: ../src/address-book-config.c:503 ../src/address-book-config.c:890
+#: ../src/address-book-config.c:561 ../src/address-book-config.c:954
 msgid "GPE Address Book"
 msgstr "GPE adresar"
 
-#: ../src/address-book-config.c:536 ../src/main-window.c:940
-#: ../src/main-window.c:4109
+#: ../src/address-book-config.c:594 ../src/main-window.c:939
+#: ../src/main-window.c:4103
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Greška prikazivanja pomoći: %s\n"
 
-#: ../src/address-book-config.c:613
-msgid "No path found.  Do you want to give one?"
-msgstr "Nisam pronašao putanju.  Da li želite da date neku?"
+#: ../src/address-book-config.c:671
+#| msgid "No path found.  Do you want to give one?"
+msgid "No path found. Do you want to give one?"
+msgstr "Nisam pronašao putanju. Da li želite da date neku?"
 
-#: ../src/address-book-config.c:866
-msgid "VCard Address Book (GnomeCard)"
+#: ../src/address-book-config.c:930
+#| msgid "VCard Address Book (GnomeCard)"
+msgid "vCard Address Book (GnomeCard)"
 msgstr "Adresar Vkartice (Gnomova kartica)"
 
-#: ../src/address-book-config.c:872
+#: ../src/address-book-config.c:936
 msgid "External query (a program)"
 msgstr "Spoljašnji upit (program)"
 
-#: ../src/address-book-config.c:877
+#: ../src/address-book-config.c:941
 msgid "LDIF Address Book"
 msgstr "LDIF adresar"
 
-#: ../src/address-book-config.c:883
+#: ../src/address-book-config.c:947
 msgid "LDAP Address Book"
 msgstr "LDAP adresar"
 
-#: ../src/address-book-config.c:897
+#: ../src/address-book-config.c:961
 msgid "Rubrica2 Address Book"
 msgstr "Adresar Rubrike2"
 
-#: ../src/balsa-app.c:65 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1281
+#: ../src/address-book-config.c:968
+#| msgid "Address Book"
+msgid "Osmo Address Book"
+msgstr "Adresar Osmoa"
+
+#: ../src/balsa-app.c:63 ../src/folder-conf.c:274 ../src/mailbox-conf.c:1279
 msgid "_Remember password in Secret Service"
 msgstr "_Zapamti lozinku u usluzi tajni"
 
-#: ../src/balsa-app.c:68 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1284
+#: ../src/balsa-app.c:66 ../src/folder-conf.c:277 ../src/mailbox-conf.c:1282
 msgid "_Remember password in keyring"
 msgstr "_Zapamti lozinku u privesku ključeva"
 
-#: ../src/balsa-app.c:71 ../src/folder-conf.c:282 ../src/mailbox-conf.c:1287
+#: ../src/balsa-app.c:69 ../src/folder-conf.c:280 ../src/mailbox-conf.c:1285
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: ../src/balsa-app.c:77
+#: ../src/balsa-app.c:75
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2532,166 +2707,180 @@ msgstr ""
 "Otvaram udaljeno sanduče %s.\n"
 "_Lozinka za „%s@%s“:"
 
-#: ../src/balsa-app.c:82
+#: ../src/balsa-app.c:80
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Lozinka za „%s@%s“ (%s):"
 
-#: ../src/balsa-app.c:85
+#: ../src/balsa-app.c:83
 msgid "Password needed"
 msgstr "Neophodna je lozinka"
 
-#: ../src/balsa-app.c:531
+#: ../src/balsa-app.c:509
 #, c-format
-msgid "Couldn't open mailbox \"%s\""
+#| msgid "Couldn't open mailbox \"%s\""
+msgid "Couldn’t open mailbox “%s”"
 msgstr "Ne mogu da otvorim sanduče „%s“"
 
-#: ../src/balsa-index.c:386 ../src/pref-manager.c:398
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:381
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/balsa-index.c:401 ../src/pref-manager.c:399
-#: ../src/sendmsg-window.c:2674
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:382
+#: ../src/sendmsg-window.c:2688
 msgid "Size"
 msgstr "Veličina"
 
-#: ../src/balsa-index.c:1655
+#: ../src/balsa-index.c:1653
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Premeštanje u smeće nije uspelo: %s"
 
+#: ../src/balsa-index.c:1811
+#| msgid "Reply"
+msgid "_Reply…"
+msgstr "_Odgovori…"
+
 #: ../src/balsa-index.c:1813
-msgid "_Reply..."
-msgstr "_Odgovori..."
+#| msgid "Reply To _All..."
+msgid "Reply To _All…"
+msgstr "Odgovori _svima…"
 
 #: ../src/balsa-index.c:1815
-msgid "Reply To _All..."
-msgstr "Odgovori _svima..."
+#| msgid "Reply To _Group..."
+msgid "Reply To _Group…"
+msgstr "Odgovori _grupi…"
 
 #: ../src/balsa-index.c:1817
-msgid "Reply To _Group..."
-msgstr "Odgovori _grupi..."
+#| msgid "_Forward Attached..."
+msgid "_Forward Attached…"
+msgstr "_Prosledi kao prilog…"
 
 #: ../src/balsa-index.c:1819
-msgid "_Forward Attached..."
-msgstr "_Prosledi kao prilog..."
+#| msgid "Forward _Inline..."
+msgid "Forward _Inline…"
+msgstr "Prosledi u _telu poruke…"
 
 #: ../src/balsa-index.c:1821
-msgid "Forward _Inline..."
-msgstr "Prosledi u _telu poruke..."
+#| msgid "_Pipe through..."
+msgid "_Pipe through…"
+msgstr "_Prespoj…"
 
 #: ../src/balsa-index.c:1823
-msgid "_Pipe through..."
-msgstr "_Prespoj..."
-
-#: ../src/balsa-index.c:1825
-msgid "_Store Address..."
-msgstr "_Uskladišti adresu..."
+#| msgid "Store Address"
+msgid "_Store Address…"
+msgstr "_Sačuvaj adresu…"
 
-#: ../src/balsa-index.c:1839 ../src/mailbox-node.c:1107
-#: ../src/mailbox-node.c:1123 ../src/pref-manager.c:1703
-#: ../src/pref-manager.c:1778 ../src/pref-manager.c:2878
+#: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
+#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:1688
+#: ../src/pref-manager.c:1762 ../src/pref-manager.c:2861
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../src/balsa-index.c:1843
+#: ../src/balsa-index.c:1841
 msgid "_Undelete"
 msgstr "_Poništi brisanje"
 
-#: ../src/balsa-index.c:1847
+#: ../src/balsa-index.c:1845
 msgid "Move To _Trash"
 msgstr "Premesti u _smeće"
 
-#: ../src/balsa-index.c:1851
+#: ../src/balsa-index.c:1849
 msgid "T_oggle"
 msgstr "_Promeni"
 
-#: ../src/balsa-index.c:1854
+#: ../src/balsa-index.c:1852
 msgid "_Flagged"
 msgstr "_Označeno"
 
-#: ../src/balsa-index.c:1857
+#: ../src/balsa-index.c:1855
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../src/balsa-index.c:1865
+#: ../src/balsa-index.c:1863
 msgid "_Move to"
 msgstr "_Premesti"
 
-#: ../src/balsa-index.c:1872
+#: ../src/balsa-index.c:1870
 msgid "_View Source"
 msgstr "_Pogledaj izvor"
 
-#: ../src/balsa-index.c:2107
+#: ../src/balsa-index.c:2116
 #, c-format
-msgid "Failed to copy %d message to mailbox \"%s\": %s"
-msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+#| msgid "Failed to copy %d message to mailbox \"%s\": %s"
+#| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+msgid "Failed to copy %d message to mailbox “%s”: %s"
+msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
 msgstr[0] "Nisam uspeo da umnožim %d poruku u sanduče „%s“: %s"
 msgstr[1] "Nisam uspeo da umnožim %d poruke u sanduče „%s“: %s"
 msgstr[2] "Nisam uspeo da umnožim %d poruka u sanduče „%s“: %s"
 msgstr[3] "Nisam uspeo da umnožim %d poruku u sanduče „%s“: %s"
 
-#: ../src/balsa-index.c:2119
+#: ../src/balsa-index.c:2128
 #, c-format
-msgid "Copied to \"%s\"."
+#| msgid "Copied to \"%s\"."
+msgid "Copied to “%s”."
 msgstr "Umnoženo je u „%s“."
 
-#: ../src/balsa-index.c:2120
+#: ../src/balsa-index.c:2129
 #, c-format
-msgid "Moved to \"%s\"."
+#| msgid "Moved to \"%s\"."
+msgid "Moved to “%s”."
 msgstr "Premešteno je u „%s“."
 
-#: ../src/balsa-index.c:2224
+#: ../src/balsa-index.c:2233
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Nisam uspeo da pošaljem sanduče „%s“."
 
-#: ../src/balsa-index.c:2322
+#: ../src/balsa-index.c:2331
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "Ne mogu da obradim poruku: %s"
 
-#: ../src/balsa-index.c:2446
+#: ../src/balsa-index.c:2455
 #, c-format
 msgid "Cannot access message %u to pass to %s"
 msgstr "Ne mogu da pristupim poruci „%u“ da bih prošao u %s"
 
-#: ../src/balsa-index.c:2473
+#: ../src/balsa-index.c:2482
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Ne mogu da pročitam poruku „%u“ da bih prošao u %s"
 
-#: ../src/balsa-index.c:2640
+#: ../src/balsa-index.c:2649
 msgid "Pipe message through a program"
 msgstr "Prosledi poruku kroz program"
 
-#: ../src/balsa-index.c:2644
+#: ../src/balsa-index.c:2653
 msgid "_Run"
 msgstr "_Pokreni"
 
-#: ../src/balsa-index.c:2656
+#: ../src/balsa-index.c:2665
 msgid "Specify the program to run:"
 msgstr "Navedite program za pokretanje:"
 
-#: ../src/balsa-mblist.c:355
+#: ../src/balsa-mblist.c:353
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: ../src/balsa-mblist.c:1136 ../src/balsa-mblist.c:1186
+#: ../src/balsa-mblist.c:1147 ../src/balsa-mblist.c:1197
 msgid "Failed to find mailbox"
 msgstr "Nisam uspeo da pronađem sanduče"
 
-#: ../src/balsa-mblist.c:1764
-msgid "_Other..."
-msgstr "_Drugo..."
+#: ../src/balsa-mblist.c:1775
+#| msgid "_Other..."
+msgid "_Other…"
+msgstr "_Drugo…"
 
-#: ../src/balsa-mblist.c:1874
+#: ../src/balsa-mblist.c:1892
 msgid "Choose destination folder"
 msgstr "Izaberite odredišnu fasciklu"
 
-#: ../src/balsa-mblist.c:2068
-msgid "Other..."
-msgstr "Drugo..."
+#: ../src/balsa-mblist.c:2086
+#| msgid "Other..."
+msgid "Other…"
+msgstr "Drugo…"
 
 #: ../src/balsa-message.c:283
 msgid "Check cryptographic signature"
@@ -2713,149 +2902,161 @@ msgstr "Nisam pronašao"
 msgid "Find:"
 msgstr "Pronađi:"
 
-#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:151
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
 msgid "Previous"
 msgstr "Prethodnu"
 
-#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:152
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
 msgid "Next"
 msgstr "Sledeću"
 
-#: ../src/balsa-message.c:721 ../src/balsa-message.c:724
+#: ../src/balsa-message.c:711
 msgid "Content"
 msgstr "Sadržaj"
 
-#: ../src/balsa-message.c:817 ../src/balsa-message.c:820
+#: ../src/balsa-message.c:797
 msgid "Message parts"
 msgstr "Delovi poruke"
 
-#: ../src/balsa-message.c:1013
-msgid "Save selected as..."
-msgstr "Sačuvaj izabrano kao..."
+#: ../src/balsa-message.c:989
+#| msgid "Save selected as..."
+msgid "Save selected as…"
+msgstr "Sačuvaj izabrano kao…"
 
-#: ../src/balsa-message.c:1020
-msgid "Save selected to folder..."
-msgstr "Sačuvaj izabrano u fasciklu..."
+#: ../src/balsa-message.c:996
+#| msgid "Save selected to folder..."
+msgid "Save selected to folder…"
+msgstr "Sačuvaj izabrano u fasciklu…"
 
-#: ../src/balsa-message.c:1113
+#: ../src/balsa-message.c:1106
 msgid "(No sender)"
 msgstr "(nema pošiljaoca)"
 
-#: ../src/balsa-message.c:1171 ../src/balsa-message.c:1183
+#: ../src/balsa-message.c:1159 ../src/balsa-message.c:1171
 #, c-format
-msgid "Could not access message %u in mailbox \"%s\"."
+#| msgid "Could not access message %u in mailbox \"%s\"."
+msgid "Could not access message %u in mailbox “%s”."
 msgstr "Ne mogu da pristupim poruci „%u“ u sandučetu „%s“."
 
-#: ../src/balsa-message.c:1355
+#: ../src/balsa-message.c:1338
 msgid "mixed parts"
 msgstr "izmešani delovi"
 
-#: ../src/balsa-message.c:1357
+#: ../src/balsa-message.c:1340
 msgid "alternative parts"
 msgstr "dopunski delovi"
 
-#: ../src/balsa-message.c:1359
+#: ../src/balsa-message.c:1342
 msgid "signed parts"
 msgstr "potpisani delovi"
 
-#: ../src/balsa-message.c:1361
+#: ../src/balsa-message.c:1344
 msgid "encrypted parts"
 msgstr "šifrovani delovi"
 
-#: ../src/balsa-message.c:1363
-msgid "rfc822 message"
-msgstr "rfc822 poruka"
+#: ../src/balsa-message.c:1346
+#| msgid "rfc822 message"
+msgid "RFC822 message"
+msgstr "RFC822 poruka"
 
-#: ../src/balsa-message.c:1365
+#: ../src/balsa-message.c:1348
 #, c-format
-msgid "\"%s\" parts"
+#| msgid "\"%s\" parts"
+msgid "“%s” parts"
 msgstr "„%s“ delovi"
 
-#: ../src/balsa-message.c:1421
+#: ../src/balsa-message.c:1396
 msgid "force inline for all parts"
 msgstr "prisili unutrašnje za sve delove"
 
-#: ../src/balsa-message.c:1464
+#: ../src/balsa-message.c:1439
 #, c-format
-msgid "rfc822 message (from %s, subject \"%s\")"
-msgstr "rfc822 poruka (šalje %s, tema „%s“)"
+#| msgid "rfc822 message (from %s, subject \"%s\")"
+msgid "RFC822 message (from %s, subject “%s”)"
+msgstr "RFC822 poruka (šalje %s, tema „%s“)"
 
-#: ../src/balsa-message.c:1476
+#: ../src/balsa-message.c:1451
 msgid "complete message"
 msgstr "celokupna poruka"
 
-#: ../src/balsa-message.c:1493
+#: ../src/balsa-message.c:1468
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "deo %s: %s (datoteka %s)"
 
-#: ../src/balsa-message.c:1504
+#: ../src/balsa-message.c:1479
 #, c-format
 msgid "part %s: %s"
 msgstr "deo %s: %s"
 
-#: ../src/balsa-message.c:1519
+#: ../src/balsa-message.c:1494
 msgid "encrypted: "
 msgstr "šifrovano: "
 
-#: ../src/balsa-message.c:1659
+#: ../src/balsa-message.c:1634
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Nisam uspeo da pročitam ugrađenu poruku: %s"
 
-#: ../src/balsa-message.c:1667
+#: ../src/balsa-message.c:1642
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Nisam uspeo da prikačim poruku u „%s“: %s"
 
-#: ../src/balsa-message.c:1696
-msgid "_Save..."
-msgstr "_Sačuvaj..."
+#: ../src/balsa-message.c:1671
+#| msgid "_Save"
+msgid "_Save…"
+msgstr "_Sačuvaj…"
 
-#: ../src/balsa-message.c:1705 ../src/balsa-mime-widget-message.c:443
-msgid "_Copy to folder..."
-msgstr "_Umnoži u fasciklu..."
+#: ../src/balsa-message.c:1680 ../src/balsa-mime-widget-message.c:435
+#| msgid "Copy to folder:"
+msgid "_Copy to folder…"
+msgstr "_Umnoži u fasciklu…"
 
-#: ../src/balsa-message.c:1788
+#: ../src/balsa-message.c:1763
 msgid "Select folder for saving selected parts"
 msgstr "Izaberite fasciklu za čuvanje izabranih delova"
 
-#: ../src/balsa-message.c:1813
+#: ../src/balsa-message.c:1788
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Ne mogu da napravim putanju za „%s“"
 
-#: ../src/balsa-message.c:1838
+#: ../src/balsa-message.c:1813
 #, c-format
 msgid "%s message part"
 msgstr "%s dela poruke"
 
-#: ../src/balsa-message.c:1871 ../src/balsa-mime-widget-callbacks.c:166
+#: ../src/balsa-message.c:1846 ../src/balsa-mime-widget-callbacks.c:164
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Ne mogu da sačuvam %s: %s"
 
-#: ../src/balsa-message.c:2514 ../src/balsa-message.c:2663
+#: ../src/balsa-message.c:2482 ../src/balsa-message.c:2623
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Nisam uspeo da pošaljem obaveštenje o prispeću: %s"
 
-#: ../src/balsa-message.c:2611
+#: ../src/balsa-message.c:2579
 #, c-format
+#| msgid ""
+#| "The sender of this mail, %s, requested \n"
+#| "a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+#| "Do you want to send this notification?"
 msgid ""
 "The sender of this mail, %s, requested \n"
-"a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+"a Message Disposition Notification (MDN) to be returned to “%s”.\n"
 "Do you want to send this notification?"
 msgstr ""
 "Pošiljalac ovog pisma, %s, zahtevao je da\n"
 "obaveštenje o prispeću poruke (OPP) bude vraćeno na „%s“.\n"
 "Da li želite da pošaljete ovo obaveštenje?"
 
-#: ../src/balsa-message.c:2621
+#: ../src/balsa-message.c:2589
 msgid "Reply to MDN?"
 msgstr "Da odgovorim na OPP?"
 
-#: ../src/balsa-message.c:2839
+#: ../src/balsa-message.c:2799
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -2865,109 +3066,132 @@ msgstr ""
 "puta.\n"
 "Molim zatvorite ostale primerke ove poruke i pokušajte opet."
 
-#: ../src/balsa-message.c:2860 ../src/balsa-message.c:2945
-#: ../src/balsa-message.c:3067
+#: ../src/balsa-message.c:2820 ../src/balsa-message.c:2905
+#: ../src/balsa-message.c:3027
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Nisam uspeo da obradim deo poruke: %s"
 
-#: ../src/balsa-message.c:2861 ../src/balsa-message.c:2946
-#: ../src/balsa-message.c:3068
+#: ../src/balsa-message.c:2821 ../src/balsa-message.c:2906
+#: ../src/balsa-message.c:3028
 msgid "Possible disk space problem."
 msgstr "Moguće je da nedostaje prostor na disku."
 
-#: ../src/balsa-message.c:2875
+#: ../src/balsa-message.c:2835
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains an encrypted part, "
+#| "but it's structure is invalid."
 msgid ""
-"The message sent by %s with subject \"%s\" contains an encrypted part, but "
-"it's structure is invalid."
+"The message sent by %s with subject “%s” contains an encrypted part, but its "
+"structure is invalid."
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži šifrovani deo, ali je njena "
 "struktura neispravna."
 
-#: ../src/balsa-message.c:2883
+#: ../src/balsa-message.c:2843
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
+#| "but this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
-"but this crypto protocol is not available."
+"The message sent by %s with subject “%s” contains a PGP encrypted part, but "
+"this crypto protocol is not available."
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži PGP šifrovani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2896
+#: ../src/balsa-message.c:2856
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a S/MIME encrypted "
+#| "part, but this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
+"The message sent by %s with subject “%s” contains a S/MIME encrypted part, "
 "but this crypto protocol is not available."
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži S/MIME šifrovani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2963
+#: ../src/balsa-message.c:2923
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a signed part, but "
+#| "its structure is invalid. The signature, if there is any, cannot be "
+#| "checked."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a signed part, but its "
+"The message sent by %s with subject “%s” contains a signed part, but its "
 "structure is invalid. The signature, if there is any, cannot be checked."
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži deo sa potpisom, ali je "
 "struktura neispravna. Potpis, ako uopšte postoji, se ne može proveriti."
 
-#: ../src/balsa-message.c:2976
+#: ../src/balsa-message.c:2936
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a %s signed part, but "
+#| "this crypto protocol is not available."
 msgid ""
-"The message sent by %s with subject \"%s\" contains a %s signed part, but "
-"this crypto protocol is not available."
+"The message sent by %s with subject “%s” contains a %s signed part, but this "
+"crypto protocol is not available."
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži „%s“ potpisani deo, ali ovaj "
 "protokol šifrovanja nije dostupan."
 
-#: ../src/balsa-message.c:2979
+#: ../src/balsa-message.c:2939
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2979 ../src/print-gtk.c:201
+#: ../src/balsa-message.c:2939 ../src/print-gtk.c:199
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:3003 ../src/balsa-message.c:3130
+#: ../src/balsa-message.c:2963 ../src/balsa-message.c:3090
 msgid "Detected a good signature"
 msgstr "Otkrio sam dobar potpis"
 
-#: ../src/balsa-message.c:3009
+#: ../src/balsa-message.c:2969
 msgid "Detected a good signature with insufficient validity"
 msgstr "Prepoznao sam ispravan potpis sa nedovoljno ispravnosti"
 
-#: ../src/balsa-message.c:3014 ../src/balsa-message.c:3134
+#: ../src/balsa-message.c:2974 ../src/balsa-message.c:3094
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Prepoznao sam ispravan potpis sa nedovoljno ispravnosti/poverenja"
 
-#: ../src/balsa-message.c:3021 ../src/balsa-message.c:3140
+#: ../src/balsa-message.c:2981 ../src/balsa-message.c:3100
 #, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "returned:\n"
+#| "%s"
 msgid ""
-"Checking the signature of the message sent by %s with subject \"%s\" "
+"Checking the signature of the message sent by %s with subject “%s” "
 "returned:\n"
 "%s"
 msgstr ""
 "Provera potpisa poruke koju je poslao %s sa temom „%s“ je vratilo:\n"
 "%s"
 
-#: ../src/balsa-message.c:3033
+#: ../src/balsa-message.c:2993
 #, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "failed with an error!"
 msgid ""
-"Checking the signature of the message sent by %s with subject \"%s\" failed "
+"Checking the signature of the message sent by %s with subject “%s” failed "
 "with an error!"
 msgstr ""
 "Provera potpisa poruke koju je poslao %s sa temom „%s“ nije uspela i vratila "
 "je grešku!"
 
-#: ../src/balsa-message.c:3092
+#: ../src/balsa-message.c:3052
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
 "Dešifrovanje ne može biti obavljeno zato što je ova poruka prikazana više puta."
 
-#: ../src/balsa-message.c:3094
+#: ../src/balsa-message.c:3054
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -2975,734 +3199,742 @@ msgstr ""
 "Provera potpisa i uklanjanje OpenPGP oklopa ne može biti obavljeno zato što je "
 "ova poruka prikazana više puta."
 
-#: ../src/balsa-message.c:3097
+#: ../src/balsa-message.c:3057
 msgid "Please close the other instances of this message and try again."
 msgstr "Molim zatvorite ostale primerke ove poruke i pokušajte opet."
 
-#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1449
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1453
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Ne mogu da pokrenem program: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:81
+#: ../src/balsa-mime-widget-callbacks.c:79
 #, c-format
 msgid "Save %s MIME Part"
 msgstr "Sačuvaj %s MIME deo"
 
-#: ../src/balsa-mime-widget-callbacks.c:124
+#: ../src/balsa-mime-widget-callbacks.c:122
 #, c-format
 msgid "Could not construct URI from %s"
 msgstr "Ne mogu da napravim putanju iz „%s“"
 
-#: ../src/balsa-mime-widget-callbacks.c:143
+#: ../src/balsa-mime-widget-callbacks.c:141
 msgid "File already exists. Overwrite?"
 msgstr "Datoteka već postoji. Da prepišem preko?"
 
-#: ../src/balsa-mime-widget-callbacks.c:153
+#: ../src/balsa-mime-widget-callbacks.c:151
 #, c-format
 msgid "Unlink %s: %s"
 msgstr "Razveži %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:89
+#: ../src/balsa-mime-widget-crypto.c:87
 msgid "_Run GnuPG to import this key"
 msgstr "_Pokreni GnuPG za uvoz ovog ključa"
 
-#: ../src/balsa-mime-widget-crypto.c:93
+#: ../src/balsa-mime-widget-crypto.c:91
 msgid "_Run GnuPG to check for an update of this key"
 msgstr "_Pokreni GnuPG za proveru ažuriranja ovog ključa"
 
-#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:248
+#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:252
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Greška učitavanja priložene slike: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:146 ../src/balsa-print-object.c:113
-#| msgid "Message parts"
+#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:113
 msgid "message headers"
 msgstr "zaglavlja poruke"
 
-#: ../src/balsa-mime-widget-message.c:176
-#: ../src/balsa-mime-widget-message.c:188
-#: ../src/balsa-mime-widget-message.c:216
-#: ../src/balsa-mime-widget-message.c:269
+#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:186
+#: ../src/balsa-mime-widget-message.c:214
+#: ../src/balsa-mime-widget-message.c:267
 msgid "Content Type: external-body\n"
 msgstr "Vrsta sadržaja: spoljašnje telo\n"
 
-#: ../src/balsa-mime-widget-message.c:177
+#: ../src/balsa-mime-widget-message.c:175
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Vrsta pristupa: lokalna datoteka\n"
 
-#: ../src/balsa-mime-widget-message.c:178
-#: ../src/balsa-mime-widget-message.c:224 ../src/balsa-mime-widget.c:242
+#: ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget-message.c:222 ../src/balsa-mime-widget.c:240
 #, c-format
 msgid "File name: %s"
 msgstr "Naziv datoteke: %s"
 
-#: ../src/balsa-mime-widget-message.c:189
+#: ../src/balsa-mime-widget-message.c:187
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Vrsta pristupa: adresa\n"
 
-#: ../src/balsa-mime-widget-message.c:190
+#: ../src/balsa-mime-widget-message.c:188
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../src/balsa-mime-widget-message.c:217
+#: ../src/balsa-mime-widget-message.c:215
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Vrsta pristupa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:221
+#: ../src/balsa-mime-widget-message.c:219
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "FTP sajt: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:223
+#: ../src/balsa-mime-widget-message.c:221
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Direktorijum: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:270
+#: ../src/balsa-mime-widget-message.c:268
 msgid "Access type: mail-server\n"
 msgstr "Vrsta pristupa: server pošte\n"
 
-#: ../src/balsa-mime-widget-message.c:271
+#: ../src/balsa-mime-widget-message.c:269
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Server pošte: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:273
+#: ../src/balsa-mime-widget-message.c:271
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:290
+#: ../src/balsa-mime-widget-message.c:288
 msgid "Se_nd message to obtain this part"
 msgstr "Pošalji _poruku da dobiješ ovaj deo"
 
-#: ../src/balsa-mime-widget-message.c:313 ../src/balsa-mime-widget-text.c:802
-#: ../src/sendmsg-window.c:1472
+#: ../src/balsa-mime-widget-message.c:311 ../src/balsa-mime-widget-text.c:801
+#: ../src/sendmsg-window.c:1476
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Greška prikazivanja „%s“: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:348
+#: ../src/balsa-mime-widget-message.c:346
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Ne mogu da preuzmem deo: %s"
 
-#: ../src/balsa-mime-widget-message.c:382
+#: ../src/balsa-mime-widget-message.c:374
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "Nisam uspeo da pošaljem zahtev spoljnog tela: %s"
 
-#: ../src/balsa-mime-widget-message.c:435
-msgid "Reply..."
-msgstr "Odgovori..."
+#: ../src/balsa-mime-widget-message.c:427
+#| msgid "Reply"
+msgid "Reply…"
+msgstr "Odgovori…"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:714
+#: ../src/balsa-mime-widget-message.c:705
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../src/balsa-mime-widget-message.c:715
+#: ../src/balsa-mime-widget-message.c:706
 msgid "IMAP server did not report message structure"
 msgstr "IMAP server nije izvestio o strukturi poruke"
 
-#: ../src/balsa-mime-widget-message.c:728
+#: ../src/balsa-mime-widget-message.c:719
 #: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:748
 #: ../src/sendmsg-window.c:750 ../src/sendmsg-window.c:842
-#: ../src/sendmsg-window.c:3489 ../src/sendmsg-window.c:5010
+#: ../src/sendmsg-window.c:3502 ../src/sendmsg-window.c:5023
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../src/balsa-mime-widget-message.c:733
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3485
+#: ../src/balsa-mime-widget-message.c:724
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3498
 msgid "Date:"
 msgstr "Datum:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3496
+#: ../src/balsa-mime-widget-message.c:730
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3509
 msgid "From:"
 msgstr "Šalje:"
 
-#: ../src/balsa-mime-widget-message.c:746
+#: ../src/balsa-mime-widget-message.c:737
 msgid "Reply-To:"
 msgstr "Odgovori na:"
 
-#: ../src/balsa-mime-widget-message.c:759
+#: ../src/balsa-mime-widget-message.c:750
 #: ../src/balsa-print-object-header.c:177
-msgid "Fcc:"
-msgstr "Umnožak datoteke:"
+msgid "FCC:"
+msgstr "FCC:"
 
-#: ../src/balsa-mime-widget-message.c:767
+#: ../src/balsa-mime-widget-message.c:758
 #: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Poruka o prispeću:"
 
-#: ../src/balsa-mime-widget-text.c:158
+#: ../src/balsa-mime-widget-text.c:156
 #, c-format
 msgid "Could not save a text part: %s"
 msgstr "Ne mogu da sačuvam tekstualni deo: %s"
 
-#: ../src/balsa-mime-widget-text.c:509
+#: ../src/balsa-mime-widget-text.c:507
 msgid "Copy link"
 msgstr "Umnoži vezu"
 
-#: ../src/balsa-mime-widget-text.c:514
+#: ../src/balsa-mime-widget-text.c:512
 msgid "Open link"
 msgstr "Otvori vezu"
 
-#: ../src/balsa-mime-widget-text.c:519
-msgid "Send link..."
-msgstr "Pošalji vezu..."
+#: ../src/balsa-mime-widget-text.c:517
+#| msgid "Send link..."
+msgid "Send link…"
+msgstr "Pošalji vezu…"
 
-#: ../src/balsa-mime-widget-text.c:550 ../src/balsa-mime-widget-text.c:1080
-msgid "Save..."
-msgstr "Sačuvaj..."
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1079
+#| msgid "Save"
+msgid "Save…"
+msgstr "Sačuvaj…"
 
-#: ../src/balsa-mime-widget-text.c:560
+#: ../src/balsa-mime-widget-text.c:558
 msgid "Highlight structured phrases"
 msgstr "Istakni sređene izraze"
 
-#: ../src/balsa-mime-widget-text.c:787
+#: ../src/balsa-mime-widget-text.c:786
 #, c-format
-msgid "Calling URL %s..."
-msgstr "Pozivam adresu %s..."
+#| msgid "Calling URL %s..."
+msgid "Calling URL %s…"
+msgstr "Pozivam adresu %s…"
 
-#: ../src/balsa-mime-widget-text.c:1047
+#: ../src/balsa-mime-widget-text.c:1046
 msgid "Zoom In"
-msgstr "U_većaj"
+msgstr "Uvećaj"
 
-#: ../src/balsa-mime-widget-text.c:1052
+#: ../src/balsa-mime-widget-text.c:1051
 msgid "Zoom Out"
-msgstr "U_manji"
+msgstr "Umanji"
 
-#: ../src/balsa-mime-widget-text.c:1057
+#: ../src/balsa-mime-widget-text.c:1056
 msgid "Zoom 100%"
 msgstr "Uvećaj na 100%"
 
-#: ../src/balsa-mime-widget-text.c:1066
+#: ../src/balsa-mime-widget-text.c:1065
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../src/balsa-mime-widget-text.c:1089
-msgid "Print..."
-msgstr "Štampaj..."
+#: ../src/balsa-mime-widget-text.c:1088
+#| msgid "Print"
+msgid "Print…"
+msgstr "Štampaj…"
 
-#: ../src/balsa-mime-widget-text.c:1212
+#: ../src/balsa-mime-widget-text.c:1226
 msgid "S_tore Address"
 msgstr "_Skladišti adresu"
 
-#: ../src/balsa-mime-widget-text.c:1219
+#: ../src/balsa-mime-widget-text.c:1233
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../src/balsa-mime-widget-text.c:1220
+#: ../src/balsa-mime-widget-text.c:1234
 msgid "Nick Name:"
 msgstr "Nadimak:"
 
-#: ../src/balsa-mime-widget-text.c:1221
+#: ../src/balsa-mime-widget-text.c:1235
 msgid "First Name:"
 msgstr "Ime:"
 
-#: ../src/balsa-mime-widget-text.c:1222
+#: ../src/balsa-mime-widget-text.c:1236
 msgid "Last Name:"
 msgstr "Prezime:"
 
-#: ../src/balsa-mime-widget-text.c:1223
+#: ../src/balsa-mime-widget-text.c:1237
 msgid "Organization:"
 msgstr "Ustanova:"
 
-#: ../src/balsa-mime-widget-text.c:1225
+#: ../src/balsa-mime-widget-text.c:1239
 msgid "Email Address:"
-msgstr "Adresa el-pošte:"
+msgstr "Adresa e-pošte:"
 
-#: ../src/balsa-mime-widget-text.c:1253
+#: ../src/balsa-mime-widget-text.c:1267
 #, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
+#| "no header describing the used codeset (converted to %s)"
 msgid ""
-"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
+"The message sent by %s with subject “%s” contains 8-bit characters, but no "
 "header describing the used codeset (converted to %s)"
 msgstr ""
 "Poruka koju je poslao %s sa temom „%s“ sadrži 8-bitne znakove, ali ne i "
 "zaglavlje koje opisuje korišćeni skup kodova (prebačeno u %s)"
 
-#: ../src/balsa-mime-widget-vcalendar.c:67
+#: ../src/balsa-mime-widget-vcalendar.c:65
 #, c-format
-msgid "This is an iTIP calendar \"%s\" message."
+#| msgid "This is an iTIP calendar \"%s\" message."
+msgid "This is an iTIP calendar “%s” message."
 msgstr "Ovo je poruka iTIP kalendara „%s“."
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
+#: ../src/balsa-mime-widget-vcalendar.c:171
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:174
+#: ../src/balsa-mime-widget-vcalendar.c:172
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:175
+#: ../src/balsa-mime-widget-vcalendar.c:173
 msgid "Start:"
 msgstr "Početak:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:176
+#: ../src/balsa-mime-widget-vcalendar.c:174
 msgid "End:"
 msgstr "Kraj:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:177
+#: ../src/balsa-mime-widget-vcalendar.c:175
 msgid "Location:"
 msgstr "Mesto:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:209
+#: ../src/balsa-mime-widget-vcalendar.c:207
 msgid "Attendee:"
 msgid_plural "Attendees:"
 msgstr[0] "Prisutan:"
 msgstr[1] "Prisutni:"
 msgstr[2] "Prisutni:"
-msgstr[3] "Zvanica"
+msgstr[3] "Prisutan:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:213
+#: ../src/balsa-mime-widget-vcalendar.c:211
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:234
+#: ../src/balsa-mime-widget-vcalendar.c:232
 msgid "The sender asks you for a reply to this request:"
 msgstr "Pošiljalac je zatražio da odgovorite na ovaj zahtev:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:241
+#: ../src/balsa-mime-widget-vcalendar.c:239
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../src/balsa-mime-widget-vcalendar.c:250
+#: ../src/balsa-mime-widget-vcalendar.c:248
 msgid "Accept tentatively"
 msgstr "Prihvati uz rezervu"
 
-#: ../src/balsa-mime-widget-vcalendar.c:258
+#: ../src/balsa-mime-widget-vcalendar.c:256
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/balsa-mime-widget-vcalendar.c:305
-msgid "iTip Calendar Request"
+#: ../src/balsa-mime-widget-vcalendar.c:303
+#| msgid "iTip Calendar Request"
+msgid "iTIP Calendar Request"
 msgstr "Zahtev iTIP kalendara"
 
-#: ../src/balsa-mime-widget-vcalendar.c:343
+#: ../src/balsa-mime-widget-vcalendar.c:333
 #, c-format
-msgid "Sending the iTip calendar reply failed: %s"
+#| msgid "Sending the iTip calendar reply failed: %s"
+msgid "Sending the iTIP calendar reply failed: %s"
 msgstr "Nisam uspeo da pošaljem odgovor iTIP kalendara: %s"
 
-#: ../src/balsa-mime-widget.c:259
+#: ../src/balsa-mime-widget.c:257
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Greška čitanja dela poruke: %s"
 
-#: ../src/balsa-mime-widget.c:286
+#: ../src/balsa-mime-widget.c:284
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Vrsta: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:290
+#: ../src/balsa-mime-widget.c:288
 #, c-format
 msgid "Content Type: %s"
 msgstr "Vrsta sadržaja: %s"
 
-#: ../src/balsa-mime-widget.c:304
+#: ../src/balsa-mime-widget.c:302
 msgid "No open or view action defined for this content type"
 msgstr "Nije određena radnja za otvaranje ili pregled ove vrste sadržaja"
 
-#: ../src/balsa-mime-widget.c:309
+#: ../src/balsa-mime-widget.c:307
 msgid "S_ave part"
 msgstr "Sačuvaj _deo"
 
+#: ../src/balsa-print-object-default.c:152
 #: ../src/balsa-print-object-default.c:154
-#: ../src/balsa-print-object-default.c:156
-#: ../src/balsa-print-object-default.c:159
+#: ../src/balsa-print-object-default.c:157
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../src/balsa-print-object-default.c:164
-#: ../src/balsa-print-object-default.c:168
+#: ../src/balsa-print-object-default.c:162
+#: ../src/balsa-print-object-default.c:166
 msgid "File name:"
 msgstr "Naziv datoteke:"
 
-#: ../src/balsa-print-object-text.c:493
+#: ../src/balsa-print-object-text.c:491
 msgid "Full Name"
 msgstr "Ime i prezime"
 
-#: ../src/balsa-print-object-text.c:495
+#: ../src/balsa-print-object-text.c:493
 msgid "Nick Name"
 msgstr "Nadimak"
 
-#: ../src/balsa-print-object-text.c:497
+#: ../src/balsa-print-object-text.c:495
 msgid "First Name"
 msgstr "Ime"
 
-#: ../src/balsa-print-object-text.c:499
+#: ../src/balsa-print-object-text.c:497
 msgid "Last Name"
 msgstr "Prezime"
 
-#: ../src/balsa-print-object-text.c:501
+#: ../src/balsa-print-object-text.c:499
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../src/balsa-print-object-text.c:504
-msgid "Email Address"
-msgstr "Adresa el-pošte"
-
-#: ../src/balsa-print-object-text.c:651
+#: ../src/balsa-print-object-text.c:649
 msgid "Summary"
 msgstr "Sažetak"
 
-#: ../src/balsa-print-object-text.c:653
+#: ../src/balsa-print-object-text.c:651
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../src/balsa-print-object-text.c:655
+#: ../src/balsa-print-object-text.c:653
 msgid "Start"
 msgstr "Početak"
 
-#: ../src/balsa-print-object-text.c:657
+#: ../src/balsa-print-object-text.c:655
 msgid "End"
 msgstr "Kraj"
 
-#: ../src/balsa-print-object-text.c:659
+#: ../src/balsa-print-object-text.c:657
 msgid "Location"
 msgstr "Mesto"
 
-#: ../src/balsa-print-object-text.c:668
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendees"
 msgstr "Zvanice"
 
-#: ../src/balsa-print-object-text.c:668
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendee"
 msgstr "Zvanica"
 
-#: ../src/balsa-print-object-text.c:682 ../src/sendmsg-window.c:2686
+#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2700
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/filter-edit-callbacks.c:332
+#: ../src/filter-edit-callbacks.c:330
 msgid "One of the specified fields contains:"
 msgstr "Jedno od zadatih polja sadrži:"
 
-#: ../src/filter-edit-callbacks.c:333
+#: ../src/filter-edit-callbacks.c:331
 msgid "None of the specified fields contains:"
 msgstr "Nijedno od zadatih polja ne sadrži:"
 
-#: ../src/filter-edit-callbacks.c:335
+#: ../src/filter-edit-callbacks.c:333
 msgid "One of the regular expressions matches"
 msgstr "Jedan od regularnih izraza odgovara"
 
-#: ../src/filter-edit-callbacks.c:336
+#: ../src/filter-edit-callbacks.c:334
 msgid "None of the regular expressions matches"
 msgstr "Nijedan od regularnih izraza ne odgovara"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:336
 msgid "Match when date is in the interval:"
 msgstr "Odgovara kada je datum u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:339
+#: ../src/filter-edit-callbacks.c:337
 msgid "Match when date is outside the interval:"
 msgstr "Odgovara kada datum nije u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:341 ../src/filter-edit-callbacks.c:1136
+#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1134
 msgid "Match when one of these flags is set:"
 msgstr "Odgovara kada je neka od ovih oznaka postavljena:"
 
-#: ../src/filter-edit-callbacks.c:342
+#: ../src/filter-edit-callbacks.c:340
 msgid "Match when none of these flags is set:"
 msgstr "Odgovara kada nijedna od ovih oznaka nije postavljena:"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:538
 msgid "You must specify the name of the user header to match on"
 msgstr "Morate da zadate naziv korisničkog zaglavlja koje se upoređuje"
 
-#: ../src/filter-edit-callbacks.c:551
+#: ../src/filter-edit-callbacks.c:549
 msgid "You must specify at least one field for matching"
 msgstr "Morate da zadate bar jedno polje za upoređivanje"
 
-#: ../src/filter-edit-callbacks.c:561
+#: ../src/filter-edit-callbacks.c:559
 msgid "You must provide a string"
 msgstr "Morate da obezbedite nisku"
 
-#: ../src/filter-edit-callbacks.c:569
+#: ../src/filter-edit-callbacks.c:567
 msgid "You must provide at least one regular expression"
 msgstr "Morate da obezbedite bar jedan regularni izraz"
 
-#: ../src/filter-edit-callbacks.c:582
+#: ../src/filter-edit-callbacks.c:580
 msgid "Low date is incorrect"
 msgstr "Početni datum je neispravan"
 
-#: ../src/filter-edit-callbacks.c:593
+#: ../src/filter-edit-callbacks.c:591
 msgid "High date is incorrect"
 msgstr "Završni datum je neispravan"
 
-#: ../src/filter-edit-callbacks.c:601
+#: ../src/filter-edit-callbacks.c:599
 msgid "Low date is greater than high date"
 msgstr "Početni datum je veći od završnog"
 
-#: ../src/filter-edit-callbacks.c:902
+#: ../src/filter-edit-callbacks.c:900
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Greška prikazivanja pomoći za uslove: %s\n"
 
-#: ../src/filter-edit-callbacks.c:940
+#: ../src/filter-edit-callbacks.c:938
 msgid "Match Fields"
 msgstr "Poklopi polja"
 
-#: ../src/filter-edit-callbacks.c:954
+#: ../src/filter-edit-callbacks.c:952
 msgid "_All"
 msgstr "_Sve"
 
-#: ../src/filter-edit-callbacks.c:955
+#: ../src/filter-edit-callbacks.c:953
 msgid "C_lear"
 msgstr "_Očisti"
 
-#: ../src/filter-edit-callbacks.c:957 ../src/main-window.c:3986
+#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3980
 msgid "_Body"
 msgstr "_Telo"
 
-#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3987
+#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3981
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3988
+#: ../src/filter-edit-callbacks.c:957 ../src/main-window.c:3982
 msgid "_From:"
 msgstr "_Šalje:"
 
-#: ../src/filter-edit-callbacks.c:960
+#: ../src/filter-edit-callbacks.c:958
 msgid "_Subject"
 msgstr "_Tema"
 
-#: ../src/filter-edit-callbacks.c:961 ../src/main-window.c:3990
-msgid "_Cc:"
-msgstr "_Kopija:"
+#: ../src/filter-edit-callbacks.c:959 ../src/main-window.c:3984
+msgid "_CC:"
+msgstr "_CC:"
 
-#: ../src/filter-edit-callbacks.c:963
+#: ../src/filter-edit-callbacks.c:961
 msgid "_User header:"
 msgstr "_Korisničko zaglavlje:"
 
-#: ../src/filter-edit-callbacks.c:994
+#: ../src/filter-edit-callbacks.c:992
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: ../src/filter-edit-callbacks.c:1013
+#: ../src/filter-edit-callbacks.c:1011
 msgid "One of the specified f_ields contains"
 msgstr "Jedno od zadatih polja _sadrži"
 
-#: ../src/filter-edit-callbacks.c:1024
+#: ../src/filter-edit-callbacks.c:1022
 msgid "Contain/Does _Not Contain"
 msgstr "Sadrži/_ne sadrži"
 
-#: ../src/filter-edit-callbacks.c:1043
+#: ../src/filter-edit-callbacks.c:1041
 msgid "_One of the regular expressions matches"
 msgstr "_Jedan od regularnih izraza odgovara"
 
-#: ../src/filter-edit-callbacks.c:1079
+#: ../src/filter-edit-callbacks.c:1077
 msgid "One _Matches/None Matches"
 msgstr "_Jedan odgovara/nijedan ne odgovara"
 
-#: ../src/filter-edit-callbacks.c:1090
+#: ../src/filter-edit-callbacks.c:1088
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Probiranje upotrebom regularnih izraza još nije primenjeno."
 
-#: ../src/filter-edit-callbacks.c:1105
+#: ../src/filter-edit-callbacks.c:1103
 msgid "Match when message date is in the interval:"
 msgstr "Odgovara kada je datum poruke u intervalu:"
 
-#: ../src/filter-edit-callbacks.c:1118
+#: ../src/filter-edit-callbacks.c:1116
 msgid "Inside/outside the date interval"
 msgstr "Unutar/van intervala datuma"
 
-#: ../src/filter-edit-callbacks.c:1159
+#: ../src/filter-edit-callbacks.c:1157
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Odgovara kada je jedna oznaka postavljena/kada nijedna oznaka nije postavljena"
 
-#: ../src/filter-edit-callbacks.c:1178
+#: ../src/filter-edit-callbacks.c:1176
 msgid "Search T_ype:"
 msgstr "_Vrsta pretrage:"
 
-#: ../src/filter-edit-callbacks.c:1256
+#: ../src/filter-edit-callbacks.c:1254
 msgid "Edit condition for filter: "
 msgstr "Uredi uslov filtera: "
 
-#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1893
+#: ../src/filter-edit-callbacks.c:1473 ../src/save-restore.c:1873
 msgid "Filter with no condition was omitted"
 msgstr "Propusnik bez uslova je izostavljen"
 
-#: ../src/filter-edit-callbacks.c:1502
+#: ../src/filter-edit-callbacks.c:1500
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Greška prikazivanja pomoći filtera: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1701
+#: ../src/filter-edit-callbacks.c:1699
 msgid "New filter"
 msgstr "Novi filter"
 
-#: ../src/filter-edit-callbacks.c:1830
+#: ../src/filter-edit-callbacks.c:1828
 msgid "No filter name specified."
 msgstr "Nije naveden naziv filtera."
 
-#: ../src/filter-edit-callbacks.c:1835
+#: ../src/filter-edit-callbacks.c:1833
 #, c-format
-msgid "Filter \"%s\" already exists."
-msgstr "Propusnik „%s“ već postoji."
+#| msgid "Filter \"%s\" already exists."
+msgid "Filter “%s” already exists."
+msgstr "Filter „%s“ već postoji."
 
-#: ../src/filter-edit-callbacks.c:1845
+#: ../src/filter-edit-callbacks.c:1843
 msgid "Filter must have conditions."
 msgstr "Propusnik mora da ima uslove."
 
-#: ../src/filter-edit-callbacks.c:1931
+#: ../src/filter-edit-callbacks.c:1929
 msgid "Filter has matched"
 msgstr "Propusnik se poklapa"
 
-#: ../src/filter-edit-callbacks.c:1951
+#: ../src/filter-edit-callbacks.c:1949
 msgid "You must provide a sound to play"
 msgstr "Morate da obezbedite zvuk za puštanje"
 
-#: ../src/filter-edit-callbacks.c:2133
+#: ../src/filter-edit-callbacks.c:2131
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Primer: 31. decembar 2000. pišite kao %s)"
 
-#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:405
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:388
 msgid "Simple"
 msgstr "Jednostavno"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:96
 msgid "Regular Expression"
 msgstr "Regularni izrazi"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:97
 msgid "Date interval"
 msgstr "Interval datuma"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:98
 msgid "Flag condition"
 msgstr "Uslov oznake"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:102
 msgid "Copy to folder:"
 msgstr "Umnoži u fasciklu:"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:103
 msgid "Move to folder:"
 msgstr "Premesti u fasciklu:"
 
-#: ../src/filter-edit-dialog.c:106
+#: ../src/filter-edit-dialog.c:104
 msgid "Colorize"
 msgstr "Oboji"
 
-#: ../src/filter-edit-dialog.c:107
+#: ../src/filter-edit-dialog.c:105
 msgid "Print on printer:"
 msgstr "Štampaj na štampaču:"
 
-#: ../src/filter-edit-dialog.c:108
+#: ../src/filter-edit-dialog.c:106
 msgid "Run program:"
 msgstr "Pokreni program:"
 
-#: ../src/filter-edit-dialog.c:109
+#: ../src/filter-edit-dialog.c:107
 msgid "Send to Trash"
 msgstr "Pošalji u „smeće“"
 
-#: ../src/filter-edit-dialog.c:113
+#: ../src/filter-edit-dialog.c:111
 msgid "OR"
 msgstr "ILI"
 
-#: ../src/filter-edit-dialog.c:114
+#: ../src/filter-edit-dialog.c:112
 msgid "AND"
 msgstr "I"
 
 #. The name entry
-#: ../src/filter-edit-dialog.c:260
+#: ../src/filter-edit-dialog.c:258
 msgid "_Filter name:"
 msgstr "Naziv _filtera:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:274
+#: ../src/filter-edit-dialog.c:272
 msgid "Operation between conditions:"
 msgstr "Operacija nad uslovima:"
 
-#: ../src/filter-edit-dialog.c:311
+#: ../src/filter-edit-dialog.c:309
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/filter-edit-dialog.c:316
+#: ../src/filter-edit-dialog.c:314
 msgid "Ne_w"
 msgstr "No_vo"
 
-#: ../src/filter-edit-dialog.c:348
+#: ../src/filter-edit-dialog.c:346
 msgid "Foreground"
 msgstr "Pročelje"
 
-#: ../src/filter-edit-dialog.c:359
+#: ../src/filter-edit-dialog.c:357
 msgid "Background"
 msgstr "Pozadina"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:385
+#: ../src/filter-edit-dialog.c:383
 msgid "Notification:"
 msgstr "Obaveštenje:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:397
+#: ../src/filter-edit-dialog.c:395
 msgid "Play sound:"
 msgstr "Pusti zvuk:"
 
-#: ../src/filter-edit-dialog.c:402
-msgid "Use Sound..."
-msgstr "Koristi zvuk..."
+#: ../src/filter-edit-dialog.c:400
+#| msgid "Use Sound..."
+msgid "Use Sound…"
+msgstr "Koristi zvuk…"
 
-#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1113
+#: ../src/filter-edit-dialog.c:403 ../src/mailbox-node.c:1111
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/filter-edit-dialog.c:420
-msgid "Popup text:"
+#: ../src/filter-edit-dialog.c:418
+#| msgid "Popup text:"
+msgid "Pop-up text:"
 msgstr "Prikaži tekst:"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:437
+#: ../src/filter-edit-dialog.c:435
 msgid "Action to perform:"
 msgstr "Radnja za obavljanje:"
 
-#: ../src/filter-edit-dialog.c:491
+#: ../src/filter-edit-dialog.c:489
 msgid "Match"
 msgstr "Poklapanje"
 
-#: ../src/filter-edit-dialog.c:494
+#: ../src/filter-edit-dialog.c:492
 msgid "Action"
 msgstr "Radnja"
 
-#: ../src/filter-edit-dialog.c:505
-#| msgid "Revert"
+#: ../src/filter-edit-dialog.c:503
 msgid "Re_vert"
 msgstr "_Vrati"
 
-#: ../src/filter-edit-dialog.c:556
+#: ../src/filter-edit-dialog.c:554
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Otvoreno je prozorče za pokretanje filtera. Zatvorite ga da biste mogli da "
 "menjate filtere."
 
-#: ../src/filter-edit-dialog.c:569
-#| msgid "_Filters"
+#: ../src/filter-edit-dialog.c:567
 msgid "Filters"
 msgstr "Filteri"
 
-#: ../src/filter-edit-dialog.c:637
+#: ../src/filter-edit-dialog.c:635
 #, c-format
-msgid "Filter \"%s\" has no condition."
-msgstr "Propusnik „%s“ nema uslov."
+#| msgid "Filter \"%s\" has no condition."
+msgid "Filter “%s” has no condition."
+msgstr "Filter „%s“ nema uslov."
 
-#: ../src/filter-export-callbacks.c:59
+#: ../src/filter-export-callbacks.c:57
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Ne mogu da izvezem filter %s, došlo je do greške."
 
-#: ../src/filter-export-dialog.c:65
+#: ../src/filter-export-dialog.c:63
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
@@ -3710,38 +3942,46 @@ msgstr ""
 "Otvoreni su prozorčići za pokretanje filtera, zatvorite ih da biste mogli da "
 "menjate filtere."
 
-#: ../src/filter-export-dialog.c:77
-#| msgid "_Export Filters..."
+#: ../src/filter-export-dialog.c:75
 msgid "Export Filters"
 msgstr "Izvezi filtere"
 
-#: ../src/filter-run-callbacks.c:186
+#: ../src/filter-run-callbacks.c:184
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Greška prikazivanja pomoći za pokretanje filtera: %s\n"
 
-#: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
+#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
 msgid "Error when applying filters"
 msgstr "Greška pri primeni filtera"
 
-#: ../src/filter-run-callbacks.c:239 ../src/filter-run-callbacks.c:261
+#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
 #, c-format
-msgid "Filter applied to \"%s\"."
-msgstr "Propusnik je primenjen na „%s“."
+#| msgid "Filter applied to \"%s\"."
+msgid "Filter applied to “%s”."
+msgstr "Filter je primenjen na „%s“."
 
-#: ../src/filter-run-callbacks.c:300
+#: ../src/filter-run-callbacks.c:298
 #, c-format
+#| msgid ""
+#| "The destination mailbox of the filter \"%s\" is \"%s\".\n"
+#| "You can't associate it with the same mailbox (that causes recursion)."
 msgid ""
-"The destination mailbox of the filter \"%s\" is \"%s\".\n"
-"You can't associate it with the same mailbox (that causes recursion)."
+"The destination mailbox of the filter “%s” is “%s”.\n"
+"You can’t associate it with the same mailbox (that causes recursion)."
 msgstr ""
 "Odredišno sanduče za filter „%s“ je „%s“.\n"
 "Ne možete ga pridružiti sa istim sandučetom (to izaziva dubačenje)."
 
-#: ../src/filter-run-callbacks.c:308
+#: ../src/filter-run-callbacks.c:306
 #, c-format
+#| msgid ""
+#| "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
+#| "This happens for example when you use regular expressions match with IMAP "
+#| "mailboxes, it is done by a very slow method; if possible, use substring "
+#| "match instead."
 msgid ""
-"The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
+"The filter “%s” is not compatible with the mailbox type of “%s”.\n"
 "This happens for example when you use regular expressions match with IMAP "
 "mailboxes, it is done by a very slow method; if possible, use substring "
 "match instead."
@@ -3750,49 +3990,43 @@ msgstr ""
 "Ovo se događa kada npr. koristite regularne izraze sa IMAP sandučićima, onda "
 "se koristi veoma spor način; ako je moguće, koristite obične niske."
 
-#: ../src/filter-run-dialog.c:194
-#| msgid "Balsa Filters of Mailbox: "
+#: ../src/filter-run-dialog.c:192
 msgid "Filters of Mailbox: "
 msgstr "Filteri sandučeta: "
 
-#: ../src/filter-run-dialog.c:235
+#: ../src/filter-run-dialog.c:233
 msgid "On reception"
 msgstr "Pri prijemu"
 
-#: ../src/filter-run-dialog.c:247
+#: ../src/filter-run-dialog.c:245
 msgid "On exit"
 msgstr "Pri izlazu"
 
-#: ../src/filter-run-dialog.c:356
-#| msgid "Apply Selected"
+#: ../src/filter-run-dialog.c:354
 msgid "_Apply Selected"
 msgstr "_Primeni izabrano"
 
-#: ../src/filter-run-dialog.c:372
-#| msgid "Edit the selected mailbox"
+#: ../src/filter-run-dialog.c:370
 msgid "Add selected filter to mailbox"
 msgstr "Dodaj izabrani filter u sanduče"
 
-#: ../src/filter-run-dialog.c:382
-#| msgid "Remove duplicated messages from the current mailbox"
+#: ../src/filter-run-dialog.c:380
 msgid "Remove selected filter from mailbox"
 msgstr "Ukloni izabrani filter iz sandučeta"
 
-#: ../src/filter-run-dialog.c:424
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:422
 msgid "Move selected filter up"
 msgstr "Pomeri izabrani filter gore"
 
-#: ../src/filter-run-dialog.c:434
-#| msgid "Save selected to folder..."
+#: ../src/filter-run-dialog.c:432
 msgid "Move selected filter down"
 msgstr "Pomeri izabrani filter dole"
 
-#: ../src/filter-run-dialog.c:440
+#: ../src/filter-run-dialog.c:438
 msgid "A_pply Now!"
 msgstr "_Primeni sada!"
 
-#: ../src/filter-run-dialog.c:486
+#: ../src/filter-run-dialog.c:484
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -3800,94 +4034,101 @@ msgstr ""
 "Otvoreno je prozorče filtera, zatvorite ga da biste mogli da pokrenete "
 "filtere nad bilo kom sandučetu"
 
-#: ../src/folder-conf.c:112
+#: ../src/folder-conf.c:110
 #, c-format
 msgid "Error displaying config help: %s\n"
 msgstr "Greška prikazivanja pomoći podešavanja: %s\n"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:299
 msgid "Remote IMAP folder"
 msgstr "Udaljena fascikla IMAP-a"
 
-#: ../src/folder-conf.c:305 ../src/folder-conf.c:801 ../src/mailbox-conf.c:550
+#: ../src/folder-conf.c:303 ../src/folder-conf.c:798 ../src/mailbox-conf.c:548
 msgid "_Update"
 msgstr "_Ažuriraj"
 
-#: ../src/folder-conf.c:305
+#: ../src/folder-conf.c:303
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/folder-conf.c:332 ../src/mailbox-conf.c:1180
-#: ../src/mailbox-conf.c:1294
+#: ../src/folder-conf.c:329 ../src/mailbox-conf.c:1178
+#: ../src/mailbox-conf.c:1292
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../src/folder-conf.c:337
+#: ../src/folder-conf.c:334
 msgid "_Max number of connections:"
 msgstr "_Najveći broj povezivanja:"
 
-#: ../src/folder-conf.c:343 ../src/mailbox-conf.c:1354
+#: ../src/folder-conf.c:340 ../src/mailbox-conf.c:1352
 msgid "Enable _persistent cache"
 msgstr "Uključi _stalnu ostavu"
 
-#: ../src/folder-conf.c:350
+#: ../src/folder-conf.c:347
 msgid "Use IDLE command"
 msgstr "Koristi naredbu „MIRUJE“"
 
-#: ../src/folder-conf.c:357 ../src/mailbox-conf.c:1357
+#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1355
 msgid "Enable _bug workarounds"
 msgstr "Uključi zaobilaženje _greške"
 
-#: ../src/folder-conf.c:364
+#: ../src/folder-conf.c:361
 msgid "Use STATUS for mailbox checking"
 msgstr "Koristi „STANJE“ za proveru sandučeta"
 
-#: ../src/folder-conf.c:370 ../src/mailbox-conf.c:1233
-#: ../src/mailbox-conf.c:1359
+#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1231
+#: ../src/mailbox-conf.c:1357
 msgid "_Advanced"
 msgstr "_Napredno"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:373
+#: ../src/folder-conf.c:370
 msgid "Descriptive _name:"
 msgstr "Opisni _naziv:"
 
 #. username
-#: ../src/folder-conf.c:388 ../src/mailbox-conf.c:1196
+#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1194
 msgid "Use_r name:"
 msgstr "Korisničko _ime:"
 
-#: ../src/folder-conf.c:394
+#: ../src/folder-conf.c:391
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../src/folder-conf.c:401 ../src/mailbox-conf.c:1317
+#: ../src/folder-conf.c:398 ../src/mailbox-conf.c:1315
 msgid "_Anonymous access"
 msgstr "_Neprimetni pristup"
 
-#: ../src/folder-conf.c:412
+#: ../src/folder-conf.c:409
 msgid "Subscribed _folders only"
 msgstr "Samo _fascikle pretplate"
 
-#: ../src/folder-conf.c:415
-msgid "Always show _INBOX"
+#: ../src/folder-conf.c:412
+#| msgid "Always show _INBOX"
+msgid "Always show _Inbox"
 msgstr "_Uvek prikaži „DOLAZNO“"
 
-#: ../src/folder-conf.c:418
+#: ../src/folder-conf.c:415
 msgid "Pr_efix:"
 msgstr "Pr_efiks:"
 
-#: ../src/folder-conf.c:565
+#: ../src/folder-conf.c:562
 msgid "Select parent folder"
 msgstr "Izaberi roditeljsku fasciklu"
 
-#: ../src/folder-conf.c:644
+#: ../src/folder-conf.c:641
 #, c-format
+#| msgid ""
+#| "Renaming INBOX is special!\n"
+#| "You will create a subfolder %s in %s\n"
+#| "containing the messages from INBOX.\n"
+#| "INBOX and its subfolders will remain.\n"
+#| "What would you like to do?"
 msgid ""
-"Renaming INBOX is special!\n"
+"Renaming Inbox is special!\n"
 "You will create a subfolder %s in %s\n"
-"containing the messages from INBOX.\n"
-"INBOX and its subfolders will remain.\n"
+"containing the messages from Inbox.\n"
+"Inbox and its subfolders will remain.\n"
 "What would you like to do?"
 msgstr ""
 "Preimenovanje fascikle „DOLAZNO“ je nešto posebno!\n"
@@ -3896,29 +4137,30 @@ msgstr ""
 "„DOLAZNO“ i njene podfascikle će ostati.\n"
 "Šta želite da uradite?"
 
-#: ../src/folder-conf.c:651
+#: ../src/folder-conf.c:648
 msgid "Question"
 msgstr "Pitanje"
 
-#: ../src/folder-conf.c:655
-msgid "Rename INBOX"
+#: ../src/folder-conf.c:652
+#| msgid "Rename INBOX"
+msgid "Rename Inbox"
 msgstr "Preimenuj „DOLAZNO“"
 
-#: ../src/folder-conf.c:657
+#: ../src/folder-conf.c:654
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../src/folder-conf.c:682
+#: ../src/folder-conf.c:679
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Nisam uspeo da preimenujem fasciklu. Evo zašto: %s"
 
-#: ../src/folder-conf.c:734
+#: ../src/folder-conf.c:731
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Nisam uspeo da napravim fasciklu. Evo zašto: %s"
 
-#: ../src/folder-conf.c:781
+#: ../src/folder-conf.c:778
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3926,68 +4168,69 @@ msgstr ""
 "Fascikla IMAP-a koja nije sanduče\n"
 "nema osobine koje se mogu menjati."
 
-#: ../src/folder-conf.c:797
+#: ../src/folder-conf.c:794
 msgid "Remote IMAP subfolder"
 msgstr "Udaljena podfascikla IMAP-a"
 
-#: ../src/folder-conf.c:801
+#: ../src/folder-conf.c:798
 msgid "_Create"
 msgstr "_Napravi"
 
-#: ../src/folder-conf.c:832
+#: ../src/folder-conf.c:828
 msgid "Create subfolder"
 msgstr "Napravi podfasciklu"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:840
+#: ../src/folder-conf.c:836
 msgid "_Folder name:"
 msgstr "Naziv _fascikle:"
 
-#: ../src/folder-conf.c:846
+#: ../src/folder-conf.c:842
 msgid "Host:"
 msgstr "Domaćin:"
 
-#: ../src/folder-conf.c:855
+#: ../src/folder-conf.c:851
 msgid "Subfolder of:"
 msgstr "Podfascikla:"
 
-#: ../src/folder-conf.c:860
-msgid "_Browse..."
-msgstr "_Razgledaj..."
+#: ../src/folder-conf.c:856
+#| msgid "_Browse..."
+msgid "_Browse…"
+msgstr "_Razgledaj…"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:870
 msgid "read-only"
 msgstr "samo za čitanje"
 
-#: ../src/folder-conf.c:875
+#: ../src/folder-conf.c:871
 msgid "read-write"
 msgstr "čitanje-pisanje"
 
-#: ../src/folder-conf.c:876
+#: ../src/folder-conf.c:872
 msgid "admin"
 msgstr "administrator"
 
-#: ../src/folder-conf.c:877
+#: ../src/folder-conf.c:873
 msgid "post"
 msgstr "upisivanje"
 
-#: ../src/folder-conf.c:878
+#: ../src/folder-conf.c:874
 msgid "append"
 msgstr "prikačinjanje"
 
-#: ../src/folder-conf.c:879
+#: ../src/folder-conf.c:875
 msgid "delete"
 msgstr "brisanje"
 
-#: ../src/folder-conf.c:880
+#: ../src/folder-conf.c:876
 msgid "special"
 msgstr "posebno"
 
-#: ../src/folder-conf.c:886
+#: ../src/folder-conf.c:882
 msgid "Permissions:"
 msgstr "Ovlašćenja:"
 
-#: ../src/folder-conf.c:893
+#: ../src/folder-conf.c:889
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -3995,40 +4238,43 @@ msgstr ""
 "\n"
 "detaljnija ovlašćenja su dostupna samo za otvorene fascikle"
 
-#: ../src/folder-conf.c:900
+#: ../src/folder-conf.c:896
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
 msgid ""
 "\n"
-"the server does not support ACL's"
+"the server does not support ACLs"
 msgstr ""
 "\n"
 "server ne podržava ACL-e"
 
-#: ../src/folder-conf.c:909
+#: ../src/folder-conf.c:905
 msgid "mine: "
 msgstr "moje: "
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:943
 msgid "Quota:"
 msgstr "Udeo:"
 
-#: ../src/folder-conf.c:951
+#: ../src/folder-conf.c:947
 msgid "quota information available only for open folders"
 msgstr "podatak o udelu je dostupan samo za otvorene fascikle"
 
-#: ../src/folder-conf.c:956
+#: ../src/folder-conf.c:952
 msgid "the server does not support quotas"
 msgstr "server ne podržava udele"
 
-#: ../src/folder-conf.c:958
+#: ../src/folder-conf.c:954
 msgid "no limits"
 msgstr "bez ograničenja"
 
-#: ../src/folder-conf.c:963
+#: ../src/folder-conf.c:959
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s od %s (%.1f%%) je iskorišćeno"
 
-#: ../src/folder-conf.c:1000
+#: ../src/folder-conf.c:996
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4036,59 +4282,84 @@ msgstr ""
 "Ova fascikla nije smeštena u podešavanjima. Ja još uvek ne znam kako da je "
 "uklonim sa udaljenog servera."
 
-#: ../src/folder-conf.c:1009
+#: ../src/folder-conf.c:1005
 #, c-format
+#| msgid ""
+#| "This will remove the folder \"%s\" from the list.\n"
+#| "You may use \"New IMAP Folder\" later to add this folder again.\n"
 msgid ""
-"This will remove the folder \"%s\" from the list.\n"
-"You may use \"New IMAP Folder\" later to add this folder again.\n"
+"This will remove the folder “%s” from the list.\n"
+"You may use “New IMAP Folder” later to add this folder again.\n"
 msgstr ""
 "Ovo će ukloniti fasciklu „%s“ sa spiska.\n"
 "Kasnije možete koristiti stavku „Nova fascikla IMAP-a“ da ponovo dodate ovu "
 "fasciklu.\n"
 
-#: ../src/folder-conf.c:1017
+#: ../src/folder-conf.c:1013
 msgid "Confirm"
 msgstr "Potvrdi"
 
-#: ../src/information-dialog.c:233
-msgid "Information - Balsa"
+#: ../src/information-dialog.c:231
+#| msgid "Information - Balsa"
+msgid "Information — Balsa"
 msgstr "Informacija — Balsa"
 
-#: ../src/information-dialog.c:237 ../src/main-window.c:4007
+#: ../src/information-dialog.c:235 ../src/main-window.c:4001
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../src/information-dialog.c:238
+#: ../src/information-dialog.c:236
 msgid "Cl_ose"
 msgstr "_Zatvori"
 
-#: ../src/information-dialog.c:361
+#: ../src/information-dialog.c:358
 #, c-format
 msgid "WARNING: "
 msgstr "UPOZORENJE: "
 
-#: ../src/information-dialog.c:364
+#: ../src/information-dialog.c:361
 #, c-format
 msgid "ERROR: "
 msgstr "GREŠKA: "
 
-#: ../src/information-dialog.c:367
+#: ../src/information-dialog.c:364
 #, c-format
 msgid "FATAL: "
 msgstr "KOBNO: "
 
-#: ../src/mailbox-conf.c:222
+#: ../src/mailbox-conf.c:203 ../src/mailbox-conf.c:1437
+#: ../src/pref-manager.c:374 ../src/pref-manager.c:3311
+msgid "Never"
+msgstr "Nikad"
+
+#: ../src/mailbox-conf.c:204 ../src/mailbox-conf.c:1438
+msgid "If Possible"
+msgstr "Ako je moguće"
+
+#: ../src/mailbox-conf.c:205
+msgid "Required"
+msgstr "Uvek"
+
+#: ../src/mailbox-conf.c:220
 msgid "Use _SSL"
 msgstr "Koristi _SSL"
 
-#: ../src/mailbox-conf.c:350
+#: ../src/mailbox-conf.c:225
+msgid "Use _TLS:"
+msgstr "Koristi _TLS:"
+
+#: ../src/mailbox-conf.c:348
 msgid "No mailbox selected."
 msgstr "Nijedno sanduče nije izabrano."
 
-#: ../src/mailbox-conf.c:380
+#: ../src/mailbox-conf.c:378
 #, c-format
+#| msgid ""
+#| "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+#| "If you really want to remove it, assign its function\n"
+#| "to some other mailbox."
 msgid ""
-"Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+"Mailbox “%s” is used by Balsa and I cannot remove it.\n"
 "If you really want to remove it, assign its function\n"
 "to some other mailbox."
 msgstr ""
@@ -4096,12 +4367,18 @@ msgstr ""
 "Ako zaista želite da ga uklonim, dodelite njegovu funkciju\n"
 "nekom drugom sandučetu."
 
-#: ../src/mailbox-conf.c:390
+#: ../src/mailbox-conf.c:388
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
+#| "also delete the disk file or files associated with this mailbox.\n"
+#| "If you do not remove the file on disk you may \"Add  Mailbox\" to access "
+#| "the mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
-"also delete the disk file or files associated with this mailbox.\n"
-"If you do not remove the file on disk you may \"Add  Mailbox\" to access the "
+"This will remove the mailbox “%s” from the list of mailboxes. You may also "
+"delete the disk file or files associated with this mailbox.\n"
+"If you do not remove the file on disk you may “Add Mailbox” to access the "
 "mailbox again.\n"
 "What would you like to do?"
 msgstr ""
@@ -4111,21 +4388,28 @@ msgstr ""
 "biste ponovo pristupili sandučetu.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:402
+#: ../src/mailbox-conf.c:400
 msgid "Remove from _list"
 msgstr "Ukloni sa _spiska"
 
-#: ../src/mailbox-conf.c:403
+#: ../src/mailbox-conf.c:401
 msgid "Remove from list and _disk"
 msgstr "Ukloni sa spiska i sa _diska"
 
-#: ../src/mailbox-conf.c:411
+#: ../src/mailbox-conf.c:409
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" and all its messages from your IMAP "
+#| "server.  If %s has subfolders, it will still appear as a node in the "
+#| "folder tree.\n"
+#| "You may use \"New IMAP subfolder\" later to add a mailbox with this "
+#| "name.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" and all its messages from your IMAP "
-"server.  If %s has subfolders, it will still appear as a node in the folder "
+"This will remove the mailbox “%s” and all its messages from your IMAP "
+"server. If %s has subfolders, it will still appear as a node in the folder "
 "tree.\n"
-"You may use \"New IMAP subfolder\" later to add a mailbox with this name.\n"
+"You may use “New IMAP subfolder” later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
 "Ovo će ukloniti sanduče „%s“ i sve njegove poruke sa servera IMAP-a. Ako %s "
@@ -4134,15 +4418,19 @@ msgstr ""
 "pod ovim imenom.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:424
+#: ../src/mailbox-conf.c:422
 msgid "_Remove from server"
 msgstr "_Ukloni sa servera"
 
-#: ../src/mailbox-conf.c:431
+#: ../src/mailbox-conf.c:429
 #, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
+#| "You may use \"Add Mailbox\" later to access this mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.\n"
-"You may use \"Add Mailbox\" later to access this mailbox again.\n"
+"This will remove the mailbox “%s” from the list of mailboxes.\n"
+"You may use “Add Mailbox” later to access this mailbox again.\n"
 "What would you like to do?"
 msgstr ""
 "Ovo će ukloniti sanduče „%s“ sa spiska sandučića.\n"
@@ -4150,21 +4438,21 @@ msgstr ""
 "sandučetu.\n"
 "Šta biste želeli da uradim?"
 
-#: ../src/mailbox-conf.c:440
+#: ../src/mailbox-conf.c:438
 msgid "_Remove from list"
 msgstr "_Ukloni sa spiska"
 
-#: ../src/mailbox-conf.c:484
+#: ../src/mailbox-conf.c:482
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Nisam uspeo da obrišem fasciklu. Evo zašto: %s"
 
-#: ../src/mailbox-conf.c:780
+#: ../src/mailbox-conf.c:778
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: ../src/mailbox-conf.c:920
+#: ../src/mailbox-conf.c:918
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4173,72 +4461,72 @@ msgstr ""
 "Nisam uspeo da preimenujem „%s“ u „%s“:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1105
+#: ../src/mailbox-conf.c:1103
 msgid "_Mailbox Name:"
 msgstr "_Naziv sandučeta:"
 
-#: ../src/mailbox-conf.c:1114
+#: ../src/mailbox-conf.c:1112
 #, c-format
 msgid "Local %s Mailbox Properties"
 msgstr "Svojstva mesnog „%s“ sandučeta"
 
-#: ../src/mailbox-conf.c:1115
+#: ../src/mailbox-conf.c:1113
 #, c-format
 msgid "New Local %s Mailbox"
 msgstr "Novo mesno „%s“ sanduče"
 
-#: ../src/mailbox-conf.c:1157
+#: ../src/mailbox-conf.c:1155
 msgid "Remote Mailbox Configurator"
 msgstr "Podešavač udaljenog sandučeta"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1183 ../src/mailbox-conf.c:1297
+#: ../src/mailbox-conf.c:1181 ../src/mailbox-conf.c:1295
 msgid "Mailbox _name:"
 msgstr "Naziv _sandučeta:"
 
 #. password field
-#: ../src/mailbox-conf.c:1202 ../src/mailbox-conf.c:1329
+#: ../src/mailbox-conf.c:1200 ../src/mailbox-conf.c:1327
 msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
-#: ../src/mailbox-conf.c:1209
+#: ../src/mailbox-conf.c:1207
 msgid "_Delete messages from server after download"
 msgstr "_Obriši poruke sa servera nakon preuzimanja"
 
-#: ../src/mailbox-conf.c:1215
+#: ../src/mailbox-conf.c:1213
 msgid "_Enable check for new mail"
 msgstr "_Uključi proveru za novom poštom"
 
-#: ../src/mailbox-conf.c:1220
+#: ../src/mailbox-conf.c:1218
 msgid "_Filter messages through procmail"
 msgstr "_Propusti poruke kroz „procmail“"
 
-#: ../src/mailbox-conf.c:1224
+#: ../src/mailbox-conf.c:1222
 msgid "Fi_lter Command:"
 msgstr "Naredba za _propuštanje:"
 
-#: ../src/mailbox-conf.c:1237
+#: ../src/mailbox-conf.c:1235
 msgid "Disable _APOP"
 msgstr "Isključi _APOP"
 
 #. username
-#: ../src/mailbox-conf.c:1310
+#: ../src/mailbox-conf.c:1308
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: ../src/mailbox-conf.c:1334
+#: ../src/mailbox-conf.c:1332
 msgid "F_older path:"
 msgstr "_Putanja fascikle:"
 
-#: ../src/mailbox-conf.c:1418
+#: ../src/mailbox-conf.c:1416
 msgid "_Identity:"
 msgstr "_Ličnost:"
 
-#: ../src/mailbox-conf.c:1441 ../src/pref-manager.c:3336
+#: ../src/mailbox-conf.c:1439 ../src/pref-manager.c:3313
 msgid "Always"
 msgstr "Uvek"
 
-#: ../src/mailbox-conf.c:1445
+#: ../src/mailbox-conf.c:1443
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4246,24 +4534,25 @@ msgstr ""
 "_Dešifruj i proveri\n"
 "potpise samostalno:"
 
-#: ../src/mailbox-conf.c:1472
+#: ../src/mailbox-conf.c:1470
 msgid "Show _Recipient column instead of Sender"
 msgstr "Prikaži kolonu _primaoca umesto pošiljaoca"
 
-#: ../src/mailbox-conf.c:1486
+#: ../src/mailbox-conf.c:1484
 msgid "_Subscribe for new mail check"
 msgstr "_Pretplati se za proveru nove pošte"
 
-#: ../src/mailbox-node.c:319
+#: ../src/mailbox-node.c:317
 msgid "The folder edition to be written."
 msgstr "Izdanje fascikle za upis."
 
-#: ../src/mailbox-node.c:499
+#: ../src/mailbox-node.c:497
 #, c-format
-msgid "Scanning %s. Please wait..."
-msgstr "Pregledam „%s“. Molim sačekajte..."
+#| msgid "Scanning %s. Please wait..."
+msgid "Scanning %s. Please wait…"
+msgstr "Pregledam „%s“. Sačekajte…"
 
-#: ../src/mailbox-node.c:515
+#: ../src/mailbox-node.c:513
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4272,87 +4561,95 @@ msgstr ""
 "Pregledanje „%s“ nije uspelo: %s\n"
 "Proverite povezanost na mrežu."
 
-#: ../src/mailbox-node.c:517
+#: ../src/mailbox-node.c:515
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Pregledanje „%s“ nije uspelo: %s"
 
+#: ../src/mailbox-node.c:1063
+#| msgid "Local _mbox mailbox..."
+msgid "Local _mbox mailbox…"
+msgstr "Mesno sanduče „_mbox“…"
+
 #: ../src/mailbox-node.c:1065
-msgid "Local _mbox mailbox..."
-msgstr "Mesno sanduče „_mbox“..."
+#| msgid "Local Mail_dir mailbox..."
+msgid "Local Mail_dir mailbox…"
+msgstr "Mesno sanduče „Mail_dir“…"
 
 #: ../src/mailbox-node.c:1067
-msgid "Local Mail_dir mailbox..."
-msgstr "Mesno sanduče „Mail_dir“..."
+#| msgid "Local M_H mailbox..."
+msgid "Local M_H mailbox…"
+msgstr "Mesno sanduče „M_H“…"
 
 #: ../src/mailbox-node.c:1069
-msgid "Local M_H mailbox..."
-msgstr "Mesno sanduče „M_H“..."
+#| msgid "Remote _IMAP mailbox..."
+msgid "Remote _IMAP mailbox…"
+msgstr "Udaljeno sanduče _IMAP-a…"
 
-#: ../src/mailbox-node.c:1071
-msgid "Remote _IMAP mailbox..."
-msgstr "Udaljeno sanduče _IMAP-a..."
+#: ../src/mailbox-node.c:1072
+#| msgid "Remote IMAP folder"
+msgid "Remote IMAP _folder…"
+msgstr "Udaljena _fascikla IMAP-a…"
 
 #: ../src/mailbox-node.c:1074
-msgid "Remote IMAP _folder..."
-msgstr "Udaljena _fascikla IMAP-a..."
-
-#: ../src/mailbox-node.c:1076
-msgid "Remote IMAP _subfolder..."
-msgstr "Udaljena podfa_scikla IMAP-a..."
+#| msgid "Remote IMAP subfolder"
+msgid "Remote IMAP _subfolder…"
+msgstr "Udaljena _podfascikla IMAP-a…"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1087 ../src/mailbox-node.c:1103
+#: ../src/mailbox-node.c:1085 ../src/mailbox-node.c:1101
 msgid "_Rescan"
 msgstr "Ponovo p_regledaj"
 
-#: ../src/mailbox-node.c:1097
-msgid "_Properties..."
-msgstr "_Svojstva..."
+#: ../src/mailbox-node.c:1095
+#| msgid "_Properties"
+msgid "_Properties…"
+msgstr "_Svojstva…"
 
-#: ../src/mailbox-node.c:1127
+#: ../src/mailbox-node.c:1125
 msgid "_Subscribe"
 msgstr "Pre_tplati se"
 
-#: ../src/mailbox-node.c:1129
+#: ../src/mailbox-node.c:1127
 msgid "_Unsubscribe"
 msgstr "_Poništi pretplatu"
 
-#: ../src/mailbox-node.c:1135
+#: ../src/mailbox-node.c:1133
 msgid "Mark as _Inbox"
 msgstr "Označi kao „_dolazno“"
 
-#: ../src/mailbox-node.c:1137
+#: ../src/mailbox-node.c:1135
 msgid "_Mark as Sentbox"
 msgstr "Označi kao „_odlazno“"
 
-#: ../src/mailbox-node.c:1139
+#: ../src/mailbox-node.c:1137
 msgid "Mark as _Trash"
 msgstr "Označi kao „_smeće“"
 
-#: ../src/mailbox-node.c:1141
+#: ../src/mailbox-node.c:1139
 msgid "Mark as D_raftbox"
 msgstr "Označi kao „s_kice“"
 
-#: ../src/mailbox-node.c:1144
+#: ../src/mailbox-node.c:1142
 msgid "_Empty trash"
 msgstr "_Izbaci smeće"
 
-#: ../src/mailbox-node.c:1149
+#: ../src/mailbox-node.c:1147
 msgid "_Edit/Apply filters"
 msgstr "_Uredi/primeni filtere"
 
-#: ../src/mailbox-node.c:1236
+#: ../src/mailbox-node.c:1234
 #, c-format
-msgid "The path \"%s\" does not lead to a mailbox."
+#| msgid "The path \"%s\" does not lead to a mailbox."
+msgid "The path “%s” does not lead to a mailbox."
 msgstr "Putanja „%s“ ne vodi ka sandučetu."
 
-#: ../src/mailbox-node.c:1249
+#: ../src/mailbox-node.c:1247
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
 msgstr "Mesno sanduče „%s“ je učitano kao: %s\n"
 
-#: ../src/mailbox-node.c:1280
+#: ../src/mailbox-node.c:1278
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Mesna fascikla „%s“\n"
@@ -4365,31 +4662,31 @@ msgstr ""
 "Balsa trenutno šalje poruku.\n"
 "Da prekinem slanje?"
 
-#: ../src/main-window.c:444
+#: ../src/main-window.c:445
 msgid "Subject or Sender Contains:"
 msgstr "Tema ili pošiljalac sadrže:"
 
-#: ../src/main-window.c:445
+#: ../src/main-window.c:446
 msgid "Subject or Recipient Contains:"
 msgstr "Tema ili primalac sadrže:"
 
-#: ../src/main-window.c:446
+#: ../src/main-window.c:447
 msgid "Subject Contains:"
 msgstr "Tema sadrži:"
 
-#: ../src/main-window.c:447
+#: ../src/main-window.c:448
 msgid "Body Contains:"
 msgstr "Telo poruke sadrži:"
 
-#: ../src/main-window.c:448
+#: ../src/main-window.c:449
 msgid "Older than (days):"
 msgstr "Starije od (u danima):"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:450
 msgid "Old at most (days):"
 msgstr "Staro barem (u danima):"
 
-#: ../src/main-window.c:965
+#: ../src/main-window.c:964
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <danilo prevod org>\n"
@@ -4399,29 +4696,30 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
-#: ../src/main-window.c:976
+#: ../src/main-window.c:975
 msgid "The Balsa email client is part of the GNOME desktop environment."
-msgstr "Program za el-poštu, Balsa, je deo Gnomovog radnog okruženja."
+msgstr "Program za e-poštu, Balsa, je deo Gnomovog radnog okruženja."
 
 #. license ?
-#: ../src/main-window.c:981
+#: ../src/main-window.c:980
 msgid "About Balsa"
 msgstr "O Balsi"
 
-#: ../src/main-window.c:1003
-msgid "Balsa closes files and connections.Please wait..."
-msgstr "Balsa je zatvorila datoteke i veze. Sačekajte..."
+#: ../src/main-window.c:1002
+#| msgid "Balsa closes files and connections.Please wait..."
+msgid "Balsa closes files and connections. Please wait…"
+msgstr "Balsa je zatvorila datoteke i veze. Sačekajte…"
 
-#: ../src/main-window.c:1396
+#: ../src/main-window.c:1393
 msgid "You can apply filters only on mailbox\n"
 msgstr "Propusnike možete primeniti samo na sanduče\n"
 
-#: ../src/main-window.c:1416
+#: ../src/main-window.c:1413
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Nisam uspeo da uklonim duplikate: %s"
 
-#: ../src/main-window.c:1422
+#: ../src/main-window.c:1419
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
@@ -4430,11 +4728,11 @@ msgstr[1] "Uklonio sam %d duplikata"
 msgstr[2] "Uklonio sam %d duplikata"
 msgstr[3] "Uklonio sam jedan duplikat"
 
-#: ../src/main-window.c:1427
+#: ../src/main-window.c:1424
 msgid "No duplicates found"
 msgstr "Nisam pronašao duplikate"
 
-#: ../src/main-window.c:2915
+#: ../src/main-window.c:2912
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -4443,36 +4741,37 @@ msgstr ""
 "Ne mogu da otvorim sanduče!\n"
 "%s."
 
-#: ../src/main-window.c:2950
+#: ../src/main-window.c:2947
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: ../src/main-window.c:3253 ../src/main-window.c:3272
-msgid "Checking Mail..."
-msgstr "Proveravam poštu..."
+#: ../src/main-window.c:3250 ../src/main-window.c:3268
+#| msgid "Checking Mail..."
+msgid "Checking Mail…"
+msgstr "Proveravam poštu…"
 
-#: ../src/main-window.c:3412
+#: ../src/main-window.c:3408
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "IMAP sanduče: %s"
 
-#: ../src/main-window.c:3416
+#: ../src/main-window.c:3412
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Mesno sanduče: %s"
 
-#: ../src/main-window.c:3580
+#: ../src/main-window.c:3576
 msgid "Finished Checking."
 msgstr "Provera je završena."
 
-#: ../src/main-window.c:3645
+#: ../src/main-window.c:3641
 #, c-format
 msgid "Sending error: %s"
 msgstr "Greška pri slanju: %s"
 
 # bug: plural-forms
-#: ../src/main-window.c:3709
+#: ../src/main-window.c:3705
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -4481,73 +4780,74 @@ msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
 msgstr[3] "Primili ste jednu novu poruku."
 
-#: ../src/main-window.c:3712
+#: ../src/main-window.c:3708
 msgid "You have new mail."
 msgstr "Imate novu poštu."
 
-#: ../src/main-window.c:3780 ../src/main-window.c:3816
+#: ../src/main-window.c:3776 ../src/main-window.c:3811
 msgid "Balsa: New mail"
 msgstr "Balsa: Nova pošta"
 
-#: ../src/main-window.c:3940
+#: ../src/main-window.c:3934
 msgid "Search mailbox"
 msgstr "Pretraži sanduče"
 
-#: ../src/main-window.c:3964
+#: ../src/main-window.c:3958
 msgid "_Search for:"
 msgstr "_Pretraži:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3977
+#: ../src/main-window.c:3971
 msgid "In:"
 msgstr "U:"
 
-#: ../src/main-window.c:3989
+#: ../src/main-window.c:3983
 msgid "S_ubject"
 msgstr "T_ema"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3994
+#: ../src/main-window.c:3988
 msgid "Show only matching messages"
 msgstr "Prikaži samo odgovarajuće poruke"
 
 #. Frame with OK button
-#: ../src/main-window.c:4015
+#: ../src/main-window.c:4009
 msgid "Open next matching message"
 msgstr "Otvori sledeću odgovarajuću poruku"
 
-#: ../src/main-window.c:4027
+#: ../src/main-window.c:4021
 msgid "_Reverse search"
 msgstr "_Obrnuta pretraga"
 
-#: ../src/main-window.c:4032
+#: ../src/main-window.c:4026
 msgid "_Wrap around"
 msgstr "_Prelamaj unaokolo"
 
-#: ../src/main-window.c:4250
+#: ../src/main-window.c:4244
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Ne mogu da otvorim smeće: %s"
 
-#: ../src/main-window.c:4385
+#: ../src/main-window.c:4381
 #, c-format
-msgid "Balsa: %s (readonly)"
+#| msgid "Balsa: %s (readonly)"
+msgid "Balsa: %s (read-only)"
 msgstr "Balsa: %s (samo za čitanje)"
 
-#: ../src/main-window.c:4387
+#: ../src/main-window.c:4383
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4884
+#: ../src/main-window.c:4880
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Prikaži sanduče: %s "
 
-#: ../src/main-window.c:4889
+#: ../src/main-window.c:4885
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
@@ -4556,7 +4856,7 @@ msgstr[1] "sa %d poruke"
 msgstr[2] "sa %d poruka"
 msgstr[3] "sa jednom porukom"
 
-#: ../src/main-window.c:4896
+#: ../src/main-window.c:4892
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -4565,7 +4865,7 @@ msgstr[1] ", %d nove"
 msgstr[2] ", %d novih"
 msgstr[3] ", jedna nova"
 
-#: ../src/main-window.c:4903
+#: ../src/main-window.c:4899
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -4574,304 +4874,310 @@ msgstr[1] ", %d skrivene"
 msgstr[2] ", %d skrivenih"
 msgstr[3] ", jedna skrivena"
 
-#: ../src/main-window.c:4948
+#: ../src/main-window.c:4944
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Sledeća nepročitana poruka je u %s"
 
-#: ../src/main-window.c:4955
+#: ../src/main-window.c:4951
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Da li želite da izaberete „%s“?"
 
-#: ../src/main.c:126 ../src/main.c:131 ../src/main.c:137 ../src/main.c:143
-#: ../src/main.c:149
+#: ../src/main.c:124 ../src/main.c:129 ../src/main.c:135 ../src/main.c:141
+#: ../src/main.c:147
 #, c-format
-msgid "Balsa cannot open your \"%s\" mailbox."
+#| msgid "Balsa cannot open your \"%s\" mailbox."
+msgid "Balsa cannot open your “%s” mailbox."
 msgstr "Balsa ne može da otvori vaše sanduče „%s“."
 
-#: ../src/main.c:126
+#: ../src/main.c:124
 msgid "Inbox"
 msgstr "Primljene"
 
-#: ../src/main.c:132
+#: ../src/main.c:130
 msgid "Outbox"
 msgstr "Poslate"
 
-#: ../src/main.c:138
+#: ../src/main.c:136
 msgid "Sentbox"
 msgstr "Za slanje"
 
-#: ../src/main.c:144
+#: ../src/main.c:142
 msgid "Draftbox"
 msgstr "Nacrti"
 
-#: ../src/main.c:149
+#: ../src/main.c:147
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../src/main.c:403
-msgid "Compressing mail folders..."
-msgstr "Pakujem fascikle pošte..."
+#: ../src/main.c:401
+#| msgid "Compressing mail folders..."
+msgid "Compressing mail folders…"
+msgstr "Pakujem fascikle pošte…"
 
-#: ../src/main.c:657
-msgid "Get new mail on startup"
+#: ../src/main.c:665
+#| msgid "Get new mail on startup"
+msgid "Get new mail on start-up"
 msgstr "Preuzima nove poruke pri pokretanju"
 
-#: ../src/main.c:659
+#: ../src/main.c:667
 msgid "Compose a new email to EMAIL@ADDRESS"
-msgstr "Sastavlja novu poruku za „ADRESA EL POŠTE“"
+msgstr "Sastavlja novu poruku za „ADRESA@E-POŠTE“"
 
-#: ../src/main.c:661
+#: ../src/main.c:669
 msgid "Attach file at URI"
 msgstr "Prilaže datoteku iz putanje"
 
-#: ../src/main.c:664
+#: ../src/main.c:672
 msgid "Opens MAILBOXNAME"
 msgstr "Otvara NAZIVSANDUČETA"
 
-#: ../src/main.c:664
+#: ../src/main.c:672
 msgid "MAILBOXNAME"
 msgstr "NAZIVSANDUČETA"
 
-#: ../src/main.c:667
+#: ../src/main.c:675
 msgid "Opens first unread mailbox"
 msgstr "Otvara prvo nepročitano sanduče"
 
-#: ../src/main.c:670
-msgid "Opens default Inbox on startup"
+#: ../src/main.c:678
+#| msgid "Opens default Inbox on startup"
+msgid "Opens default Inbox on start-up"
 msgstr "Otvara osnovno sanduče „dolazno“ pri pokretanju"
 
-#: ../src/main.c:673
+#: ../src/main.c:681
 msgid "Prints number unread and unsent messages"
 msgstr "Ispisuje broj nepročitanih i neposlatih poruka"
 
-#: ../src/main.c:675
+#: ../src/main.c:683
 msgid "Debug POP3 connection"
 msgstr "Popravlja POP3 vezu"
 
-#: ../src/main.c:677
+#: ../src/main.c:685
 msgid "Debug IMAP connection"
 msgstr "Popravlja IMAP vezu"
 
-#: ../src/main.c:678
-#| msgid "Other options"
+#: ../src/main.c:686
 msgid "Show help options"
 msgstr "Prikazuje opcije pomoći"
 
-#: ../src/main.c:679
-#| msgid "Show icon"
+#: ../src/main.c:687
 msgid "Show version"
 msgstr "Prikazuje izdanje"
 
-#: ../src/message-window.c:305
+#: ../src/message-window.c:303
 msgid "M_ove"
 msgstr "Pre_mesti"
 
-#: ../src/message-window.c:747
+#: ../src/message-window.c:748
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Poruku šalje %s: %s"
 
-#: ../src/pref-manager.c:389
+#: ../src/pref-manager.c:372
 msgid "While retrieving messages"
 msgstr "Prilikom preuzimanja poruka"
 
-#: ../src/pref-manager.c:390
+#: ../src/pref-manager.c:373
 msgid "Until closed"
 msgstr "Dok se ne zatvori"
 
-#: ../src/pref-manager.c:396
+#: ../src/pref-manager.c:379
 msgid "Message number"
 msgstr "Broj poruke"
 
-#: ../src/pref-manager.c:400
+#: ../src/pref-manager.c:383
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#: ../src/pref-manager.c:404
+#: ../src/pref-manager.c:387
 msgid "Flat"
 msgstr "Ravno"
 
-#: ../src/pref-manager.c:406
+#: ../src/pref-manager.c:389
 msgid "JWZ"
 msgstr "Napredno"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:502
+#: ../src/pref-manager.c:485
 msgid "Balsa Preferences"
 msgstr "Postavke Balse"
 
-#: ../src/pref-manager.c:555
+#: ../src/pref-manager.c:538
 msgid "Mail options"
 msgstr "Izbori pošte"
 
-#: ../src/pref-manager.c:557
+#: ../src/pref-manager.c:540
 msgid "Display options"
 msgstr "Opcije prikaza"
 
-#: ../src/pref-manager.c:559 ../src/pref-manager.c:2811
+#: ../src/pref-manager.c:542 ../src/pref-manager.c:2794
 msgid "Address books"
 msgstr "Adresari"
 
-#: ../src/pref-manager.c:563 ../src/toolbar-factory.c:166
+#: ../src/pref-manager.c:546 ../src/toolbar-factory.c:164
 msgid "Spelling"
 msgstr "Pravopis"
 
-#: ../src/pref-manager.c:567
-msgid "Startup"
+#: ../src/pref-manager.c:550
+#| msgid "Startup"
+msgid "Start-up"
 msgstr "Pokretanje"
 
-#: ../src/pref-manager.c:569 ../src/pref-manager.c:2601
+#: ../src/pref-manager.c:552 ../src/pref-manager.c:2584
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../src/pref-manager.c:1386
+#: ../src/pref-manager.c:1373
 #, c-format
 msgid "%s (default)"
 msgstr "%s (osnovno)"
 
-#: ../src/pref-manager.c:1652
+#: ../src/pref-manager.c:1637
 msgid "Remote mailbox servers"
 msgstr "Udaljeni serveri za poštu"
 
-#: ../src/pref-manager.c:1673 ../src/pref-manager.c:2832
-#: ../src/sendmsg-window.c:2656
+#: ../src/pref-manager.c:1658 ../src/pref-manager.c:2815
+#: ../src/sendmsg-window.c:2670
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/pref-manager.c:1681
+#: ../src/pref-manager.c:1666
 msgid "Mailbox name"
 msgstr "Naziv sandučeta"
 
-#: ../src/pref-manager.c:1701 ../src/pref-manager.c:1774
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:1686 ../src/pref-manager.c:1758
+#: ../src/pref-manager.c:2858
 msgid "_Modify"
 msgstr "_Izmeni"
 
-#: ../src/pref-manager.c:1715
+#: ../src/pref-manager.c:1700
 msgid "Local mail directory"
 msgstr "Mesni direktorijum pošte"
 
-#: ../src/pref-manager.c:1717
+#: ../src/pref-manager.c:1702
 msgid "Select your local mail directory"
 msgstr "Izaberite vaš mesni direktorijum pošte"
 
-#: ../src/pref-manager.c:1738
+#: ../src/pref-manager.c:1722
 msgid "Outgoing mail servers"
 msgstr "Server odlazne pošte"
 
-#: ../src/pref-manager.c:1760
+#: ../src/pref-manager.c:1744
 msgid "Server name"
 msgstr "Naziv servera"
 
-#: ../src/pref-manager.c:1800
+#: ../src/pref-manager.c:1783
 msgid "Mail servers"
 msgstr "Serveri pošte"
 
-#: ../src/pref-manager.c:1802
+#: ../src/pref-manager.c:1785
 msgid "Incoming"
 msgstr "Dolazna"
 
-#: ../src/pref-manager.c:1804
+#: ../src/pref-manager.c:1787
 msgid "Outgoing"
 msgstr "Odlazna"
 
-#: ../src/pref-manager.c:1831
+#: ../src/pref-manager.c:1814
 msgid "Checking"
 msgstr "Proveravam"
 
-#: ../src/pref-manager.c:1837
+#: ../src/pref-manager.c:1820
 msgid "_Check mail automatically every"
 msgstr "_Proveravaj poštu svakih"
 
-#: ../src/pref-manager.c:1846 ../src/pref-manager.c:2624
-#: ../src/pref-manager.c:2683
+#: ../src/pref-manager.c:1829 ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2666
 msgid "minutes"
 msgstr "minuta"
 
-#: ../src/pref-manager.c:1852
+#: ../src/pref-manager.c:1835
 msgid "Check _IMAP mailboxes"
 msgstr "Proveri _IMAP sandučiće"
 
-#: ../src/pref-manager.c:1857
-msgid "Check INBOX _only"
+#: ../src/pref-manager.c:1840
+#| msgid "Check INBOX _only"
+msgid "Check Inbox _only"
 msgstr "Proveri _samo sanduče „Dolazna“"
 
-#: ../src/pref-manager.c:1863
+#: ../src/pref-manager.c:1846
 msgid "When mail arrives:"
 msgstr "Kada pošta stigne:"
 
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:1851
 msgid "Display message"
 msgstr "Prikaži poruku"
 
-#: ../src/pref-manager.c:1873
+#: ../src/pref-manager.c:1856
 msgid "Play sound"
 msgstr "Pusti zvuk"
 
-#: ../src/pref-manager.c:1878
+#: ../src/pref-manager.c:1861
 msgid "Show icon"
 msgstr "Prikaži ikonicu"
 
-#: ../src/pref-manager.c:1886
+#: ../src/pref-manager.c:1869
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Tiho proveri u pozadini (bez poruka u traci stanja)"
 
-#: ../src/pref-manager.c:1890
+#: ../src/pref-manager.c:1873
 msgid "_POP message size limit:"
 msgstr "Ograničenje veličine _POP poruke:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1916
+#: ../src/pref-manager.c:1899
 msgid "Quoted and flowed text"
 msgstr "Citirani i uključeni tekst"
 
-#: ../src/pref-manager.c:1921
+#: ../src/pref-manager.c:1904
 msgid "Mark quoted text"
 msgstr "Označi citirani tekst"
 
-#: ../src/pref-manager.c:1925
+#: ../src/pref-manager.c:1908
 msgid "Quoted text regular expression:"
 msgstr "Regularni izraz citiranog teksta:"
 
-#: ../src/pref-manager.c:1933
+#: ../src/pref-manager.c:1916
 msgid "Wrap text at"
 msgstr "Prelomi tekst na"
 
-#: ../src/pref-manager.c:1941 ../src/pref-manager.c:2094
+#: ../src/pref-manager.c:1924 ../src/pref-manager.c:2077
 msgid "characters"
 msgstr "znakova"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1956
+#: ../src/pref-manager.c:1939
 msgid "Display of multipart/alternative parts"
 msgstr "Prikaz delova višedelnih poruka"
 
-#: ../src/pref-manager.c:1959
-msgid "Prefer text/plain over html"
-msgstr "Prednost običnog teksta nad html-om"
+#: ../src/pref-manager.c:1942
+#| msgid "Prefer text/plain over html"
+msgid "Prefer text/plain over HTML"
+msgstr "Prednost običnog teksta nad HTML-om"
 
-#: ../src/pref-manager.c:1975
+#: ../src/pref-manager.c:1958
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Nacionalni (8-bitni) znakovi u neispravnim porukama bez oznake kodiranja"
 
-#: ../src/pref-manager.c:1982
-msgid "display as \"?\""
+#: ../src/pref-manager.c:1965
+#| msgid "display as \"?\""
+msgid "display as “?”"
 msgstr "prikaži kao „?“"
 
-#: ../src/pref-manager.c:1990
+#: ../src/pref-manager.c:1973
 msgid "display in codeset"
 msgstr "prikaži u kodnom skupu"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:2017
+#: ../src/pref-manager.c:2000
 msgid "Message disposition notification requests"
 msgstr "Zahtevi za obaveštenje o prispeću poruke"
 
-#: ../src/pref-manager.c:2019
+#: ../src/pref-manager.c:2002
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -4879,231 +5185,235 @@ msgstr ""
 "Kada primim poruku za koju pošiljalac zahteva obaveštenje o dospeću poruke, "
 "pošalji ako:"
 
-#: ../src/pref-manager.c:2031
+#: ../src/pref-manager.c:2014
+#| msgid ""
+#| "The message header looks clean (the notify-to address is the return path, "
+#| "and I am in the \"To:\" or \"Cc:\" list)."
 msgid ""
 "The message header looks clean (the notify-to address is the return path, "
-"and I am in the \"To:\" or \"Cc:\" list)."
+"and I am in the “To:” or “CC:” list)."
 msgstr ""
 "Zaglavlje poruke izgleda čisto (adresa za obaveštavanje je povratna adresa, a "
 "ja sam na spisku primalaca)."
 
-#: ../src/pref-manager.c:2045
+#: ../src/pref-manager.c:2028
 msgid "The message header looks suspicious."
 msgstr "Zaglavlje poruke izgleda sumnjivo."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2062
 msgid "Word wrap"
 msgstr "Prelom reči"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:2067
 msgid "Wrap outgoing text at"
 msgstr "Prelomi tekst na"
 
-#: ../src/pref-manager.c:2107
+#: ../src/pref-manager.c:2090
 msgid "Other options"
 msgstr "Ostali izbori"
 
-#: ../src/pref-manager.c:2112
+#: ../src/pref-manager.c:2095
 msgid "Reply prefix:"
 msgstr "Prefiks odgovora:"
 
-#: ../src/pref-manager.c:2115
+#: ../src/pref-manager.c:2098
 msgid "Automatically quote original when replying"
 msgstr "Sam citiraj izvor pri odgovaranju"
 
-#: ../src/pref-manager.c:2118
+#: ../src/pref-manager.c:2101
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Prosledi poruku kao prilog umesto da je citiraš"
 
-#: ../src/pref-manager.c:2121
+#: ../src/pref-manager.c:2104
 msgid "Copy outgoing messages to sentbox"
 msgstr "Umnoži odlazeće poruke u „Poslato“"
 
-#: ../src/pref-manager.c:2123
+#: ../src/pref-manager.c:2106
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Dugme za slanje uvek smešta poruku u „Odlazno“"
 
-#: ../src/pref-manager.c:2126
+#: ../src/pref-manager.c:2109
 msgid "Edit headers in external editor"
 msgstr "Izmeni zaglavlja u spoljašnjem uređivaču"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2111
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr "Uključi HTML delove kao tekst pri odgovaranju ili prosleđivanju"
 
-#: ../src/pref-manager.c:2145
+#: ../src/pref-manager.c:2128
 msgid "Layout"
 msgstr "Raspored"
 
-#: ../src/pref-manager.c:2147
+#: ../src/pref-manager.c:2130
 msgid "Sort and thread"
 msgstr "Poređaj i utemači"
 
-#: ../src/pref-manager.c:2149 ../src/print-gtk.c:499
+#: ../src/pref-manager.c:2132 ../src/print-gtk.c:497
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/pref-manager.c:2151
+#: ../src/pref-manager.c:2134
 msgid "Colors"
 msgstr "Boje"
 
-#: ../src/pref-manager.c:2153 ../src/pref-manager.c:2240
+#: ../src/pref-manager.c:2136 ../src/pref-manager.c:2223
 msgid "Format"
 msgstr "Oblik"
 
-#: ../src/pref-manager.c:2155
+#: ../src/pref-manager.c:2138
 msgid "Status messages"
 msgstr "Poruke o stanju"
 
-#: ../src/pref-manager.c:2180 ../src/toolbar-prefs.c:173
+#: ../src/pref-manager.c:2163 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Glavni prozor"
 
-#: ../src/pref-manager.c:2183
+#: ../src/pref-manager.c:2166
 msgid "Use preview pane"
 msgstr "Koristi površ za pregled"
 
-#: ../src/pref-manager.c:2185
+#: ../src/pref-manager.c:2168
 msgid "Show mailbox statistics in left pane"
 msgstr "Prikaži statistiku sandučeta na levoj površi"
 
-#: ../src/pref-manager.c:2189
+#: ../src/pref-manager.c:2172
 msgid "Automatically view message when mailbox opened"
 msgstr "Sam prikaži poruku čim se otvori sanduče"
 
-#: ../src/pref-manager.c:2192
+#: ../src/pref-manager.c:2175
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr "Pitaj me pre nego izabereš drugo sanduče za prikaz nepročitane poruke"
 
-#: ../src/pref-manager.c:2198
-msgid "PageUp/PageDown keys scroll text by"
+#: ../src/pref-manager.c:2181
+#| msgid "PageUp/PageDown keys scroll text by"
+msgid "Page Up/Page Down keys scroll text by"
 msgstr "Tasterima „Stranica gore/Stranica dole“ pomeraj tekst za"
 
-#: ../src/pref-manager.c:2206
+#: ../src/pref-manager.c:2189
 msgid "percent"
 msgstr "procenta"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2203
 msgid "Display progress dialog"
 msgstr "Prikaži prozorče napredovanja"
 
-#: ../src/pref-manager.c:2245
+#: ../src/pref-manager.c:2228
 msgid "Date encoding (for strftime):"
 msgstr "Zapis datuma (za „strftime“):"
 
-#: ../src/pref-manager.c:2247
+#: ../src/pref-manager.c:2230
 msgid "Selected headers:"
 msgstr "Izabrana zaglavlja:"
 
-#: ../src/pref-manager.c:2269
+#: ../src/pref-manager.c:2252
 msgid "Information messages"
 msgstr "Poruke obaveštenja"
 
-#: ../src/pref-manager.c:2274
+#: ../src/pref-manager.c:2257
 msgid "Information messages:"
 msgstr "Poruke obaveštenja:"
 
-#: ../src/pref-manager.c:2278
+#: ../src/pref-manager.c:2261
 msgid "Warning messages:"
 msgstr "Poruke upozorenja:"
 
-#: ../src/pref-manager.c:2282
+#: ../src/pref-manager.c:2265
 msgid "Error messages:"
 msgstr "Poruke grešaka:"
 
-#: ../src/pref-manager.c:2286
+#: ../src/pref-manager.c:2269
 msgid "Fatal error messages:"
 msgstr "Poruke kobnih grešaka:"
 
-#: ../src/pref-manager.c:2290
+#: ../src/pref-manager.c:2273
 msgid "Debug messages:"
 msgstr "Poruke o popravljanju:"
 
-#: ../src/pref-manager.c:2315
+#: ../src/pref-manager.c:2298
 msgid "Message colors"
 msgstr "Boje poruka"
 
-#: ../src/pref-manager.c:2321
+#: ../src/pref-manager.c:2304
 #, c-format
 msgid "Quote level %d color"
 msgstr "Boja %d. nivoa citiranja"
 
-#: ../src/pref-manager.c:2334
+#: ../src/pref-manager.c:2317
 msgid "Link color"
 msgstr "Boja veze"
 
-#: ../src/pref-manager.c:2336
+#: ../src/pref-manager.c:2319
 msgid "Hyperlink color"
 msgstr "Boja hiperveze"
 
-#: ../src/pref-manager.c:2422 ../src/print-gtk.c:508
+#: ../src/pref-manager.c:2405 ../src/print-gtk.c:506
 msgid "Fonts"
 msgstr "Slova"
 
-#: ../src/pref-manager.c:2428
+#: ../src/pref-manager.c:2411
 msgid "Use system fonts"
 msgstr "Koristi slovni lik sa sistema"
 
-#: ../src/pref-manager.c:2436
+#: ../src/pref-manager.c:2419
 msgid "Message font:"
 msgstr "Slova poruke:"
 
-#: ../src/pref-manager.c:2443
+#: ../src/pref-manager.c:2426
 msgid "Subject font:"
 msgstr "Slova teme:"
 
-#: ../src/pref-manager.c:2451
+#: ../src/pref-manager.c:2434
 msgid "Use default font size"
 msgstr "Koristi osnovnu veličinu slova"
 
-#: ../src/pref-manager.c:2507
+#: ../src/pref-manager.c:2490
 msgid "Sorting and threading"
 msgstr "Ređanje i temačenje"
 
-#: ../src/pref-manager.c:2511
+#: ../src/pref-manager.c:2494
 msgid "Default sort column:"
 msgstr "Osnovna kolona ređanja:"
 
-#: ../src/pref-manager.c:2515
+#: ../src/pref-manager.c:2498
 msgid "Default threading style:"
 msgstr "Osnovni prikaz niti:"
 
-#: ../src/pref-manager.c:2520
+#: ../src/pref-manager.c:2503
 msgid "Expand threads on open"
 msgstr "Raširi niti prilikom otvaranja"
 
-#: ../src/pref-manager.c:2573
+#: ../src/pref-manager.c:2556
 msgid "Miscellaneous spelling settings"
 msgstr "Razna podešavanja pravopisa"
 
-#: ../src/pref-manager.c:2575
+#: ../src/pref-manager.c:2558
 msgid "Check signature"
 msgstr "Proveri potpis"
 
-#: ../src/pref-manager.c:2576
+#: ../src/pref-manager.c:2559
 msgid "Check quoted"
 msgstr "Proveri citirano"
 
-#: ../src/pref-manager.c:2603
+#: ../src/pref-manager.c:2586
 msgid "Debug"
 msgstr "Popravi"
 
-#: ../src/pref-manager.c:2604
+#: ../src/pref-manager.c:2587
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlasku"
 
-#: ../src/pref-manager.c:2611
+#: ../src/pref-manager.c:2594
 msgid "Close mailbox if unused more than"
 msgstr "Sam zatvori sanduče ako se ne koristi više od"
 
-#: ../src/pref-manager.c:2639
+#: ../src/pref-manager.c:2622
 msgid "Deleting messages"
 msgstr "Brisanje poruka"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2644
+#: ../src/pref-manager.c:2627
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5113,181 +5423,187 @@ msgstr ""
 "upotrebom Mejlboks %s skrivanje poruka:"
 
 # bug: plural-forms
-#: ../src/pref-manager.c:2656
+#: ../src/pref-manager.c:2639
 msgid "Hide messages marked as deleted"
 msgstr "Skrivene poruke označene kao obrisane"
 
-#: ../src/pref-manager.c:2658
+#: ../src/pref-manager.c:2641
 msgid "The following settings are global:"
 msgstr "Sledeća podešavanja su opšta:"
 
-#: ../src/pref-manager.c:2664
+#: ../src/pref-manager.c:2647
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Izbaci obrisane poruke prilikom zatvaranja sandučeta"
 
-#: ../src/pref-manager.c:2671
-msgid "...and if unused more than"
-msgstr "...i ako se ne koristi više od"
+#: ../src/pref-manager.c:2654
+#| msgid "...and if unused more than"
+msgid "…and if unused more than"
+msgstr "…i ako se ne koristi više od"
 
-#: ../src/pref-manager.c:2695 ../src/toolbar-prefs.c:195
+#: ../src/pref-manager.c:2678 ../src/toolbar-prefs.c:192
 msgid "Message window"
 msgstr "Prozor poruke"
 
-#: ../src/pref-manager.c:2700
+#: ../src/pref-manager.c:2683
 msgid "After moving a message:"
 msgstr "Nakon premeštanja poruke:"
 
-#: ../src/pref-manager.c:2726
-msgid "Startup options"
+#: ../src/pref-manager.c:2709
+#| msgid "Startup options"
+msgid "Start-up options"
 msgstr "Opcije pokretanja"
 
-#: ../src/pref-manager.c:2729
-msgid "Open Inbox upon startup"
+#: ../src/pref-manager.c:2712
+#| msgid "Open Inbox upon startup"
+msgid "Open Inbox upon start-up"
 msgstr "Otvori „Dolazno“ pri pokretanju"
 
-#: ../src/pref-manager.c:2731
-msgid "Check mail upon startup"
+#: ../src/pref-manager.c:2714
+#| msgid "Check mail upon startup"
+msgid "Check mail upon start-up"
 msgstr "Proveri poštu pri pokretanju"
 
-#: ../src/pref-manager.c:2733
+#: ../src/pref-manager.c:2716
 msgid "Remember open mailboxes between sessions"
 msgstr "Zapamti otvorene sandučiće između dve sesije"
 
-#: ../src/pref-manager.c:2747
+#: ../src/pref-manager.c:2730
 msgid "Folder scanning"
 msgstr "Pregledanje fascikle"
 
-#: ../src/pref-manager.c:2749
+#: ../src/pref-manager.c:2732
+#| msgid ""
+#| "Choose depth 1 for fast startup; this defers scanning some folders.  To "
+#| "see more of the tree at startup, choose a greater depth."
 msgid ""
-"Choose depth 1 for fast startup; this defers scanning some folders.  To see "
-"more of the tree at startup, choose a greater depth."
+"Choose depth 1 for fast start-up; this defers scanning some folders. To see "
+"more of the tree at start-up, choose a greater depth."
 msgstr ""
 "Izaberite dubinu 1 za brže pokretanje; ovo odlaže pretragu nekih fascikli. Da "
 "vidite više pri pokretanju, izaberite veću dubinu."
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2743
 msgid "Scan local folders to depth"
 msgstr "Pregledaj mesne fascikle do dubine"
 
-#: ../src/pref-manager.c:2772
+#: ../src/pref-manager.c:2755
 msgid "Scan IMAP folders to depth"
 msgstr "Pregledaj IMAP fascikle do dubine"
 
-#: ../src/pref-manager.c:2840
+#: ../src/pref-manager.c:2823
 msgid "Address book name"
 msgstr "Ime adresara"
 
-#: ../src/pref-manager.c:2848
+#: ../src/pref-manager.c:2831
 msgid "Auto-complete"
 msgstr "Sam dovrši"
 
-#: ../src/pref-manager.c:2881
+#: ../src/pref-manager.c:2864
 msgid "_Set as default"
 msgstr "_Postavi kao osnovno"
 
-#: ../src/pref-manager.c:3188
-msgid "Remote POP3 mailbox..."
-msgstr "Udaljeno POP3 sanduče..."
+#: ../src/pref-manager.c:3165
+#| msgid "Remote POP3 mailbox..."
+msgid "Remote POP3 mailbox…"
+msgstr "Udaljeno POP3 sanduče…"
 
-#: ../src/pref-manager.c:3192
-msgid "Remote IMAP mailbox..."
-msgstr "Udaljeno IMAP sanduče..."
+#: ../src/pref-manager.c:3169
+#| msgid "Remote IMAP mailbox..."
+msgid "Remote IMAP mailbox…"
+msgstr "Udaljeno IMAP sanduče…"
 
-#: ../src/pref-manager.c:3196
-msgid "Remote IMAP folder..."
-msgstr "Udaljena IMAP fascikla..."
+#: ../src/pref-manager.c:3173
+#| msgid "Remote IMAP folder"
+msgid "Remote IMAP folder…"
+msgstr "Udaljena fascikla IMAP-a…"
 
-#: ../src/pref-manager.c:3315
+#: ../src/pref-manager.c:3292
 msgid "Show nothing"
 msgstr "ne prikazuj ništa"
 
-#: ../src/pref-manager.c:3317
+#: ../src/pref-manager.c:3294
 msgid "Show dialog"
 msgstr "prikaži prozorče"
 
-#: ../src/pref-manager.c:3319
+#: ../src/pref-manager.c:3296
 msgid "Show in list"
 msgstr "prikaži u spisku"
 
-#: ../src/pref-manager.c:3321
+#: ../src/pref-manager.c:3298
 msgid "Show in status bar"
 msgstr "prikaži na traci stanja"
 
-#: ../src/pref-manager.c:3323
+#: ../src/pref-manager.c:3300
 msgid "Print to console"
 msgstr "ispiši u konzoli"
 
-#: ../src/pref-manager.c:3335
+#: ../src/pref-manager.c:3312
 msgid "Ask me"
 msgstr "pitaj me"
 
-#: ../src/pref-manager.c:3467
+#: ../src/pref-manager.c:3444
 msgid "Default layout"
 msgstr "Osnovni raspored"
 
-#: ../src/pref-manager.c:3468
+#: ../src/pref-manager.c:3445
 msgid "Wide message layout"
 msgstr "Široki prikaz poruke"
 
-#: ../src/pref-manager.c:3469
+#: ../src/pref-manager.c:3446
 msgid "Wide screen layout"
 msgstr "Široki prikaz ekrana"
 
-#: ../src/pref-manager.c:3477
+#: ../src/pref-manager.c:3454
 msgid "Show next unread message"
 msgstr "Prikaži sledeću nepročitanu poruku"
 
-#: ../src/pref-manager.c:3478
+#: ../src/pref-manager.c:3455
 msgid "Show next message"
 msgstr "Prikaži sledeću poruku"
 
-#: ../src/pref-manager.c:3479
+#: ../src/pref-manager.c:3456
 msgid "Close message window"
 msgstr "Zatvori prozor poruke"
 
-#: ../src/pref-manager.c:3532
+#: ../src/pref-manager.c:3509
 #, c-format
 msgid "Error displaying %s: %s\n"
 msgstr "Greška prikazivanja „%s“: %s\n"
 
-#: ../src/print-gtk.c:91 ../src/print-gtk.c:250
+#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../src/print-gtk.c:145 ../src/print-gtk.c:171
+#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
 msgid "Signed and encrypted matter"
 msgstr "Potpisana i šifrovana sadržina"
 
-#: ../src/print-gtk.c:149 ../src/print-gtk.c:175
+#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
 msgid "Signed matter"
 msgstr "Potpisana sadržina"
 
-#: ../src/print-gtk.c:156
+#: ../src/print-gtk.c:154
 msgid "Encrypted matter"
 msgstr "Šifrovana sadržina"
 
-#: ../src/print-gtk.c:199
+#: ../src/print-gtk.c:197
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr "Ovo je neposredno %s potpisani %s deo poruke:"
 
-#: ../src/print-gtk.c:201
+#: ../src/print-gtk.c:199
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: ../src/print-gtk.c:354
+#: ../src/print-gtk.c:352
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
-msgstr[0] ""
-"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranicu."
-msgstr[1] ""
-"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranice."
-msgstr[2] ""
-"Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranica."
-msgstr[3] ""
-"Ne mogu da štampam %d. stranicu zato što dokument ima samo jednu stranicu."
+msgstr[0] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranicu."
+msgstr[1] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranice."
+msgstr[2] "Ne mogu da štampam %d. stranicu zato što dokument ima samo %d stranica."
+msgstr[3] "Ne mogu da štampam %d. stranicu zato što dokument ima samo jednu stranicu."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -5295,72 +5611,72 @@ msgstr[3] ""
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:392
+#: ../src/print-gtk.c:390
 msgid "default:mm"
 msgstr "default:mm"
 
-#: ../src/print-gtk.c:448
+#: ../src/print-gtk.c:446
 msgid "inch"
 msgstr "inč"
 
-#: ../src/print-gtk.c:455
+#: ../src/print-gtk.c:453
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:529
+#: ../src/print-gtk.c:527
 msgid "_Header Font:"
 msgstr "Slova _zaglavlja:"
 
-#: ../src/print-gtk.c:532
+#: ../src/print-gtk.c:530
 msgid "B_ody Font:"
 msgstr "Slova _sadržaja:"
 
-#: ../src/print-gtk.c:535
+#: ../src/print-gtk.c:533
 msgid "_Footer Font:"
 msgstr "Slova _podnožja:"
 
-#: ../src/print-gtk.c:542
+#: ../src/print-gtk.c:540
 msgid "Highlighting"
 msgstr "Isticanje"
 
-#: ../src/print-gtk.c:557
+#: ../src/print-gtk.c:555
 msgid "Highlight _cited text"
 msgstr "Istakni _citirani tekst"
 
-#: ../src/print-gtk.c:566
+#: ../src/print-gtk.c:564
 msgid "Highlight _structured phrases"
 msgstr "Istakni _sređene izraze"
 
-#: ../src/print-gtk.c:577
+#: ../src/print-gtk.c:575
 msgid "Margins"
 msgstr "Ivice"
 
-#: ../src/print-gtk.c:599
+#: ../src/print-gtk.c:597
 msgid "_Top"
 msgstr "_Gore"
 
-#: ../src/print-gtk.c:605
+#: ../src/print-gtk.c:603
 msgid "_Bottom"
 msgstr "_Dole"
 
-#: ../src/print-gtk.c:617
+#: ../src/print-gtk.c:615
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../src/print-gtk.c:623
+#: ../src/print-gtk.c:621
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../src/print-gtk.c:749
+#: ../src/print-gtk.c:747
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Greška štampanja poruke: %s"
 
-#: ../src/save-restore.c:594
+#: ../src/save-restore.c:587
 msgid "Error during filters loading: "
 msgstr "Greška pri učitavanju filtera: "
 
-#: ../src/save-restore.c:596
+#: ../src/save-restore.c:589
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -5369,28 +5685,35 @@ msgstr ""
 "Greška pri učitavanju filtera: %s\n"
 "Propusnici su možda neispravni."
 
-#: ../src/save-restore.c:717
-msgid "The option not to recognize \"format=flowed\" text has been removed."
+#: ../src/save-restore.c:710
+#| msgid "The option not to recognize \"format=flowed\" text has been removed."
+msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr "Izbor kojim se zanemaruju polja „format=flowed“ je uklonjen."
 
-#: ../src/save-restore.c:996
+#: ../src/save-restore.c:986
+#| msgid ""
+#| "The option not to send \"format=flowed\" text is now on the Options menu "
+#| "of the compose window."
 msgid ""
-"The option not to send \"format=flowed\" text is now on the Options menu of "
+"The option not to send “format=flowed” text is now on the Options menu of "
 "the compose window."
 msgstr ""
 "Izbor kojim se ne šalje „format=flowed“ tekst se sada nalazi u izborniku "
 "Izbori prozora za pisanje poruka."
 
-#: ../src/save-restore.c:1028
+#: ../src/save-restore.c:1018
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Izbor za zahtevanje obaveštenja se sada nalazi u izborniku Izbori prozora za "
 "pisanje poruka."
 
-#: ../src/save-restore.c:1105
+#: ../src/save-restore.c:1095
+#| msgid ""
+#| "This version of Balsa uses a new user interface; if you have changed "
+#| "Balsa's keyboard accelerators, you will need to set them again."
 msgid ""
-"This version of Balsa uses a new user interface; if you have changed Balsa's "
+"This version of Balsa uses a new user interface; if you have changed Balsa’s "
 "keyboard accelerators, you will need to set them again."
 msgstr ""
 "Ovo izdanje Balse koristi novo korisničko sučelje; ako ste izmenili Balsine "
@@ -5508,7 +5831,6 @@ msgid "_Polish"
 msgstr "_poljski"
 
 #: ../src/sendmsg-window.c:211
-#| msgid "_Portugese"
 msgid "_Portuguese"
 msgstr "_portugalski"
 
@@ -5574,8 +5896,11 @@ msgstr "(Bez imena)"
 
 #: ../src/sendmsg-window.c:524
 #, c-format
+#| msgid ""
+#| "The message to '%s' is modified.\n"
+#| "Save message to Draftbox?"
 msgid ""
-"The message to '%s' is modified.\n"
+"The message to “%s” is modified.\n"
 "Save message to Draftbox?"
 msgstr ""
 "Poruka za „%s“ je izmenjena.\n"
@@ -5589,12 +5914,18 @@ msgstr "Gnomov uređivač teksta nije određen u vašim željenim programima."
 msgid "Select Identity"
 msgstr "Izaberi ličnost"
 
-#: ../src/sendmsg-window.c:1403
+#: ../src/sendmsg-window.c:1407
 #, c-format
+#| msgid ""
+#| "Saying yes will not send the file `%s' itself, but just a MIME message/"
+#| "external-body reference.  Note that the recipient must have proper "
+#| "permissions to see the `real' file.\n"
+#| "\n"
+#| "Do you really want to attach this file as reference?"
 msgid ""
-"Saying yes will not send the file `%s' itself, but just a MIME message/"
-"external-body reference.  Note that the recipient must have proper "
-"permissions to see the `real' file.\n"
+"Saying yes will not send the file “%s” itself, but just a MIME message/"
+"external-body reference. Note that the recipient must have proper "
+"permissions to see the “real” file.\n"
 "\n"
 "Do you really want to attach this file as reference?"
 msgstr ""
@@ -5604,76 +5935,85 @@ msgstr ""
 "\n"
 "Da li zaista želite da priložite ovu datoteku kao pozivanje?"
 
-#: ../src/sendmsg-window.c:1416
+#: ../src/sendmsg-window.c:1420
 msgid "Attach as Reference?"
 msgstr "Priloži kao pozivanje?"
 
-#: ../src/sendmsg-window.c:1537
-msgid "Choose charset"
+#: ../src/sendmsg-window.c:1541
+#| msgid "Choose charset"
+msgid "Choose character set"
 msgstr "Izaberite skup znakova"
 
-#: ../src/sendmsg-window.c:1545
+#: ../src/sendmsg-window.c:1549
 #, c-format
+#| msgid ""
+#| "File\n"
+#| "%s\n"
+#| "is not encoded in US-ASCII or UTF-8.\n"
+#| "Please choose the charset used to encode the file."
 msgid ""
 "File\n"
 "%s\n"
 "is not encoded in US-ASCII or UTF-8.\n"
-"Please choose the charset used to encode the file."
+"Please choose the character set used to encode the file."
 msgstr ""
 "Datoteka\n"
 "%s\n"
 "nije kodirana u US-ASKRI ili UTF-8.\n"
 "Molim izaberite skup znakova kojim je kodirana ova datoteka."
 
-#: ../src/sendmsg-window.c:1565
+#: ../src/sendmsg-window.c:1569
 msgid "Attach as MIME type:"
 msgstr "Priloži kao MIME vrstu:"
 
-#: ../src/sendmsg-window.c:1626
+#: ../src/sendmsg-window.c:1630
 #, c-format
-msgid "Character set for file %s changed from \"%s\" to \"%s\"."
+#| msgid "Character set for file %s changed from \"%s\" to \"%s\"."
+msgid "Character set for file %s changed from “%s” to “%s”."
 msgstr "Skup znakova za datoteku „%s“ je izmenjen iz „%s“ u „%s“."
 
-#: ../src/sendmsg-window.c:1669 ../src/sendmsg-window.c:5014
+#: ../src/sendmsg-window.c:1673 ../src/sendmsg-window.c:5027
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
-#: ../src/sendmsg-window.c:1707
+#: ../src/sendmsg-window.c:1711
 #, c-format
 msgid "Cannot create file URI object for %s"
 msgstr "Ne mogu da napravim predmet putanje datoteke za %s"
 
-#: ../src/sendmsg-window.c:1715
+#: ../src/sendmsg-window.c:1719
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../src/sendmsg-window.c:1755
+#: ../src/sendmsg-window.c:1759
 msgid "forwarded message"
 msgstr "prosleđena poruka"
 
-#: ../src/sendmsg-window.c:1760
+#: ../src/sendmsg-window.c:1764
 #, c-format
-msgid "Message from %s, subject: \"%s\""
+#| msgid "Message from %s, subject: \"%s\""
+msgid "Message from %s, subject: “%s”"
 msgstr "Poruku šalje %s, tema: „%s“"
 
-#: ../src/sendmsg-window.c:1838 ../src/sendmsg-window.c:1911
+#: ../src/sendmsg-window.c:1842 ../src/sendmsg-window.c:1915
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/sendmsg-window.c:1923
-msgid "Open..."
-msgstr "Otvori..."
+#: ../src/sendmsg-window.c:1927
+#| msgid "_Open"
+msgid "Open…"
+msgstr "Otvori…"
 
-#: ../src/sendmsg-window.c:1935
+#: ../src/sendmsg-window.c:1939
 msgid "(URL)"
 msgstr "(Adresa)"
 
-#: ../src/sendmsg-window.c:1991
+#: ../src/sendmsg-window.c:1995
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-#: ../src/sendmsg-window.c:2104 ../src/sendmsg-window.c:2207
-#: ../src/sendmsg-window.c:6855
+#: ../src/sendmsg-window.c:2108 ../src/sendmsg-window.c:2211
+#: ../src/sendmsg-window.c:6857
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -5681,150 +6021,158 @@ msgstr ""
 "Neuspešno uključivanje poruke.\n"
 "Mogući razlog: nedovoljno prostora za privremeni smeštaj"
 
-#: ../src/sendmsg-window.c:2428
+#: ../src/sendmsg-window.c:2430
 msgid "F_rom:"
 msgstr "_Šalje:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2565
+#: ../src/sendmsg-window.c:2580
 msgid "S_ubject:"
 msgstr "_Tema:"
 
-#: ../src/sendmsg-window.c:2592
-msgid "F_cc:"
-msgstr "U _datoteku:"
+#: ../src/sendmsg-window.c:2607
+msgid "F_CC:"
+msgstr "F_CC:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2618
+#: ../src/sendmsg-window.c:2633
 msgid "_Attachments:"
 msgstr "_Prilozi:"
 
-#: ../src/sendmsg-window.c:2663
+#: ../src/sendmsg-window.c:2677
 msgid "Mode"
 msgstr "Način"
 
-#: ../src/sendmsg-window.c:3010
+#: ../src/sendmsg-window.c:3023
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Ne mogu da sačuvam prilog: %s"
 
-#: ../src/sendmsg-window.c:3034
+#: ../src/sendmsg-window.c:3047
 msgid "No subject"
 msgstr "Bez teme"
 
-#: ../src/sendmsg-window.c:3068
+#: ../src/sendmsg-window.c:3081
 #, c-format
-msgid "inlined file \"%s\" (%s)"
+#| msgid "inlined file \"%s\" (%s)"
+msgid "inlined file “%s” (%s)"
 msgstr "neposredna datoteka „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3071
+#: ../src/sendmsg-window.c:3084
 #, c-format
-msgid "attached file \"%s\" (%s)"
+#| msgid "attached file \"%s\" (%s)"
+msgid "attached file “%s” (%s)"
 msgstr "priložena datoteka „%s“ (%s)"
 
-#: ../src/sendmsg-window.c:3075
+#: ../src/sendmsg-window.c:3088
 #, c-format
 msgid "inlined %s part"
 msgstr "neposredan %s deo"
 
-#: ../src/sendmsg-window.c:3077
+#: ../src/sendmsg-window.c:3090
 #, c-format
 msgid "attached %s part"
 msgstr "priložen %s deo"
 
-#: ../src/sendmsg-window.c:3145
+#: ../src/sendmsg-window.c:3158
 #, c-format
-msgid "message from %s, subject \"%s\""
+#| msgid "message from %s, subject \"%s\""
+msgid "message from %s, subject “%s”"
 msgstr "poruku šalje %s, tema „%s“"
 
-#: ../src/sendmsg-window.c:3272
+#: ../src/sendmsg-window.c:3285
 msgid "quoted"
 msgstr "citirano"
 
-#: ../src/sendmsg-window.c:3277 ../src/sendmsg-window.c:3280
+#: ../src/sendmsg-window.c:3290 ../src/sendmsg-window.c:3293
 msgid "quoted attachment"
 msgstr "citirani prilog"
 
-#: ../src/sendmsg-window.c:3306
+#: ../src/sendmsg-window.c:3319
 msgid "Select parts for quotation"
 msgstr "Izaberi delove za citiranje"
 
-#: ../src/sendmsg-window.c:3317
+#: ../src/sendmsg-window.c:3330
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Izaberite delove poruke koji će biti citirani u odgovoru"
 
-#: ../src/sendmsg-window.c:3470
+#: ../src/sendmsg-window.c:3483
 msgid "you"
 msgstr "vi"
 
-#: ../src/sendmsg-window.c:3479
+#: ../src/sendmsg-window.c:3492
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------prosleđena poruka koju šalje %s------\n"
 
-#: ../src/sendmsg-window.c:3516
+#: ../src/sendmsg-window.c:3529
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "IB poruke: %s\n"
 
-#: ../src/sendmsg-window.c:3522
+#: ../src/sendmsg-window.c:3535
 msgid "References:"
 msgstr "Pozivanja:"
 
-#: ../src/sendmsg-window.c:3533
+#: ../src/sendmsg-window.c:3546
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Dana %s, %s je napisao:\n"
 
-#: ../src/sendmsg-window.c:3535
+#: ../src/sendmsg-window.c:3548
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s je napisao:\n"
 
-#: ../src/sendmsg-window.c:3648
+#: ../src/sendmsg-window.c:3661
 msgid "No signature found!"
 msgstr "Nisam pronašao potpis!"
 
-#: ../src/sendmsg-window.c:3789
+#: ../src/sendmsg-window.c:3802
 msgid "Could not save message."
 msgstr "Ne mogu da sačuvam poruku."
 
-#: ../src/sendmsg-window.c:3796
+#: ../src/sendmsg-window.c:3809
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Ne mogu da otvorim skice: %s"
 
-#: ../src/sendmsg-window.c:3821
+#: ../src/sendmsg-window.c:3834
 msgid "Message saved."
 msgstr "Poruka je sačuvana."
 
-#: ../src/sendmsg-window.c:4445 ../src/sendmsg-window.c:4453
-#: ../src/sendmsg-window.c:4460 ../src/sendmsg-window.c:4467
-#: ../src/sendmsg-window.c:4491
+#: ../src/sendmsg-window.c:4458 ../src/sendmsg-window.c:4466
+#: ../src/sendmsg-window.c:4473 ../src/sendmsg-window.c:4480
+#: ../src/sendmsg-window.c:4504
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Ne mogu da priložim datoteku „%s“: %s."
 
-#: ../src/sendmsg-window.c:4446
+#: ../src/sendmsg-window.c:4459
 msgid "not an absolute path"
 msgstr "nije apsolutna putanja"
 
-#: ../src/sendmsg-window.c:4454
+#: ../src/sendmsg-window.c:4467
 msgid "not in your directory"
 msgstr "nije u vašem direktorijumu"
 
-#: ../src/sendmsg-window.c:4461
+#: ../src/sendmsg-window.c:4474
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: ../src/sendmsg-window.c:4492
+#: ../src/sendmsg-window.c:4505
 msgid "not in current directory"
 msgstr "nije u tekućem direktorijumu"
 
-#: ../src/sendmsg-window.c:4542
+#: ../src/sendmsg-window.c:4555
+#| msgid ""
+#| "The link that you selected created\n"
+#| "a \"Blind copy\" (Bcc) address.\n"
+#| "Please check that the address\n"
+#| "is appropriate."
 msgid ""
 "The link that you selected created\n"
-"a \"Blind copy\" (Bcc) address.\n"
+"a “Blind copy” (BCC) address.\n"
 "Please check that the address\n"
 "is appropriate."
 msgstr ""
@@ -5833,45 +6181,44 @@ msgstr ""
 "Molim proverite da li je adresa\n"
 "odgovarajuća."
 
-#: ../src/sendmsg-window.c:4624
+#: ../src/sendmsg-window.c:4637
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "Ne mogu da otvorim datoteku %s.\n"
 
-#: ../src/sendmsg-window.c:4675
+#: ../src/sendmsg-window.c:4688
 msgid "Include file"
 msgstr "Uključi datoteku"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4860
+#: ../src/sendmsg-window.c:4873
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Ne mogu da učitam sličicu zaglavlja „%s“: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4863
+#: ../src/sendmsg-window.c:4876
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Ne mogu da učitam H-sličicu zaglavlja „%s“: %s"
 
-#: ../src/sendmsg-window.c:4971
-#| msgid "No subject"
+#: ../src/sendmsg-window.c:4984
 msgid "No Subject"
 msgstr "Nema teme"
 
-#: ../src/sendmsg-window.c:4976
+#: ../src/sendmsg-window.c:4989
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: ../src/sendmsg-window.c:4997
+#: ../src/sendmsg-window.c:5010
 msgid "You did not specify a subject for this message"
 msgstr "Niste naveli temu za ovu poruku"
 
-#: ../src/sendmsg-window.c:4998
+#: ../src/sendmsg-window.c:5011
 msgid "If you would like to provide one, enter it below."
 msgstr "Ako želite, upišite je ispod."
 
-#: ../src/sendmsg-window.c:5091
+#: ../src/sendmsg-window.c:5104
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -5882,19 +6229,19 @@ msgstr ""
 "svim primaocima. Da biste zaštitili vašu privatnost, poruka bi mogla biti "
 "„%s“ šifrovana."
 
-#: ../src/sendmsg-window.c:5113
+#: ../src/sendmsg-window.c:5126
 msgid "Send _encrypted"
 msgstr "Pošalji _šifrovanu"
 
-#: ../src/sendmsg-window.c:5128
+#: ../src/sendmsg-window.c:5141
 msgid "Send _unencrypted"
 msgstr "Pošalji _nešifrovanu"
 
-#: ../src/sendmsg-window.c:5188
+#: ../src/sendmsg-window.c:5201
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Izabrali ste OpenPGP bezbednost za ovu poruku.\n"
 
-#: ../src/sendmsg-window.c:5193
+#: ../src/sendmsg-window.c:5206
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -5902,12 +6249,12 @@ msgstr ""
 "Tekst poruke će biti poslat i kao običan tekst i ako HTML, sali samo običan "
 "tekst može biti potpisan.\n"
 
-#: ../src/sendmsg-window.c:5198
+#: ../src/sendmsg-window.c:5211
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "Poruka sadrži priloge, koji ne mogu biti potpisani ili šifrovani.\n"
 
-#: ../src/sendmsg-window.c:5202
+#: ../src/sendmsg-window.c:5215
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -5915,36 +6262,37 @@ msgstr ""
 "Treba da izaberete MIME režim ako čitava poruka treba da bude šifrovana. Da "
 "li zaista želite da nastavite?"
 
-#: ../src/sendmsg-window.c:5227
+#: ../src/sendmsg-window.c:5240
 #, c-format
-msgid "sending message with gpg mode %d"
-msgstr "šaljem poruku u gpg režimu %d"
+#| msgid "sending message with gpg mode %d"
+msgid "sending message with GPG mode %d"
+msgstr "šaljem poruku u GPG režimu %d"
 
-#: ../src/sendmsg-window.c:5266
+#: ../src/sendmsg-window.c:5268
 msgid "Message could not be created"
 msgstr "Ne mogu da napravim poruku"
 
-#: ../src/sendmsg-window.c:5268
+#: ../src/sendmsg-window.c:5270
 msgid "Message could not be queued in outbox"
 msgstr "Poruka ne može biti stavljena u red u odlaznom"
 
-#: ../src/sendmsg-window.c:5270
+#: ../src/sendmsg-window.c:5272
 msgid "Message could not be saved in sentbox"
 msgstr "Poruka ne može biti sačuvana u poslatom"
 
-#: ../src/sendmsg-window.c:5272
+#: ../src/sendmsg-window.c:5274
 msgid "Message could not be sent"
 msgstr "Ne mogu da pošaljem poruku"
 
-#: ../src/sendmsg-window.c:5275
+#: ../src/sendmsg-window.c:5277
 msgid "Message could not be signed"
 msgstr "Ne mogu da potpišem poruku"
 
-#: ../src/sendmsg-window.c:5277
+#: ../src/sendmsg-window.c:5279
 msgid "Message could not be encrypted"
 msgstr "Ne mogu da šifrujem poruku"
 
-#: ../src/sendmsg-window.c:5283
+#: ../src/sendmsg-window.c:5285
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -5953,186 +6301,184 @@ msgstr ""
 "Nisam uspeo da pošaljem: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5288
+#: ../src/sendmsg-window.c:5290
 #, c-format
 msgid "Send failed: %s"
 msgstr "Nisam uspeo da pošaljem: %s"
 
-#: ../src/sendmsg-window.c:5387
+#: ../src/sendmsg-window.c:5389
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Ne mogu da odložim poruku: %s"
 
-#: ../src/sendmsg-window.c:5408
+#: ../src/sendmsg-window.c:5410
 msgid "Message postponed."
 msgstr "Poruka je odložena."
 
-#: ../src/sendmsg-window.c:5413
+#: ../src/sendmsg-window.c:5415
 msgid "Could not postpone message."
 msgstr "Ne mogu da odložim poruku."
 
-#: ../src/sendmsg-window.c:5625
+#: ../src/sendmsg-window.c:5627
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Greška pokretanja provere pravopisa: %s"
 
-#: ../src/sendmsg-window.c:6376
+#: ../src/sendmsg-window.c:6378
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Odgovor za %s: %s"
 
-#: ../src/sendmsg-window.c:6381
+#: ../src/sendmsg-window.c:6383
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Prosledi poruku za %s: %s"
 
-#: ../src/sendmsg-window.c:6385
+#: ../src/sendmsg-window.c:6387
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Nova poruka za %s: %s"
 
-#: ../src/sendmsg-window.c:6555
+#: ../src/sendmsg-window.c:6557
 msgid "_Language"
 msgstr "_Jezik"
 
-#: ../src/spell-check.c:213
+#: ../src/spell-check.c:211
 msgid "Spell check"
 msgstr "Pravopis"
 
-#: ../src/spell-check.c:341
+#: ../src/spell-check.c:339
 msgid "C_hange"
 msgstr "_Izmeni"
 
-#: ../src/spell-check.c:343
+#: ../src/spell-check.c:341
 msgid "Replace the current word with the selected suggestion"
 msgstr "Zamenite tekuću reč izabranim predlogom"
 
-#: ../src/spell-check.c:349
+#: ../src/spell-check.c:347
 msgid "Change _All"
 msgstr "Izmeni _sve"
 
-#: ../src/spell-check.c:351
+#: ../src/spell-check.c:349
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Zamenite sve pojave tekuće reči izabranim predlogom"
 
-#: ../src/spell-check.c:357
+#: ../src/spell-check.c:355
 msgid "_Ignore"
 msgstr "_Zanemari"
 
-#: ../src/spell-check.c:359
+#: ../src/spell-check.c:357
 msgid "Skip the current word"
 msgstr "Preskočite tekuću reč"
 
-#: ../src/spell-check.c:364
+#: ../src/spell-check.c:362
 msgid "I_gnore All"
 msgstr "Zanemari _sve"
 
-#: ../src/spell-check.c:366
+#: ../src/spell-check.c:364
 msgid "Skip all occurrences of the current word"
 msgstr "Preskočite sve pojave tekuće reči"
 
-#: ../src/spell-check.c:371
+#: ../src/spell-check.c:369
 msgid "_Learn"
 msgstr "_Nauči"
 
-#: ../src/spell-check.c:373
+#: ../src/spell-check.c:371
 msgid "Add the current word to your personal dictionary"
 msgstr "Dodajte tekuću reč u lični rečnik"
 
-#: ../src/spell-check.c:378
+#: ../src/spell-check.c:376
 msgid "_Done"
 msgstr "_Urađeno"
 
-#: ../src/spell-check.c:379
+#: ../src/spell-check.c:377
 msgid "Finish spell checking"
 msgstr "Završite proveru pravopisa"
 
-#: ../src/spell-check.c:386
+#: ../src/spell-check.c:384
 msgid "Revert all changes and finish spell checking"
 msgstr "Vratite sve izmene i završite proveru pravopisa"
 
-#: ../src/spell-check.c:1030
+#: ../src/spell-check.c:1028
 #, c-format
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr "Balsina provera pisanja: Greška „enchant“-a: %s\n"
 
-#: ../src/store-address.c:106
+#: ../src/store-address.c:104
 msgid "Store address: no addresses"
 msgstr "Skladištenje adrese: nema adresa"
 
-#: ../src/store-address.c:206
+#: ../src/store-address.c:204
 msgid "Store Address"
 msgstr "Skladišti adresu"
 
-#: ../src/store-address.c:248
-msgid "No address book selected...."
-msgstr "Nije izabran adresar..."
+#: ../src/store-address.c:246
+#| msgid "No address book selected...."
+msgid "No address book selected…"
+msgstr "Nije izabran adresar…"
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:259
 msgid "Address could not be written to this address book."
 msgstr "Ne mogu da upišem adresu u ovaj adresar."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:262
 msgid "Address book could not be accessed."
 msgstr "Ne mogu da pristupim adresaru."
 
-#: ../src/store-address.c:266
+#: ../src/store-address.c:264
 msgid "This mail address is already in this address book."
 msgstr "Ova adresa je već navedena u adresaru."
 
-#: ../src/store-address.c:269
+#: ../src/store-address.c:267
 msgid "Unexpected address book error. Report it."
 msgstr "Neočekivana greška u adresaru. Molim prijavite je."
 
-#: ../src/store-address.c:292
-#| msgid "Address Book"
+#: ../src/store-address.c:290
 msgid "Address Book:"
 msgstr "Adresar:"
 
-#: ../src/store-address.c:338
-#| msgid "From:"
+#: ../src/store-address.c:336
 msgid "From: "
 msgstr "Šalje: "
 
-#: ../src/store-address.c:339
+#: ../src/store-address.c:337
 msgid "To: "
 msgstr "Prima: "
 
-#: ../src/store-address.c:340
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/store-address.c:338
+msgid "CC: "
+msgstr "CC: "
 
-#: ../src/store-address.c:341
-#| msgid "Bcc:"
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/store-address.c:339
+msgid "BCC: "
+msgstr "BCC: "
 
-#: ../src/toolbar-factory.c:142
+#: ../src/toolbar-factory.c:140
 msgid "Separator"
 msgstr "Razdvajač"
 
-#: ../src/toolbar-factory.c:143
+#: ../src/toolbar-factory.c:141
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:142
 msgid "Check"
 msgstr "Proveri"
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:143
 msgid "Compose"
 msgstr "Nova"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:144
 msgid "Continue"
 msgstr "Nastavi"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:145
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Reply\n"
 "to all"
@@ -6140,7 +6486,7 @@ msgstr ""
 "Odgov.\n"
 "svima"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Reply\n"
 "to group"
@@ -6148,11 +6494,11 @@ msgstr ""
 "Odgov.\n"
 "grupi"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:148
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:151
 msgid ""
 "Next\n"
 "unread"
@@ -6160,7 +6506,7 @@ msgstr ""
 "Sledeća\n"
 "nepročit."
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:152
 msgid ""
 "Next\n"
 "flagged"
@@ -6168,7 +6514,7 @@ msgstr ""
 "Sledeća\n"
 "označena"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:153
 msgid ""
 "Previous\n"
 "part"
@@ -6176,7 +6522,7 @@ msgstr ""
 "Prethodni\n"
 "deo"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:154
 msgid ""
 "Next\n"
 "part"
@@ -6184,7 +6530,7 @@ msgstr ""
 "Sledeći\n"
 "deo"
 
-#: ../src/toolbar-factory.c:157
+#: ../src/toolbar-factory.c:155
 msgid ""
 "Trash /\n"
 "Delete"
@@ -6192,15 +6538,15 @@ msgstr ""
 "U smeće /\n"
 "Obriši"
 
-#: ../src/toolbar-factory.c:158
+#: ../src/toolbar-factory.c:156
 msgid "Postpone"
 msgstr "Odloži"
 
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:157
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:158
 msgid ""
 "Request\n"
 "MDN"
@@ -6208,31 +6554,31 @@ msgstr ""
 "Zatevaj\n"
 "MDN"
 
-#: ../src/toolbar-factory.c:161
+#: ../src/toolbar-factory.c:159
 msgid "Send"
 msgstr "Pošalji"
 
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:160
 msgid "Exchange"
 msgstr "Razmeni"
 
-#: ../src/toolbar-factory.c:163
+#: ../src/toolbar-factory.c:161
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../src/toolbar-factory.c:164
+#: ../src/toolbar-factory.c:162
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:163
 msgid "Identity"
 msgstr "Ličnost"
 
-#: ../src/toolbar-factory.c:167
+#: ../src/toolbar-factory.c:165
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:166
 msgid ""
 "Toggle\n"
 "new"
@@ -6240,11 +6586,11 @@ msgstr ""
 "Izmeni\n"
 "novu"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:167
 msgid "Mark all"
 msgstr "Obeleži sve"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:168
 msgid ""
 "All\n"
 "headers"
@@ -6252,7 +6598,7 @@ msgstr ""
 "Sva\n"
 "zaglavlja"
 
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:169
 msgid ""
 "Reset\n"
 "Filter"
@@ -6260,31 +6606,32 @@ msgstr ""
 "Očisti\n"
 "filter"
 
-#: ../src/toolbar-factory.c:172
-msgid "Msg Preview"
+#: ../src/toolbar-factory.c:170
+#| msgid "Msg Preview"
+msgid "Message Preview"
 msgstr "Pregled poruke"
 
-#: ../src/toolbar-factory.c:174
+#: ../src/toolbar-factory.c:172
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../src/toolbar-factory.c:175
+#: ../src/toolbar-factory.c:173
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../src/toolbar-factory.c:177
+#: ../src/toolbar-factory.c:175
 msgid "Undo"
 msgstr "Opozovi"
 
-#: ../src/toolbar-factory.c:178
+#: ../src/toolbar-factory.c:176
 msgid "Redo"
 msgstr "Ponovi"
 
-#: ../src/toolbar-factory.c:179
+#: ../src/toolbar-factory.c:177
 msgid "Expunge"
 msgstr "Izbaci"
 
-#: ../src/toolbar-factory.c:180
+#: ../src/toolbar-factory.c:178
 msgid ""
 "Empty\n"
 "Trash"
@@ -6292,110 +6639,250 @@ msgstr ""
 "Isprazni\n"
 "smeće"
 
-#: ../src/toolbar-factory.c:181
+#: ../src/toolbar-factory.c:179
 msgid "Edit"
 msgstr "Izmeni"
 
-#: ../src/toolbar-factory.c:194
+#: ../src/toolbar-factory.c:192
 msgid "Queue"
 msgstr "Zakaži"
 
-#: ../src/toolbar-factory.c:407
+#: ../src/toolbar-factory.c:405
 #, c-format
-msgid "Unknown toolbar icon \"%s\""
+#| msgid "Unknown toolbar icon \"%s\""
+msgid "Unknown toolbar icon “%s”"
 msgstr "Nepoznata ikonica za alatku „%s“"
 
-#: ../src/toolbar-factory.c:484
+#: ../src/toolbar-factory.c:482
 msgid "Queue this message for sending"
 msgstr "Smesti ovu poruku za slanje"
 
-#: ../src/toolbar-factory.c:496
+#: ../src/toolbar-factory.c:494
 msgid "Text Be_low Icons"
 msgstr "Tekst _ispod ikonica"
 
-#: ../src/toolbar-factory.c:497
+#: ../src/toolbar-factory.c:495
 msgid "Priority Text Be_side Icons"
 msgstr "Tekst _pored ikona prema važnosti"
 
-#: ../src/toolbar-factory.c:499
+#: ../src/toolbar-factory.c:497
 msgid "_Icons Only"
 msgstr "_Samo ikonice"
 
-#: ../src/toolbar-factory.c:500
+#: ../src/toolbar-factory.c:498
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../src/toolbar-factory.c:758
+#: ../src/toolbar-factory.c:760
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Koristi osnovno _okruženja (%s)"
 
-#: ../src/toolbar-factory.c:784
-msgid "_Customize Toolbars..."
-msgstr "_Prilagodi osnovne alatke..."
+#: ../src/toolbar-factory.c:786
+#| msgid "Customize Toolbars"
+msgid "_Customize Toolbars…"
+msgstr "_Prilagodite osnovne alatke…"
 
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
 msgid "Customize Toolbars"
 msgstr "Prilagodite osnovne alatke"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:181
 msgid "Compose window"
 msgstr "Prozor za pisanje"
 
-#: ../src/toolbar-prefs.c:197
+#: ../src/toolbar-prefs.c:194
 msgid "Toolbar options"
 msgstr "Izbori alatki"
 
-#: ../src/toolbar-prefs.c:206
+#: ../src/toolbar-prefs.c:203
 msgid "_Wrap button labels"
 msgstr "_Prelomi oznake dugmića"
 
-#: ../src/toolbar-prefs.c:382
+#: ../src/toolbar-prefs.c:379
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
 msgstr "Došlo je do greške prilikom prikazivanja pomoći za alatke: %s\n"
 
 #. Preview display
-#: ../src/toolbar-prefs.c:418
+#: ../src/toolbar-prefs.c:415
 msgid "Preview"
 msgstr "Pregled"
 
-#: ../src/toolbar-prefs.c:453
+#: ../src/toolbar-prefs.c:445
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Vrati podrazumevane alatke na paletu"
 
 #. Style button
-#: ../src/toolbar-prefs.c:457
-msgid "Toolbar _style..."
-msgstr "Izgled palete _alata..."
+#: ../src/toolbar-prefs.c:449
+#| msgid "Toolbar _style..."
+msgid "Toolbar _style…"
+msgstr "Izgled palete _alata…"
 
-#: ../src/toolbar-prefs.c:474
+#: ../src/toolbar-prefs.c:466
 msgid "Available buttons"
 msgstr "Dostupni dugmići"
 
-#: ../src/toolbar-prefs.c:490
+#: ../src/toolbar-prefs.c:482
 msgid "Current toolbar"
 msgstr "Tekuće alatke"
 
-#: ../src/toolbar-prefs.c:511
-#| msgid "Cut the selected text"
+#: ../src/toolbar-prefs.c:503
 msgid "Move selected item up"
 msgstr "Pomerite izabranu stavku gore"
 
-#: ../src/toolbar-prefs.c:521
-#| msgid "Save selected to folder..."
+#: ../src/toolbar-prefs.c:513
 msgid "Remove selected item from toolbar"
 msgstr "Uklonite izabranu stavku sa trake alata"
 
-#: ../src/toolbar-prefs.c:529
+#: ../src/toolbar-prefs.c:521
 msgid "Add selected item to toolbar"
 msgstr "Dodajte izabranu stavku na traku alata"
 
-#: ../src/toolbar-prefs.c:536
-#| msgid "Save selected to folder..."
+#: ../src/toolbar-prefs.c:528
 msgid "Move selected item down"
 msgstr "Pomerite izabranu stavku dole"
 
+#~ msgid "Bcc:"
+#~ msgstr "Nevidljiva kopija:"
+
+#~ msgid "Cc"
+#~ msgstr "Kopija"
+
+#~ msgid "_Bcc:"
+#~ msgstr "_Nevidljiva kopija:"
+
+#~ msgid "greek"
+#~ msgstr "grčki"
+
+#~ msgid "hebrew"
+#~ msgstr "hebrejski"
+
+#~ msgid "turkish"
+#~ msgstr "turski"
+
+#~ msgid "thai"
+#~ msgstr "tajlandski"
+
+#~ msgid "russian"
+#~ msgstr "ruski"
+
+#~ msgid "ukrainian"
+#~ msgstr "ukrajinski"
+
+#~ msgid "korean"
+#~ msgstr "korejski"
+
+#~ msgid ""
+#~ "Could not send the message to %s:\n"
+#~ "%d: %s\n"
+#~ "Message left in your outbox.\n"
+#~ msgstr ""
+#~ "Ne mogu da pošaljem poruku za %s:\n"
+#~ "%d: %s\n"
+#~ "Poruka je zadržana u sandučetu „Odlazna“.\n"
+
+#~ msgid ""
+#~ "Message submission problem, placing it into your outbox.\n"
+#~ "System will attempt to resubmit the message until you delete it."
+#~ msgstr ""
+#~ "Problem sa slanjem poruke, smeštam je u „Odlaznu“.\n"
+#~ "Sistem će pokušavati sa ponovnim slanjem poruke sve dok je ne obrišete."
+
+#~ msgid "From: %d <%s>"
+#~ msgstr "Šalje: %d <%s>"
+
+#~ msgid "From %s: %d %s"
+#~ msgstr "Šalje %s: %d %s"
+
+#~ msgid "To: %d <%s>"
+#~ msgstr "Prima: %d <%s>"
+
+#~ msgid "To %s: %d %s"
+#~ msgstr "Prima %s: %d %s"
+
+#~ msgid ""
+#~ "SMTP server refused connection.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "SMTP server je odbio vezu.\n"
+#~ "Proverite vašu internet vezu."
+
+#~ msgid ""
+#~ "SMTP server cannot be reached.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "SMTP server ne može biti pristupljen.\n"
+#~ "Proverite vašu internet vezu."
+
+#~ msgid "Message left in Outbox (try again later)"
+#~ msgstr "Ostala je poruka u sandučetu (pokušajte kasnije)"
+
+#~ msgid ""
+#~ "SMTP server problem (%d): %s\n"
+#~ "Message is left in outbox."
+#~ msgstr ""
+#~ "Problem SMTP servera (%d): %s\n"
+#~ "Poruka je ostala u odlaznom."
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Adresa el-pošte"
+
+#~ msgid "_Reply..."
+#~ msgstr "_Odgovori..."
+
+#~ msgid "_Store Address..."
+#~ msgstr "_Uskladišti adresu..."
+
+#~ msgid "_Save..."
+#~ msgstr "_Sačuvaj..."
+
+#~ msgid "_Copy to folder..."
+#~ msgstr "_Umnoži u fasciklu..."
+
+#~ msgid "Reply..."
+#~ msgstr "Odgovori..."
+
+#~ msgid "Fcc:"
+#~ msgstr "Umnožak datoteke:"
+
+#~ msgid "Save..."
+#~ msgstr "Sačuvaj..."
+
+#~ msgid "Print..."
+#~ msgstr "Štampaj..."
+
+#~ msgid "_Cc:"
+#~ msgstr "_Kopija:"
+
+#~ msgid "Remote IMAP _folder..."
+#~ msgstr "Udaljena _fascikla IMAP-a..."
+
+#~ msgid "Remote IMAP _subfolder..."
+#~ msgstr "Udaljena podfa_scikla IMAP-a..."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Svojstva..."
+
+#~ msgid "Remote IMAP folder..."
+#~ msgstr "Udaljena IMAP fascikla..."
+
+#~ msgid "Open..."
+#~ msgstr "Otvori..."
+
+#~ msgid "F_cc:"
+#~ msgstr "U _datoteku:"
+
+#~ msgid "Cc: "
+#~ msgstr "Cc: "
+
+#~| msgid "Bcc:"
+#~ msgid "Bcc: "
+#~ msgstr "Bcc: "
+
+#~ msgid "_Customize Toolbars..."
+#~ msgstr "_Prilagodi osnovne alatke..."
+
 #~ msgid ""
 #~ "Problem Creating Mailboxes\n"
 #~ "%s"
@@ -6412,9 +6899,6 @@ msgstr "Pomerite izabranu stavku dole"
 #~ msgid "Rubrica Address Book"
 #~ msgstr "Adresar rubrike"
 
-#~ msgid "_Properties"
-#~ msgstr "_Svojstva"
-
 #~ msgid "Edit address book properties"
 #~ msgstr "Uredite svojstva adresara"
 
@@ -6496,9 +6980,6 @@ msgstr "Pomerite izabranu stavku dole"
 #~ "Balsina provera pisanja: Nisam uspeo da sastavim regularni izraz citiranog "
 #~ "teksta\n"
 
-#~ msgid "_Save"
-#~ msgstr "_Sačuvaj"
-
 #~ msgid "Save this address and close the dialog?"
 #~ msgstr "Da sačuvam ovu adresu i zatvorim prozorče?"
 



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