[evolution] Updated Serbian translation



commit cce146b224414b468ff07f384570be5c22797e29
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Tue Aug 30 23:36:51 2016 +0200

    Updated Serbian translation

 po/sr.po       | 4997 +++++++++++++++++++++++++++++---------------------------
 po/sr latin po | 4998 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 5178 insertions(+), 4817 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 0fe15ba..14d1052 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,31 +1,29 @@
 # Serbian translation of evolution
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution package.
-#
-# Translators: 
+# Translators:
 # Игор Несторовић <igor prevod org>, 2005.
 # Слободан Д. Средојевић <slobo akrep be>
 # Милош Поповић <gpopac gmail com>, 2010—2015.
 # Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2016.
 # Марко М. Костић <marko m kostic gmail com>, 2015—2016.
-#
+#: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-03-11 11:50+0000\n"
-"PO-Revision-Date: 2016-03-11 18:23+0100\n"
-"Last-Translator: Марко М. Костић <marko m kostic gmail com>\n"
-"Language-Team: Serbian <gnom prevod org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evoluti"MA
+"on&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-26 01:44+0000\n"
+"PO-Revision-Date: 2016-08-30 05:48+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
+"Language-Team: српски <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.6\n"
 
 # мало аориста ;-)
 #: ../addressbook/addressbook.error.xml.h:1
@@ -94,7 +92,7 @@ msgid "This address book will be removed permanently."
 msgstr "Овај адресар ће бити трајно уклоњен."
 
 #: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Не _бриши"
 
@@ -200,15 +198,15 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-mail-signature-manager.c:328
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
 #: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:453
+#: ../plugins/templates/templates.c:465
 msgid "_Add"
 msgstr "_Додај"
 
@@ -316,7 +314,7 @@ msgstr "Пуно _име..."
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
-msgstr "Ел. пошта"
+msgstr "Е-пошта"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "_Wants to receive HTML mail"
@@ -335,7 +333,7 @@ msgid "Instant Messaging"
 msgstr "Тренутне поруке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Контакт"
 
@@ -344,8 +342,8 @@ msgid "_Home Page:"
 msgstr "_Лична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:631
-#: ../modules/itip-formatter/itip-view.c:1905
+#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../modules/itip-formatter/itip-view.c:2099
 msgid "_Calendar:"
 msgstr "_Календар:"
 
@@ -435,14 +433,14 @@ msgstr "_Годишњица:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "Годишњица"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -524,8 +522,8 @@ msgstr "Додај X._509"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 #: ../calendar/gui/e-comp-editor-page-general.c:1373
-#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-attachment-view.c:357 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:368
 #: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
 #: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
 #: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
@@ -534,7 +532,7 @@ msgstr "Додај X._509"
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
+#: ../plugins/templates/templates.c:475
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -550,14 +548,14 @@ msgstr "Учитај X.5_09"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
-#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
+#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
+#: ../e-util/e-attachment-store.c:809
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3842
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:668
+#: ../smime/gui/certificate-manager.c:745
 msgid "_Save"
 msgstr "_Сачувај"
 
@@ -567,15 +565,15 @@ msgid "Certificates"
 msgstr "Уверења"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
 #: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "По_моћ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Могућности"
@@ -595,14 +593,14 @@ msgstr "Могућности"
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
 #: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
-#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:664
+#: ../e-util/e-attachment-store.c:808 ../e-util/e-attachment-view.c:303
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -610,12 +608,12 @@ msgstr "Могућности"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3841
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
 #: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
@@ -625,10 +623,10 @@ msgstr "Могућности"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
+#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:968
+#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Откажи"
@@ -678,22 +676,22 @@ msgid "Show Certificates"
 msgstr "Прикажи уверења"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
 msgid "_Undo"
 msgstr "О_позови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Опозови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
 msgid "_Redo"
 msgstr "По_нови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Понови"
 
@@ -725,8 +723,8 @@ msgid "PGP keys"
 msgstr "ПГП кључеви"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:691
+#: ../smime/gui/certificate-manager.c:980
 msgid "All files"
 msgstr "Све датотеке"
 
@@ -740,10 +738,10 @@ msgstr "Отворено X.506 уверење"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-attachment-store.c:662 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
 msgstr "_Отвори"
 
@@ -825,11 +823,11 @@ msgstr "Неисправан контакт."
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -842,7 +840,7 @@ msgstr "Неисправан контакт."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "У _реду"
@@ -960,15 +958,15 @@ msgstr "_Сакриј адресе када шаљеш пошту на овна
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "Add an email to the List"
-msgstr "Додајте ел. пошту на списак"
+msgstr "Додајте е-пошту на списак"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
-msgstr "Уклоните адресу ел. поште са списка"
+msgstr "Уклоните адресу е-поште са списка"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
-msgstr "Уметните адресе ел. поште из адресара"
+msgstr "Уметните адресе е-поште из адресара"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
@@ -1044,7 +1042,7 @@ msgstr "Поље које садржи"
 # note(slobo): spam , Ђубре --> Нежељена пошта
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "Адресар Еволуције"
 
@@ -1053,22 +1051,22 @@ msgid "Copy _Email Address"
 msgstr "Умножи електронску _адресу"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:340
+#: ../e-util/e-web-view.c:359
 msgid "Copy the email address to the clipboard"
 msgstr "Умножава адресе у списак исечака"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:371
 msgid "_Send New Message To..."
 msgstr "_Пошаљи поруку за..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:354
+#: ../e-util/e-web-view.c:373
 msgid "Send a mail message to this address"
 msgstr "Шаље поруку на ову адресу"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1279
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
@@ -1237,7 +1235,12 @@ msgid "Blog"
 msgstr "Блог"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:967
 msgid "Cancelled"
 msgstr "Отказано"
 
@@ -1259,7 +1262,7 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"Назив или адреса ел. поште овог контакта већ постоји у\n"
+"Назив или адреса е-поште овог контакта већ постоји у\n"
 "овој фасцикли. Да ли ипак желите да сачувате измене?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:774
@@ -1267,7 +1270,7 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
 msgstr ""
-"Назив или адреса ел. поште овог контакта већ постоји\n"
+"Назив или адреса е-поште овог контакта већ постоји\n"
 "у овој фасцикли. Да ли ипак желите да га додате?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:789
@@ -1471,15 +1474,15 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Сигурно желите да обришете овај контакт (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:678
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Обриши"
 
@@ -1620,7 +1623,7 @@ msgid "Title"
 msgstr "Титула"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Улога"
@@ -1652,7 +1655,7 @@ msgstr "Списак контакта: "
 msgid "Contact: "
 msgstr "Контакт: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "миникарта еволуције"
 
@@ -1664,7 +1667,7 @@ msgstr "Нови контакт"
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1684,14 +1687,14 @@ msgstr "У_већај"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2424
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
-#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../e-util/e-html-editor-actions.c:1858
+#: ../e-util/e-html-editor-find-dialog.c:252
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Нађи"
@@ -1754,52 +1757,62 @@ msgstr ""
 "\n"
 "Нема ставки за приказивање."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Увозим..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+#| msgid "Can not open file"
+msgid "Can't open .csv file"
+msgstr "Не могу да отворим „.csv“ датотеку"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Аутлук контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Аутлуков увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Мозила контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Мозилин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Еволуција контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Еволуцијин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+#| msgid "Can not open file"
+msgid "Can't open .ldif file"
+msgstr "Не могу да отворим „.ldif“ датотеку"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ЛДАП облик размене података (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Еволуцијин ЛДИФ увозник"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "вКарта (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Еволуцијин вКарт увозник"
 
@@ -1810,51 +1823,6 @@ msgstr "Еволуцијин вКарт увозник"
 msgid "Page %d"
 msgstr "%d. страница"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "Наведите излазну датотеку уместо стандардног излаза"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "ИЗЛАЗНА-ДАТОТЕКА"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "Наводи фасцикле локалног адресара"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "Приказује карте као вкарту или цсв датотеку"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Грешка у аргументима наредбе, користите опцију „--help“ да видите како се "
-"користи."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "Подржава само цсв или вкард облик."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "Непозната грешка"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "Не могу да отворим датотеку"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Не могу да отворим „%s“: %s"
-
 #: ../addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Work Email"
@@ -2002,7 +1970,7 @@ msgid "Start time"
 msgstr "Време почетка"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Заказивања"
 
@@ -2016,15 +1984,15 @@ msgstr "_Дремање"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
-#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
-#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
+#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
+#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
 #: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
+#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Уређивање"
@@ -2038,11 +2006,11 @@ msgid "_Dismiss"
 msgstr "_Занемари"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1514
-#: ../modules/itip-formatter/itip-view.c:1625
+#: ../modules/itip-formatter/itip-view.c:1724
+#: ../modules/itip-formatter/itip-view.c:1835
 msgid "Location:"
 msgstr "Место:"
 
@@ -2074,23 +2042,23 @@ msgstr "сати"
 msgid "minutes"
 msgstr "минута"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "Нема доступног сажетка."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "Нема доступног описа."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "Нема доступног податка о локацији."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Подсетници Еволуције"
 
@@ -2104,21 +2072,21 @@ msgstr[1] "Имате %d потсетника"
 msgstr[2] "Имате %d потсетника"
 msgstr[3] "Имате један потсетник"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Не"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2135,16 +2103,27 @@ msgstr ""
 "\n"
 "Да ли сте сигурни да желите да покренете овај програм?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "неисправно време"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d дан"
+msgstr[1] "%d дана"
+msgstr[2] "%d дана"
+msgstr[3] "%d дан"
+
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2155,7 +2134,7 @@ msgstr[2] "%d сати"
 msgstr[3] "Један сат"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2168,7 +2147,7 @@ msgstr[3] "Један минут"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2365,7 +2344,7 @@ msgstr "Желите ли да пошаљете учесницима позив
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
-"Позивнице ће бити послате ел. поштом свим учесницима и омогућиће им да "
+"Позивнице ће бити послате е-поштом свим учесницима и омогућиће им да "
 "одговоре."
 
 #: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
@@ -2395,8 +2374,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"Позивнице ел. поштом биће послате свим учесницима да би могли да прихвате "
-"овај задатак."
+"Позивнице е-поштом биће послате свим учесницима да би могли да прихвате овај "
+"задатак."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
@@ -2443,8 +2422,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this memo."
 msgstr ""
-"Позивнице ел. поштом биће послате свим учесницима да би могли да прихвате "
-"ову белешку."
+"Позивнице е-поштом биће послате свим учесницима да би могли да прихвате ову "
+"белешку."
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send updated memo information to participants?"
@@ -2832,7 +2811,7 @@ msgstr "не садржи"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Опис"
@@ -2872,7 +2851,7 @@ msgstr "Лично"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
 #: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Поверљиво"
@@ -2922,7 +2901,7 @@ msgid "Do Not Exist"
 msgstr "Не постоји"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "Понављање"
 
@@ -3047,16 +3026,6 @@ msgstr "Дугме за прескакање"
 msgid "Click here, you can find more events."
 msgstr "Кликните овде, можете наћи још догађаја."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d дан"
-msgstr[1] "%d дана"
-msgstr[2] "%d дана"
-msgstr[3] "%d дан"
-
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -3069,28 +3038,28 @@ msgstr[3] "%d недеља"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Пусти звук"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Избаци упозорење"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 msgctxt "cal-reminders"
 msgid "Send an email"
-msgstr "Пошаљи ел. пошту"
+msgstr "Пошаљи е-пошту"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Покрени програм"
@@ -3174,8 +3143,8 @@ msgstr "преглед календара за месец"
 msgid "calendar view for one or more weeks"
 msgstr "преглед календара за једну или више недеља"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
-#: ../mail/e-mail-config-page.c:125
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Неименовано"
 
@@ -3200,8 +3169,8 @@ msgid "Due Date:"
 msgstr "Крајњи рок:"
 
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1517
-#: ../modules/itip-formatter/itip-view.c:1634
+#: ../modules/itip-formatter/itip-view.c:1727
+#: ../modules/itip-formatter/itip-view.c:1844
 msgid "Status:"
 msgstr "Стање:"
 
@@ -3225,14 +3194,6 @@ msgstr "У току"
 msgid "Completed"
 msgstr "Завршено"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Отказано"
-
 #: ../calendar/gui/e-cal-component-preview.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:310
 #: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
@@ -3247,20 +3208,20 @@ msgstr "Важност:"
 
 #: ../calendar/gui/e-cal-component-preview.c:327
 #: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 msgid "High"
 msgstr "Висок"
 
 #: ../calendar/gui/e-cal-component-preview.c:329
 #: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:317
 msgid "Normal"
 msgstr "Обичан"
 
 #: ../calendar/gui/e-cal-component-preview.c:331
 #: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "Низак"
 
@@ -3460,7 +3421,7 @@ msgstr "Убацујем податке из иКалендара"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3469,7 +3430,7 @@ msgstr "Организатор: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3477,7 +3438,7 @@ msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
@@ -3488,10 +3449,10 @@ msgstr "Место: %s"
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2269
 #: ../calendar/gui/e-calendar-view.c:2276
 #: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3504,13 +3465,13 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
 #: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3525,17 +3486,17 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
 #: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%a %d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y."
+msgstr "%a %d. %b %Y."
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
@@ -3566,13 +3527,13 @@ msgstr "Последње измене"
 msgid "Source"
 msgstr "Извор"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
 #: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6218
+#: ../modules/itip-formatter/itip-view.c:3425
+#: ../modules/itip-formatter/itip-view.c:5999
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Непознато"
@@ -3608,39 +3569,39 @@ msgid "Assigned"
 msgstr "Додељено"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Да"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Не"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:5987
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:5993
 msgid "Declined"
 msgstr "Одбијено"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Са резервом"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:5996
 msgid "Delegated"
 msgstr "Делегирано"
 
@@ -3650,7 +3611,7 @@ msgstr "Захтева радњу"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
 #: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
@@ -3926,145 +3887,145 @@ msgstr ""
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Догађај није могуће потпуно уредити, пошто нисте организатор"
 
-#: ../calendar/gui/e-comp-editor-event.c:350
+#: ../calendar/gui/e-comp-editor-event.c:438
 #: ../calendar/gui/e-comp-editor-task.c:348
 msgid "Start date is not a valid date"
 msgstr "Датум почетка није исправан датум"
 
-#: ../calendar/gui/e-comp-editor-event.c:352
+#: ../calendar/gui/e-comp-editor-event.c:440
 msgid "Start time is not a valid time"
 msgstr "Време почетка није исправно време"
 
-#: ../calendar/gui/e-comp-editor-event.c:356
-#: ../calendar/gui/e-comp-editor-event.c:372
-#: ../calendar/gui/e-comp-editor-page-attachments.c:211
-#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:991 ../shell/e-shell.c:1013
-#: ../smime/gui/certificate-manager.c:346
+#: ../calendar/gui/e-comp-editor-event.c:444
+#: ../calendar/gui/e-comp-editor-event.c:460
+#: ../calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2008
+#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
+#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
+#: ../smime/gui/certificate-manager.c:359
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../calendar/gui/e-comp-editor-event.c:366
+#: ../calendar/gui/e-comp-editor-event.c:454
 msgid "End date is not a valid date"
 msgstr "Датум краја није исправан датум"
 
-#: ../calendar/gui/e-comp-editor-event.c:368
+#: ../calendar/gui/e-comp-editor-event.c:456
 msgid "End time is not a valid time"
 msgstr "Време краја није исправно време"
 
-#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-event.c:588
 #: ../calendar/gui/e-comp-editor-memo.c:106
 #: ../calendar/gui/e-comp-editor-task.c:406
 msgid "_Categories"
 msgstr "_Категорије"
 
-#: ../calendar/gui/e-comp-editor-event.c:492
+#: ../calendar/gui/e-comp-editor-event.c:590
 #: ../calendar/gui/e-comp-editor-memo.c:108
 #: ../calendar/gui/e-comp-editor-task.c:408
 msgid "Toggles whether to display categories"
 msgstr "Пребацује приказивање категорија"
 
-#: ../calendar/gui/e-comp-editor-event.c:498
+#: ../calendar/gui/e-comp-editor-event.c:596
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/e-comp-editor-event.c:500
+#: ../calendar/gui/e-comp-editor-event.c:598
 msgid "Toggles whether the time zone is displayed"
 msgstr "Пребацује приказивање временске зоне"
 
-#: ../calendar/gui/e-comp-editor-event.c:506
+#: ../calendar/gui/e-comp-editor-event.c:604
 msgid "All _Day Event"
 msgstr "Целодневни догађа_ј"
 
-#: ../calendar/gui/e-comp-editor-event.c:508
+#: ../calendar/gui/e-comp-editor-event.c:606
 msgid "Toggles whether to have All Day Event"
 msgstr "Бира да ли дозвољава целодневне догађаје"
 
-#: ../calendar/gui/e-comp-editor-event.c:514
+#: ../calendar/gui/e-comp-editor-event.c:612
 msgid "Show Time as _Busy"
 msgstr "Прикажи време као _заузето"
 
-#: ../calendar/gui/e-comp-editor-event.c:516
+#: ../calendar/gui/e-comp-editor-event.c:614
 msgid "Toggles whether to show time as busy"
 msgstr "Пребацује приказивање времена као заузето"
 
-#: ../calendar/gui/e-comp-editor-event.c:525
+#: ../calendar/gui/e-comp-editor-event.c:623
 msgid "Pu_blic"
 msgstr "_Јавно"
 
-#: ../calendar/gui/e-comp-editor-event.c:527
+#: ../calendar/gui/e-comp-editor-event.c:625
 msgid "Classify as public"
 msgstr "Означите као јавно"
 
-#: ../calendar/gui/e-comp-editor-event.c:532
+#: ../calendar/gui/e-comp-editor-event.c:630
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../calendar/gui/e-comp-editor-event.c:534
+#: ../calendar/gui/e-comp-editor-event.c:632
 msgid "Classify as private"
 msgstr "Означите као лично"
 
-#: ../calendar/gui/e-comp-editor-event.c:539
+#: ../calendar/gui/e-comp-editor-event.c:637
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../calendar/gui/e-comp-editor-event.c:541
+#: ../calendar/gui/e-comp-editor-event.c:639
 msgid "Classify as confidential"
 msgstr "Означите као поверљиво"
 
-#: ../calendar/gui/e-comp-editor-event.c:642
+#: ../calendar/gui/e-comp-editor-event.c:740
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "Време _почетка:"
 
-#: ../calendar/gui/e-comp-editor-event.c:647
+#: ../calendar/gui/e-comp-editor-event.c:745
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: ../calendar/gui/e-comp-editor-event.c:657
+#: ../calendar/gui/e-comp-editor-event.c:755
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Целодневни _догађај"
 
-#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-event.c:808
 #: ../calendar/gui/e-comp-editor-memo.c:192
 #: ../calendar/gui/e-comp-editor-task.c:529
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Опште"
 
-#: ../calendar/gui/e-comp-editor-event.c:713
+#: ../calendar/gui/e-comp-editor-event.c:811
 #: ../calendar/gui/e-comp-editor-task.c:535
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Подсетници"
 
-#: ../calendar/gui/e-comp-editor-event.c:716
+#: ../calendar/gui/e-comp-editor-event.c:814
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Понављање"
 
-#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-event.c:817
 #: ../calendar/gui/e-comp-editor-memo.c:195
 #: ../calendar/gui/e-comp-editor-task.c:538
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Прилози"
 
-#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../calendar/gui/e-comp-editor-event.c:827
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Планирање"
 
-#: ../calendar/gui/e-comp-editor-event.c:758
+#: ../calendar/gui/e-comp-editor-event.c:859
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак — %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:759
+#: ../calendar/gui/e-comp-editor-event.c:860
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказивање — %s"
@@ -4107,8 +4068,8 @@ msgstr "Белешка — %s"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:125
 #: ../calendar/gui/e-comp-editor-page-attachments.c:130
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../em-format/e-mail-formatter-attachment.c:337
+#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
@@ -4118,60 +4079,60 @@ msgstr[1] "Прилози"
 msgstr[2] "Прилози"
 msgstr[3] "Прилог"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../e-util/e-attachment.c:2542
+#: ../calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../e-util/e-attachment.c:2401
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Не могу да учитам „%s“"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:208
-#: ../e-util/e-attachment.c:2545
+#: ../calendar/gui/e-comp-editor-page-attachments.c:198
+#: ../e-util/e-attachment.c:2404
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Не могу да учитам прилог"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#: ../calendar/gui/e-comp-editor-page-attachments.c:403
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr ""
 "Неки прилози се још увек преузимају. Сачекајте док се не заврши преузимање."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#: ../calendar/gui/e-comp-editor-page-attachments.c:430
 #, c-format
 msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgstr "Не могу да нађем прилог „%s“, уклоните га са списка"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#: ../calendar/gui/e-comp-editor-page-attachments.c:447
 #, c-format
 msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
 msgstr "Прилог „%s“ нема исправну путању, уклоните га са списка"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:618
-#: ../composer/e-composer-actions.c:327
+#: ../calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../composer/e-composer-actions.c:319
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:620
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+#: ../calendar/gui/e-comp-editor-page-attachments.c:610
+#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
 msgid "Attach a file"
 msgstr "Приложите датотеку"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#: ../calendar/gui/e-comp-editor-page-attachments.c:617
 msgid "_Attachments"
 msgstr "_Прилози"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#: ../calendar/gui/e-comp-editor-page-attachments.c:619
 msgid "Show attachments"
 msgstr "Прикажите прилоге"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:781
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+#: ../calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Преглед иконицама"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:783
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+#: ../calendar/gui/e-comp-editor-page-attachments.c:774
+#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Преглед списком"
 
@@ -4251,17 +4212,17 @@ msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Учесници..."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
 msgid "Modify exception"
 msgstr "Измените изузетак"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "у"
 
@@ -4269,7 +4230,7 @@ msgstr "у"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "првог"
@@ -4279,7 +4240,7 @@ msgstr "првог"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "другог"
@@ -4288,7 +4249,7 @@ msgstr "другог"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "трећег"
@@ -4297,7 +4258,7 @@ msgstr "трећег"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "четвртог"
@@ -4306,7 +4267,7 @@ msgstr "четвртог"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "петог"
@@ -4315,14 +4276,14 @@ msgstr "петог"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "последњег"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Другог датума"
@@ -4331,7 +4292,7 @@ msgstr "Другог датума"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "од првог до десетог"
@@ -4340,7 +4301,7 @@ msgstr "од првог до десетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "од једанаестог до двадесетог"
@@ -4349,7 +4310,7 @@ msgstr "од једанаестог до двадесетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "од двадесетпрвог до тридесетпрвог"
@@ -4357,42 +4318,42 @@ msgstr "од двадесетпрвог до тридесетпрвог"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "дана"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "понедељка"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "уторка"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "среде"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "четвртка"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "петка"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "суботе"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "недеље"
@@ -4400,126 +4361,126 @@ msgstr "недеље"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "појаве"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Ово заказивање се _понавља"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Овај задатак се _понавља"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "Ова белешка се _понавља"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Овај састојак се _понавља"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
 msgid "Recurrence exception date is invalid"
 msgstr "Датум изузетка понављања није исправан"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
 msgid "End time of the recurrence is before the start"
 msgstr "Време завршетка понављања је пре почетка"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
 msgid "R_ecurrence"
 msgstr "_Понављање"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
 msgid "Set or unset recurrence"
 msgstr "Подесите или поништите понављање"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Сваког"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "дана"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "недеље"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "месеца"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "године"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "за"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "до"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "увек"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "Изузеци"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../mail/mail-config.ui.h:62
 msgid "A_dd"
 msgstr "_Додај"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "_Уклони"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
 msgid "Preview"
 msgstr "Преглед"
 
@@ -4527,24 +4488,24 @@ msgstr "Преглед"
 msgid "Send To"
 msgstr "Пошаљи"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "_Подсетници"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 msgid "Set or unset reminders"
 msgstr "Подесите или поништите подсетнике"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Подсетници"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "_Подсетник"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
@@ -4553,7 +4514,7 @@ msgstr[1] "%d дана пре"
 msgstr[2] "%d дана пре"
 msgstr[3] "%d дан пре"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
@@ -4562,7 +4523,7 @@ msgstr[1] "%d сата пре"
 msgstr[2] "%d сати пре"
 msgstr[3] "%d сат пре"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4577,132 +4538,132 @@ msgstr[3] "%d минут пре"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ништа"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "пре 15 минута"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "пре %d сат"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "пре 1 дана"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Произвољно"
 
 # bug: plural-forms
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "минут(а)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "сат(а)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "дан(а)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "пре"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "после"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "почетка"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "краја"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 msgid "Re_peat the reminder"
 msgstr "_Понови подсетник"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "прикажи још на сваких"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "минута"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "сати"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "дана"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Произвољна _порука"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Произвољан _звук подсетника"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "_Програм:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "_Аргументи:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 msgid "_Send To:"
 msgstr "_Пошаљи:"
 
@@ -4786,8 +4747,9 @@ msgid "Completed"
 msgstr "Завршено"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#| msgid "Cancelled"
 msgctxt "ECompEditor"
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отказано"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
@@ -4880,102 +4842,102 @@ msgstr "Додељен задатак — %s"
 msgid "Task - %s"
 msgstr "Задатак — %s"
 
-#: ../calendar/gui/e-comp-editor.c:254
+#: ../calendar/gui/e-comp-editor.c:255
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
 msgid "attachment"
 msgstr "прилог"
 
-#: ../calendar/gui/e-comp-editor.c:609
+#: ../calendar/gui/e-comp-editor.c:610
 msgid "Sending notifications to attendees..."
 msgstr "Шаљем обавештења учесницима..."
 
-#: ../calendar/gui/e-comp-editor.c:991
+#: ../calendar/gui/e-comp-editor.c:995
 msgid "Saving changes..."
 msgstr "Чувам измене..."
 
-#: ../calendar/gui/e-comp-editor.c:1247
+#: ../calendar/gui/e-comp-editor.c:1251
 msgid "No Summary"
 msgstr "Без сажетка"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:299
+#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
-#: ../mail/em-subscription-editor.c:1759
+#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
+#: ../mail/em-subscription-editor.c:1765
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2068
+#: ../smime/gui/certificate-manager.c:2214
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../calendar/gui/e-comp-editor.c:1974
+#: ../calendar/gui/e-comp-editor.c:1978
 msgid "Close the current window"
 msgstr "Затворите тренутни прозор"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: ../calendar/gui/e-comp-editor.c:1981 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
-#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
+#: ../e-util/e-web-view.c:1815 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:801
 msgid "Copy the selection"
 msgstr "Умножите изабрано"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: ../calendar/gui/e-comp-editor.c:1988 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1805
 #: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "Исеците изабрано"
 
-#: ../calendar/gui/e-comp-editor.c:1995 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr "Обришите избор"
 
-#: ../calendar/gui/e-comp-editor.c:2002
+#: ../calendar/gui/e-comp-editor.c:2006
 msgid "View help"
 msgstr "Погледај помоћ"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "_Убаци"
 
-#: ../calendar/gui/e-comp-editor.c:2009 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1825
 #: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "Убаците из списка исечака"
 
-#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
-#: ../mail/e-mail-reader.c:2287
+#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
+#: ../mail/e-mail-reader.c:2326
 #: ../modules/addressbook/e-book-shell-view-actions.c:1231
 #: ../modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "_Print..."
 msgstr "_Штампај..."
 
-#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
 #: ../modules/addressbook/e-book-shell-view-actions.c:1238
 #: ../modules/calendar/e-cal-shell-view-actions.c:1695
 #: ../modules/calendar/e-memo-shell-view-actions.c:815
@@ -4983,52 +4945,52 @@ msgstr "_Штампај..."
 msgid "Pre_view..."
 msgstr "_Преглед..."
 
-#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: ../calendar/gui/e-comp-editor.c:2030 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr "Изаберите сав текст"
 
-#: ../calendar/gui/e-comp-editor.c:2051
+#: ../calendar/gui/e-comp-editor.c:2055
 msgid "_Classification"
 msgstr "_Разврставање"
 
-#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
-#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
 msgid "_Options"
 msgstr "_Могућности"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../calendar/gui/e-comp-editor.c:2105
+#: ../calendar/gui/e-comp-editor.c:2109
 msgid "Save current changes"
 msgstr "Сачувајте текуће измене"
 
-#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:308
-#: ../mail/e-mail-notes.c:912
+#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
+#: ../mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Сачувај и затвори"
 
-#: ../calendar/gui/e-comp-editor.c:2112
+#: ../calendar/gui/e-comp-editor.c:2116
 msgid "Save current changes and close editor"
 msgstr "Сачувајте текуће измене и затворите уређивач"
 
@@ -5057,13 +5019,13 @@ msgstr "поп"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%A %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3742
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеља"
@@ -5103,94 +5065,94 @@ msgstr "Ништа"
 msgid "Select..."
 msgstr "Изабери..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Председавајући"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Обавезни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Могући учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Извори"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Појединац"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
 #: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Извор"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Столица"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
 #: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Потребна радња"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Учесник                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Врста"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "МВОМ"
@@ -5281,7 +5243,7 @@ msgstr "_Време почетка:"
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5290,7 +5252,7 @@ msgstr ""
 "Сажетак: %s\n"
 "Место: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Сажетак: %s"
@@ -5327,38 +5289,38 @@ msgstr "Језик"
 msgid "Memos"
 msgstr "Белешке"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Без сажетка *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Почетак: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Рок: "
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Сече изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Умножава изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Убацује белешке из списка исечака"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Брише изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Бира све видљиве белешке"
 
@@ -5386,7 +5348,7 @@ msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
+#: ../calendar/importers/icalendar-importer.c:1116
 #: ../data/evolution.desktop.in.in.h:12
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
 #: ../modules/calendar/e-cal-shell-content.c:1627
@@ -5396,24 +5358,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Задаци"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "Сече изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "Умножава изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "Убацује задатке из списка исечака"
 
-#: ../calendar/gui/e-task-table.c:1016
+#: ../calendar/gui/e-task-table.c:1051
 #: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Брише изабране задатке"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "Бира све видљиве задатке"
 
@@ -5429,7 +5391,7 @@ msgstr "Датум почетка"
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
 msgid "Complete"
 msgstr "Завршено"
 
@@ -5460,32 +5422,32 @@ msgstr "Изабери временску зону"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Подаци о догађају"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Подаци о задатку"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Подаци о белешци"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Подаци слободно/заузето"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Подаци о календару"
 
@@ -5493,7 +5455,7 @@ msgstr "Подаци о календару"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Прихваћено"
@@ -5502,7 +5464,7 @@ msgstr "Прихваћено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
@@ -5514,7 +5476,7 @@ msgstr "Прихваћено с резервом"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Одбијено"
@@ -5523,7 +5485,7 @@ msgstr "Одбијено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Делегирано"
@@ -5531,7 +5493,7 @@ msgstr "Делегирано"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Освежено"
@@ -5539,7 +5501,7 @@ msgstr "Освежено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Откажи"
@@ -5547,7 +5509,7 @@ msgstr "Откажи"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
@@ -5555,42 +5517,42 @@ msgstr "Освежи"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Подаци слободно/заузето (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "Подаци иКалендара"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Не могу да сачувам унос, нови догађај се сукобљава са неким другим."
 
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "Не могу да сачувам унос, грешка: "
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1986
 msgid "Sending an event"
 msgstr "Шаљем догађај"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1990
 msgid "Sending a memo"
 msgstr "Шаљем белешку"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1994
 msgid "Sending a task"
 msgstr "Шаљем задатак"
 
@@ -5856,40 +5818,40 @@ msgstr "је мање од"
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../modules/calendar/e-cal-base-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: ../calendar/importers/icalendar-importer.c:315
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../modules/calendar/e-cal-base-shell-backend.c:191
 #: ../modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Нови списак задатака"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "Направи _нови календар"
 
-#: ../calendar/importers/icalendar-importer.c:361
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "_Направи нови списак задатака"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "Датотеке иКалендара (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Увозник иКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Подсетник!"
 
@@ -5901,157 +5863,157 @@ msgstr "Датотеке вКалендара (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Увозник вКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Догађаји календара"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 msgid "GNOME Calendar"
 msgstr "Гномов календар"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентни увозник календара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Састанак"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Догађај"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "има понављања"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "је примерак"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "има подсетнике"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "има прилоге"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Јавно"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Лично"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Поверљиво"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Разврставање"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сажетак"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Место"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Почетак"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Рок"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Крај"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Категорије"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Завршено"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Адреса"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Организатор"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Врста"
@@ -7605,154 +7567,144 @@ msgstr "Пацифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-actions.c:212
+#: ../composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:328
 msgid "Close the current file"
 msgstr "Затворите тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "Нова _порука"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
+#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Подеси Еволуцију"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:349
 msgid "Save the current file"
 msgstr "Сачувајте тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:354
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:356
 msgid "Save the current file with a different name"
 msgstr "Сачувајте тренутну датотеку под другим именом"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:363
 msgid "Character _Encoding"
 msgstr "Ко_дна страна"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:387
 msgid "Print Pre_view"
 msgstr "Преглед пред _штампу"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:394
 msgid "Save as _Draft"
 msgstr "Сачувај као _нацрт"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:396
 msgid "Save as draft"
 msgstr "Сачувајте као нацрт"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:401
 msgid "S_end"
 msgstr "Пош_аљи"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:403
 msgid "Send this message"
 msgstr "Пошаљите ову поруку"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:411
 msgid "PGP _Encrypt"
 msgstr "ПГП _шифруј"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:413
 msgid "Encrypt this message with PGP"
 msgstr "Шифрујте ову поруку помоћу ПГП-а"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Sign"
 msgstr "ПГП _потпиши"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:421
 msgid "Sign this message with your PGP key"
 msgstr "Потпишите ову поруку помоћу ПГП кључа"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:427
 msgid "_Picture Gallery"
 msgstr "Галерија _слика"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:429
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Приказује збирку слика које можете да превучете у вашу поруку"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:435
 msgid "_Prioritize Message"
 msgstr "В_ажност поруке"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:437
 msgid "Set the message priority to high"
 msgstr "Поставља важност поруке на високо"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:443
 msgid "Re_quest Read Receipt"
 msgstr "Т_ражи повратницу"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:445
 msgid "Get delivery notification when your message is read"
 msgstr "Прима извештај о достави када је порука прочитана"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:451
 msgid "S/MIME En_crypt"
 msgstr "С/МИМЕ _шифруј"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:453
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Шифрује ову поруку помоћу С/МИМЕ уверења за шифровање"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME Sig_n"
 msgstr "С/МИМЕ _потпиши"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:461
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потписује ову поруку С/МИМЕ уверењем"
 
-#: ../composer/e-composer-actions.c:523
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode emoticons"
-msgstr "Уникод смајлићи"
-
-#: ../composer/e-composer-actions.c:525
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for emoticons."
-msgstr "Користи уникод знакове за смајлиће."
-
-#: ../composer/e-composer-actions.c:531
+#: ../composer/e-composer-actions.c:515
 msgid "_Bcc Field"
 msgstr "_Бцц поље"
 
-#: ../composer/e-composer-actions.c:533
+#: ../composer/e-composer-actions.c:517
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље Бцц приказано"
 
-#: ../composer/e-composer-actions.c:539
+#: ../composer/e-composer-actions.c:523
 msgid "_Cc Field"
 msgstr "_Цц поље"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:525
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље ЦЦ приказано"
 
-#: ../composer/e-composer-actions.c:547
+#: ../composer/e-composer-actions.c:531
 msgid "_From Override Field"
 msgstr "Прикажи поље _Шаље као име"
 
-#: ../composer/e-composer-actions.c:549
+#: ../composer/e-composer-actions.c:533
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7760,26 +7712,26 @@ msgstr ""
 "Одређује да ли се приказује име особе или адресе електронске поште у пољу "
 "„Шаље“"
 
-#: ../composer/e-composer-actions.c:555
+#: ../composer/e-composer-actions.c:539
 msgid "_Reply-To Field"
 msgstr "Поље Одго_вор-за"
 
-#: ../composer/e-composer-actions.c:557
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор-за приказано"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:596
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:602
 msgid "Save Draft"
 msgstr "Сачувај нацрт"
 
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-identity-page.c:341
 #: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Име:"
@@ -7810,7 +7762,7 @@ msgstr "Ш_аље:"
 # * expects the reply_to fields to be initialized.
 #: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
-msgstr "_Одговор-за:"
+msgstr "_Одговор прима:"
 
 #: ../composer/e-composer-header-table.c:841
 msgid "_To:"
@@ -7833,7 +7785,7 @@ msgid "S_ubject:"
 msgstr "На_слов:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:516
+#: ../mail/e-mail-config-identity-page.c:534
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
@@ -7845,7 +7797,7 @@ msgstr "Кликните овде за адресар."
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7853,7 +7805,7 @@ msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављено уверење за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:883
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7862,12 +7814,12 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављено уверење за шифровање "
 "за овај налог"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2409
 #: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4734
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Састављач у телу поруке не садржи текст, што не може бити измењено."
 
@@ -7991,7 +7943,7 @@ msgstr "Пријављена грешка бејаше „{0}“. Порука 
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Дошло је до грешке током слања. Како желите да наставите?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Пријављена грешка бејаше „{0}“."
 
@@ -8053,6 +8005,11 @@ msgstr "_Задржи формат"
 msgid "Lose _formatting"
 msgstr "З_анемари формат"
 
+#: ../composer/mail-composer.error.xml.h:41
+#| msgid "An error occurred while saving to your Drafts folder."
+msgid "An error occurred while saving to your Templates folder."
+msgstr "Дошло је до грешке током чувања у вашој фасцикли Шаблони."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Обавештење аларма Еволуције"
@@ -8062,7 +8019,7 @@ msgid "Calendar event notifications"
 msgstr "Обавештења о догађајима календара"
 
 #: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1118
+#: ../mail/e-mail-browser.c:1101
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8085,7 +8042,7 @@ msgstr "Управљајте вашом поштом, контактима и о
 
 #: ../data/evolution.desktop.in.in.h:5
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "ел.пошта;пошта;календар;контакт;адресар;задатак;"
+msgstr "е-пошта;пошта;календар;контакт;адресар;задатак;"
 
 #: ../data/evolution.desktop.in.in.h:6
 msgid "New Window"
@@ -8102,7 +8059,7 @@ msgstr "Контакти"
 #: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:422
 #: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1671
+#: ../smime/gui/certificate-manager.c:1684
 msgid "Mail"
 msgstr "Пошта"
 
@@ -8138,7 +8095,7 @@ msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"Да ли ће у уносу да присили приказивање адресе ел. поште са именом "
+"Да ли ће у уносу да присили приказивање адресе е-поште са именом "
 "самодопуњеног контакта."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
@@ -8286,10 +8243,9 @@ msgid ""
 "used, usually /usr/bin/bogofilter. The command should not contain any other "
 "arguments."
 msgstr ""
-"Пуна путања до наредбе за покретање Бого-филтера (Bogofilter). Уколико није "
-"је постављена користи се подразумевана путања задата током компајлирања "
-"програма, обично /usr/bin/bogofilter. Наредба не треба да садржи додатне "
-"опције."
+"Пуна путања до наредбе за покретање Бого-филтера. Уколико није је постављена "
+"користи се подразумевана путања задата током компајлирања програма, обично "
+"„/usr/bin/bogofilter“. Наредба не треба да садржи додатне опције."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
@@ -8403,8 +8359,8 @@ msgid ""
 "or -1 to use day-start-hour and day-start-minute"
 msgstr ""
 "Време у које почиње радни дан. Даје се у двадесетчетворочасовном облику "
-"HHMM, од 0000 до 2359, или -1 уколико желите да користите day-start-hour и "
-"day-start-minute"
+"ЧЧММ, од 0000 до 2359, или -1 уколико желите да користите „day-start-hour“ и "
+"„day-start-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
 msgid "Workday end time for Monday"
@@ -8416,8 +8372,8 @@ msgid ""
 "-1 to use day-end-hour and day-end-minute"
 msgstr ""
 "Време у које се завршава радни дан. Даје се у двадесетчетворочасовном "
-"облику, од 0000 до 2359, или -1 уколико желите да користите day-end-hour и "
-"day-end-minute"
+"облику, од 0000 до 2359, или -1 уколико желите да користите „day-end-hour“ и "
+"„day-end-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
 msgid "Workday start time for Tuesday"
@@ -8429,8 +8385,8 @@ msgid ""
 "-1 to use day-start-hour and day-start-minute"
 msgstr ""
 "Време у које се завршава радни дан. Даје се у двадесетчетворочасовном "
-"облику, од 0000 до 2359, или -1 уколико желите да користите day-start-hour и "
-"day-start-minute"
+"облику, од 0000 до 2359, или -1 уколико желите да користите „day-start-hour“ "
+"и „day-start-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
 msgid "Workday end time for Tuesday"
@@ -8635,7 +8591,7 @@ msgstr "Време последњег покретања подсетника, 
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Боја Маркус Бејнс линије - Дневни преглед"
+msgstr "Боја Маркус Бејнс линије — Дневни преглед"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
@@ -8643,7 +8599,7 @@ msgstr "Боја за исцртавање Маркус Бејнс линије
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Боја Маркус Бејнс линије - трака времена"
+msgstr "Боја Маркус Бејнс линије — трака времена"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
@@ -8910,8 +8866,8 @@ msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
 msgstr ""
-"Да лида прикаже подсетнике за завршене задатке. Када је стављено на нетачно "
-"(false), неће се приказивати подсетници за завршене задатке."
+"Да ли да прикаже подсетнике за завршене задатке. Када није постављено, неће "
+"се приказивати подсетници за завршене задатке."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
@@ -8962,7 +8918,7 @@ msgstr "24-часовни облик времена"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr "Да ли да прикаже време у двадесеточасовном формату, уместо am/pm"
+msgstr "Да ли да прикаже време у двадесеточасовном формату, уместо прп/поп"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
@@ -9130,10 +9086,23 @@ msgstr ""
 "постављено."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Name of the editor to prefer in the message composer"
+msgstr "Назив уређивача који се жели у састављачу порука"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn't correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+"Ако назив не одговара ни једном познатом уређивачу, онда се користи уграђени "
+"едитор Вебкит."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Path where picture gallery should search for its content"
 msgstr "Путања у којој галерија слика треба да тражи свој садржај."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -9143,27 +9112,27 @@ msgstr ""
 "фасциклу са сликама, обично подешена на ~/Слике. Ова фасцикла ће се такође "
 "користи када подешена путања не указује на постојећу фасциклу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Spell check inline"
 msgstr "Унутрашња провера правописа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Исцртава ознаке грешки при куцању уз речи док куцате."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
 msgid "Automatic link recognition"
 msgstr "Аутоматско препознавање веза"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
 msgid "Recognize links in text and replace them."
 msgstr "Препознаje везе у тексту и замењује их."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Аутоматско препознавање смајлића"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
@@ -9171,10 +9140,18 @@ msgstr ""
 "Препознаје смајлиће у тексту и замењује их сликама или Уникод знаковима."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Unicode emoticons"
+msgstr "Уникод смајлићи"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr "Користи уникод знакове за смајлиће."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Attribute message"
 msgstr "Приложена порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -9182,11 +9159,11 @@ msgstr ""
 "Текст који се убацује када одговарате на поруку, приписујући поруку "
 "оригиналном аутору"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Forward message"
 msgstr "Прослеђује поруку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -9194,11 +9171,11 @@ msgstr ""
 "Текст који се убацује приликом прослеђивања поруке, који је рекао да "
 "прослеђена порука следи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Original message"
 msgstr "Оригинална порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -9206,11 +9183,11 @@ msgstr ""
 "Текст који се убацује приликом прослеђивања поруке (објава при врху), који "
 "је рекао да прослеђена порука следи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Group Reply replies to list"
 msgstr "Груписање одговора Одговори на списку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -9221,11 +9198,11 @@ msgstr ""
 "„Одговор групи“ на траци алата које ће покушати да одговори само на дописну "
 "листи преко које сте навикли да примате примерак поруке на коју одговарате."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Put the cursor at the bottom of replies"
 msgstr "Поставља курсор на дно одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -9235,35 +9212,35 @@ msgstr ""
 "одговара на поруку. Ово утврђује да ли ће бити постављен на врх или на дно "
 "поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Always request read receipt"
 msgstr "Увек тражи повратницу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Да ли се повратница подразумевано додаје свакој поруци."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Send HTML mail by default"
 msgstr "Подразумевано слање ХТМЛ поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "Send HTML mail by default."
 msgstr "Шаље ХТМЛ пошту по подразумеваној вредности."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Spell checking languages"
 msgstr "Језици за проверу правописа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Списак ознака језика речника који се користе за проверу правописа."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Приказивање поља „Бцц“ при слању поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9271,11 +9248,11 @@ msgstr ""
 "Приказује поље „Бцц“ при слању поруке. Ово се поставља из изборника "
 "„Преглед“ након избора налога поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Приказивање поља „Цц“ при слању поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9283,11 +9260,11 @@ msgstr ""
 "Приказује поље „Бцц“ при слању поруке. Ово се поставља из изборника "
 "„Преглед“ након избора налога поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Приказује поље „Шаље“ са именом контакта при слању поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"From\" override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -9295,11 +9272,11 @@ msgstr ""
 "Приказује поље „Шаље“ са именом контакта при слању поруке. Ово се поставља "
 "из менија „Преглед“ након избора налога поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Приказивање поља „Одговор за“ када шаље поруку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -9307,11 +9284,11 @@ msgstr ""
 "Приказује поље „Одговор за“ при слању на поруке. Ово се поставља из "
 "изборника „Преглед“ након избора налога поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Приказивање поља „Шаље“ при слању на дописну листу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -9319,11 +9296,11 @@ msgstr ""
 "Приказује поље „Шаље“ при слању на дописну листу. Ово се поставља из "
 "изборника „Преглед“ након избора налога дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Приказивање поља „Одговор за“ при слању на дописнна списку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -9331,11 +9308,11 @@ msgstr ""
 "Приказује поље „Одговор за“ при слању на дописну листу. Ово се поставља из "
 "изборника „Преглед“ након избора налога дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Дигитално потписује одговоре када је потписана оригинална порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -9343,11 +9320,11 @@ msgstr ""
 "Сам укључује ПГП или С/МИМЕ потписе када одговара на поруке које су такође "
 "ПГП или С/МИМЕ потписане."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Кодирање назива датотека на начин Аутлука/Гпоште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -9358,11 +9335,11 @@ msgstr ""
 "како би исправно приказали називе са УТФ-8 словима које шаље Еволуција, "
 "пошто се не придржавају РФЦ 2231, него користе неисправан стандард РФЦ 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Send messages through Outbox folder"
 msgstr "Шаљи поруку кроз фасциклу За слање"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
@@ -9370,11 +9347,11 @@ msgstr ""
 "Увек чува поруку у фасциклу „За слање“ приликом слања, што омогућава "
 "кориснику да пошаље поруку по потреби."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Put personalized signatures at the top of replies"
 msgstr "Поставља персонализоване потписе изнад одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -9384,11 +9361,11 @@ msgstr ""
 "се одговара на поруку. Ово утврђује да ли ће бити постављен на врх или на "
 "дно поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Не додаје раздвојник потписа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -9396,11 +9373,11 @@ msgstr ""
 "Изаберите ову опцију у случају да не желите додавање раздвојника испред "
 "потписа приликом писања поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Ignore list Reply-To:"
 msgstr "Занемарује листу „Одговор-за:“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -9418,11 +9395,11 @@ msgstr ""
 "користите радњу „Одговори на листу“ онда ће то да уради. Врши се упоређивање "
 "заглавље „Одговор-за“ са заглављем „Списак објава“, ако постоји."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "List of localized 'Re'"
 msgstr "Списак локализованих „Одг“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -9432,17 +9409,6 @@ msgstr ""
 "прескочене у тексту приликом одговарања на поруку, као додатак стандардном "
 "„Одг“ префиксу. Један пример је „SV,AV“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Enable developer mode"
-msgstr "Укључи режим за програмере"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enables some hidden actions and tools aimed for development and debugging."
-msgstr ""
-"Укључује неке скривене радње и алате који су намењени програмерима и "
-"исправљању грешака у програму."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr "Број знакова за прелом"
@@ -9474,9 +9440,9 @@ msgid ""
 "always shown in the composer's toolbar. Otherwise they are shown only when "
 "being used."
 msgstr ""
-"Уколико је постављено на тачно (true), дугмићи за потпис и шифровање помоћу "
-"ПГП или С/МИМЕ ће увек бити приказани унутар траке са алатима састављача "
-"порука. У супротном ће бити приказани само када се користе."
+"Ако је изабрано, дугмићи за потпис и шифровање помоћу ПГП или С/МИМЕ ће увек "
+"бити приказани унутар траке са алатима састављача порука. У супротном ће "
+"бити приказани само када се користе."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Wrap quoted text in replies"
@@ -9487,18 +9453,30 @@ msgid "If set to 'true' quoted text in replies will be wrapped."
 msgstr "Ако је изабрано цитирани текст у одговорима биће преломљен."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr "Да ли да послуша савет заглавља поруке „Размештај-садржаја:на_мрежи“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
+"Set to 'false' to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+"Поништите ову опцију да блокирате аутоматски приказ прилога са "
+"„размештајем-садржаја:на мрежи“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Save file format for drag-and-drop operation"
 msgstr "Формат датотеке чувања за радњу превлачења и убацивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Може бити „mbox“ или „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Show image animations"
 msgstr "Приказивање анимираних слика"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9506,11 +9484,11 @@ msgstr ""
 "Омогућава анимиране слике у ХТМЛ пошти. Многим корисницима сметају анимиране "
 "слике и уместо њих желе непокретне слике."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable type ahead search feature"
 msgstr "Укључује или искључује могућност тражења куцања унапред"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9518,11 +9496,11 @@ msgstr ""
 "Омогућава претраживање из бочне површи, што доноси интерактивност у претрази "
 "назива фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable or disable magic space bar"
 msgstr "Укључује или искључује магичну размакницу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9530,57 +9508,57 @@ msgstr ""
 "Укључите ово да би размакницом померали текст поруке при прегледању, као и "
 "списак порука и фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Citation highlight color."
 msgstr "Боја за истицања цитата."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курсора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курсора, тако да видите курсор док читате поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Самостално учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show notification about missing remote content"
 msgstr "Приказује обавештење о недостајућем удаљеном садржају"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -9590,27 +9568,27 @@ msgstr ""
 "садржаја, а преузимање није допуштено корисницима или сајту, тада приказује "
 "обавештење о томе на врху панела за преглед."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show Animations"
 msgstr "Приказивање анимација"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show all message headers"
 msgstr "Приказивање свих заглавља порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Show all the headers when viewing a messages."
 msgstr "Приказује сва заглавља при прегледу порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "List of headers to show when viewing a message."
 msgstr "Списак заглавља за приказивање при прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -9620,82 +9598,94 @@ msgstr ""
 "која указује да ли је заглавље укључено. Искључена заглавља нису приказана "
 "уприликом прегледа пруке, али су још увек на списку у поставкама."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show photo of the sender"
 msgstr "Приказивање слике пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Приказује слику пошиљаоца у окну за читање поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Претражује gravatar.com како би нашао слику пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 "Омогућава претрагу сајта gravatar.com како би пронашао фотографију пошиљаоца."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава поруку виђеном после наведеног рока."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Mark as Seen always after specified timeout"
 msgstr "Увек означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr ""
-"Уколико је постављено на тачно (true), изабрана порука ће бити означена као "
-"непрочитана након одређено времена и након измене фасцикле."
+"Ако је изабрано, изабрана порука ће бити означена као непрочитана након "
+"одређено времена и након измене фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Timeout for marking messages as seen"
 msgstr "Време за означавање порука као виђеним"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Време у милисекундама за које ће поруке бити означене као виђеним."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "Приказ траке прилога"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+"Приказује траку прилога испод окна прегледа поруке када порука има прилоге."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Sender email-address column in the message list"
 msgstr "Приказ колоне е-адреса пошиљаоца у списку порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Приказује е-адресу пошиљаоца у посебној колони у списку порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show deleted messages in the message-list"
 msgstr "Приказивање обрисаних порука у листи порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show junk messages in the message-list"
 msgstr "Приказивање непожељних порука на списку порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Приказује непожељне поруке (прецртане црвеном бојом) на списку порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Enable Unmatched search folder"
 msgstr "Укључи непоклопљене фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9703,11 +9693,11 @@ msgstr ""
 "Укључује непоклопљене фасцикле претраге унутар фасцикли претраге. Не ради "
 "ништа ако је су искључене фасцикле претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Скрива преглед по фасциклама и уклања избор"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9715,31 +9705,31 @@ msgstr ""
 "Овак кључ је прочитан једном и потом враћен на „false“ (нетачно). Ово уклања "
 "пошту са списка и преглед за ту фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Height of the message-list pane"
 msgstr "Висина површи листе порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Height of the message-list pane."
 msgstr "Висина површи за листе порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Да ли су заглавља поруке скупљена у корисничком сучељу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Width of the message-list pane"
 msgstr "Ширина површи списка порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Width of the message-list pane."
 msgstr "Ширина површи списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9750,47 +9740,47 @@ msgstr ""
 "порука. 0 — (класичан преглед) смешта ову површ испода списка порука. 1 — "
 "(вертикалан преглед) смешта површ поред списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Variable width font"
 msgstr "Фонт променљиве величине"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "The variable width font for mail display."
 msgstr "Фонт променљиве величине за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Terminal font"
 msgstr "Фонт терминала"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "The terminal font for mail display."
 msgstr "Фонт терминала за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Use custom fonts"
 msgstr "Коришћење сопствених фонтова"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи прилагођене фонтове за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сажима приказ адреса у За/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Врши сажимање приказа адреса у За/ЦЦ/БЦЦ на број одређен у address_count "
-"(број адреса)."
+"Врши сажимање приказа адреса у Прима/ЦЦ/БЦЦ на број одређен у броју адреса "
+"(address_count)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број адреса за приказ у КО/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9798,11 +9788,11 @@ msgstr ""
 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
 "после чега је приказано „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Thread the message-list based on Subject"
 msgstr "Приказ поруке према наслову расправе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9810,11 +9800,11 @@ msgstr ""
 "Да ли покушати приказ расправе по наслову када поруке не садрже заглавља „In-"
 "Reply-To“ или „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default value for thread expand state"
 msgstr "Подразумевана вредност за раширену расправу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9822,11 +9812,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити подразумевано бити раширене или "
 "скупљене. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Да ли се поруке нижу на основу последње поруке у расправи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9835,11 +9825,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити бити разврстани по последњој поруци "
 "једне нити, уместо по датуму. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Whether sort thread children always ascending"
 msgstr "Да ли се подрасправе ређају растући"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -9847,11 +9837,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће расправе нижег нивоа бити разврстани "
 "растући, уместо на истом начин као унутар родитељских нити."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ређа налоге азбучним редом у стаблу фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9863,27 +9853,27 @@ msgstr ""
 "изузетком фасцикли „На овом рачунару“ и „Потражи“, у супротном налози бивају "
 "поређани на основу поретка који је задао корисник"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Log filter actions"
 msgstr "Дневник радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Flush Outbox after filtering"
 msgstr "Празни слање након филтрирања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9893,55 +9883,55 @@ msgstr ""
 "ове фасцикле ће се догодити само ако се користи нека радња филтера "
 "„Проследи“ и отприлике један минут после призивања последње радње."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr "Упозорење на слање поруке када се користи пречица (Ctrl + Enter)"
+msgstr "Упозорење на слање поруке када се користи пречица (Ктрл + Унеси)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 "Упозорава корисника када покуша да пошаље поуку помоћу пречице са тастатуре."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt on empty subject"
 msgstr "Поставља упит када је наслов празан"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Поставља упит кориснику када покуша да пошаље поруку без наслова."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when emptying the trash"
 msgstr "Поставља упит приликом пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Поставља упит кориснику када покуша да испразни смеће."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user expunges"
 msgstr "Поставља упит при пражњењу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Поставља упит кориснику када покуша да испразни фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Упитаће пре слања примаоцима који нису унешени као адресе поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9949,19 +9939,19 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да пошаљете поруку "
 "примаоцима који нису унешени као адресе поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user only fills Bcc"
 msgstr "Поставља упит када корисник унесе само невидљиву графитну копију (Бцц)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Поставља упит кориснику када покуша да пошаље поруку без прималаца."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Поставља упит када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9969,12 +9959,12 @@ msgstr ""
 "Поставља упит када корисник покуша да пошаље ХТМЛ поруку примаоцима који "
 "можда не желе да примају ХТМЛ пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Поставља упит кориснику када покуша да отвори 10 или више порука одједном"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9982,19 +9972,19 @@ msgstr ""
 "Уколико корисник покуша да отвори 10 или више порука одједном, питаће га да "
 "ли заиста жели то да уради."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt while marking multiple messages"
 msgstr "Поставља упит при означавању више порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Укључује или искључује упозорење при означавању више порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when deleting messages in search folder"
 msgstr "Поставља упит код брисања порука из фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10003,12 +9993,12 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да је брисање поруке из фасцикле "
 "претраге трајно, а не само уклањање из резултата претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Питаће да ли да умножи фасциклу превлачењем и убацивањем у стаблу фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -10020,12 +10010,12 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Питаће да ли да премести фасциклу превлачењем и убацивањем у стаблу фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -10037,11 +10027,11 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying privately to list messages"
 msgstr "Поставља упит када одговарате приватно на листу порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10049,11 +10039,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете приватан одговор на "
 "поруку која је стигла са дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Поставља упит када дописна листа одузме приватне одговоре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10063,25 +10053,25 @@ msgstr ""
 "одговор на поруку која је стигла са дописне листе, али у листи заглавље "
 "„Одговор-за“ је подешено да вас преусмери да одговорите на листу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when replying to many recipients"
 msgstr "Поставља упит када одговарате већем броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете одговор многим људима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 "Упозорење о губитку форматирања приликом пребацивања у ређим састављача"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
@@ -10089,11 +10079,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да се пребаците у "
 "режим састављача и при томе изгубите форматирање садржаја."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Упозорава када шаљете е-поруку великом броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -10102,7 +10092,7 @@ msgstr ""
 "пошиљаоца наведених у пољима „За“ или „ЦЦ“. Вредност „composer-many-to-cc-"
 "recips-num“ одређује праг за упозорење."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -10110,42 +10100,42 @@ msgstr ""
 "Политика за самостално затварање прозора прегледника порука приликом "
 "прослеђивања или одговарања на приказану поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Empty Trash folders on exit"
 msgstr "Празни фасцикле са смећем на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све фасцикле са смећем при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Last time Empty Trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Када је последњи пут извршено пражњење смећа, у данима од 1. јануара, 1970 "
 "(епох)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Време у секундама за које се приказује грешка у статусној траци."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Level beyond which the message should be logged."
 msgstr "Ниво након којег се порука заводи у дневник."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10153,11 +10143,11 @@ msgstr ""
 "Може имати три могуће вредности: 0 — за грешке, 1 — за упозорења и 2 — за "
 "поруке о дијагнози квара."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Show original \"Date\" header value."
 msgstr "Приказује оригиналну вредност заглавља датума."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -10167,11 +10157,11 @@ msgstr ""
 "се временске зоне разликују). Иначе увек приказује вредност заглавља „Датум“ "
 "према поставкама и временској зони корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и њима додељених боја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10179,46 +10169,46 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи низове "
 "облика име:боја где боја користи ХТМЛ хекса кодирање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Check incoming mail being junk"
 msgstr "Врши проверу да ли је пристигла пошта ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Run junk test on incoming mail."
 msgstr "Проверава да ли има ђубрета у долазној пошти."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Empty Junk folders on exit"
 msgstr "Празни фасцикле са ђубретом при излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Празни све фасцикле са ђубретом при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Најмање дана између пражњења ђубрета на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Најмање време између пражњења ђубрета на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Last time Empty Junk was run"
 msgstr "Време последњег пражњења ђубрета"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Када је последњи пут извршено пражњење ђубрета, у данима од 1. јануара, 1970 "
 "(епох)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "The default plugin for Junk hook"
 msgstr "Подразумевани додатак куке за ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -10228,11 +10218,11 @@ msgstr ""
 "прикључци. Уколико је поменути подразумевани прикључак искључен, преостали "
 "доступни прикључци неће бити активирани."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Утврђује да ли у адресару да прегледа адресе пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10244,7 +10234,7 @@ msgstr ""
 "самодопуњавање. Може бити споро ако су адресари (рецимо ЛДАП) означени за "
 "самодопуњавање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10252,23 +10242,23 @@ msgstr ""
 "Утврђује да ли само у адресару да прегледа адресе у потрази за нежељеном "
 "поштом"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"Ова опција се односи на кључ lookup_addressbook и користи се за одређивање "
+"Ова опција се односи на кључ „lookup_addressbook“ и користи се за одређивање "
 "да ли да се адреса тражи само у локалном адресару како би се издвојила пошта "
 "примљена од познатих пошиљалаца од оне нежељене."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10277,11 +10267,11 @@ msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Custom headers to use while checking for junk."
 msgstr "Прилагођена заглавља за употребу приликом провере нежељене поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10289,31 +10279,31 @@ msgstr ""
 "Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи "
 "списка су низ формата „headername=value“ (име заглавља=вредност)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Save directory"
 msgstr "Директоријум чувања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Directory for saving mail component files."
 msgstr "Директоријум за чување датотека модула за пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Composer load/attach directory"
 msgstr "Директоријум састављача за учитавање/прилагање"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Directory for loading/attaching files to composer."
 msgstr "Директоријум за учитавање/прилагање датотека у састављач."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Check for new messages on start"
 msgstr "Врши проверу за новим порукама приликом покретања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -10321,11 +10311,11 @@ msgstr ""
 "Да ли ће вршити проверу за новим порукама приликом покретања Еволуције. Ово "
 "укључује и слање порука из фасцикле Послато."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Check for new messages in all active accounts"
 msgstr "Врши проверу за новим порукама у свим активним налозима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -10336,11 +10326,11 @@ msgstr ""
 "покретања Еволуције. Ова опција се користи само заједно са "
 "„send_recv_on_start“ (пошаљи_прими_при_покретању) опцијом."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Server synchronization interval"
 msgstr "Интервал усаглашавања са сервером"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10348,11 +10338,11 @@ msgstr ""
 "Контролише учесталост усклађивања локалних измена са мрежним сервером поште. "
 "Интервал мора бити најмање 30 секунди."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Allow expunge in virtual folders"
 msgstr "Дозволи пражњење виртуелних фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -10364,12 +10354,12 @@ msgstr ""
 "покренута над свим фасциклама и за све избрисане поруке у виртуелној "
 "фасцикли, не само за обрисане поруке које припадају виртуелној фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "Наследи боју теме из ХТМЛ режима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -10377,11 +10367,11 @@ msgstr ""
 "Када је омогућено боја позадине, текста и везе ће бити послата у крајњој "
 "ХТМЛ поруци."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "An Archive folder for On This Computer folders."
 msgstr "Фасцикла Архива унутар фасцикле На овом рачунару."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -10389,11 +10379,11 @@ msgstr ""
 "Фасцикла Архива која се користи за поруке|архиве... могућност се јавља "
 "унутар фасцикле На овом рачунару."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) Default forward style"
 msgstr "(Застарело) Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -10401,11 +10391,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Default reply style"
 msgstr "(Застарело) Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -10413,11 +10403,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Застарело) Списак произвољних заглавља и да ли су укључена."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -10425,11 +10415,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Застарело) Учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -10437,7 +10427,7 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -10445,7 +10435,7 @@ msgstr ""
 "(Застарело) Пита да ли да затвори прозор са поруком када корисник прослеђује "
 "или одговара на поруку приказану у прозору."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10632,8 +10622,8 @@ msgid ""
 "and \"notify-sound-use-theme\" keys are disregarded."
 msgstr ""
 "Да ли ће да пусти било какав звук када пристигну нове поруке. Ако није "
-"изабрано (false), онда се кључеви „notify-sound-beep“, „notify-sound-file“, "
-"„notify-sound-play-file“ и „notify-sound-use-theme“ не узимају у обзир."
+"изабрано, онда се кључеви „notify-sound-beep“, „notify-sound-file“, „notify-"
+"sound-play-file“ и „notify-sound-use-theme“ не узимају у обзир."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
@@ -10864,7 +10854,7 @@ msgid ""
 msgstr ""
 "Пуна путања до наредбе за убицу непожељних порука (spamassassin). Уколико "
 "није одређено, користи се путања која је одређена током компајлирања "
-"програма, обично /usr/bin/spamassassin. Наредба не треба да садржи додатне "
+"програма, обично „/usr/bin/spamassassin“. Наредба не треба да садржи додатне "
 "опције."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
@@ -10877,11 +10867,11 @@ msgid ""
 "used, usually /usr/bin/sa-learn. The command should not contain any other "
 "arguments."
 msgstr ""
-"Пуна путања до наредбе sa-learn. Уколико није одређено, користи се путања "
-"која је одређена током компајлирања програма, обично /usr/bin/sa-learn. "
+"Пуна путања до наредбе „sa-learn“. Уколико није одређено, користи се путања "
+"која је одређена током компајлирања програма, обично „/usr/bin/sa-learn“. "
 "Наредба не треба да садржи додатне опције."
 
-#: ../em-format/e-mail-formatter-attachment.c:425
+#: ../em-format/e-mail-formatter-attachment.c:338
 msgid "Display as attachment"
 msgstr "Прикажи као прилог"
 
@@ -10916,11 +10906,11 @@ msgstr "Обична слика"
 msgid "Display part as an image"
 msgstr "Приказује делове као слику"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#: ../em-format/e-mail-formatter-message-rfc822.c:250
 msgid "RFC822 message"
 msgstr "РФЦ822 порука"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../em-format/e-mail-formatter-message-rfc822.c:251
 msgid "Format part as an RFC822 message"
 msgstr "Обликује део као РФЦ822 поруку"
 
@@ -10932,7 +10922,7 @@ msgid "Name"
 msgstr "Назив"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Величина"
 
@@ -10940,7 +10930,7 @@ msgstr "Величина"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
 msgid "Subject"
 msgstr "Наслов"
 
@@ -10962,18 +10952,18 @@ msgid "Display part as enriched text"
 msgstr "Приказује део као обогаћени текст"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "ХТМЛ"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 msgid "Format part as HTML"
 msgstr "Обликује део као ХТМЛ"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "Plain Text"
 msgstr "Обичан текст"
 
@@ -10982,21 +10972,21 @@ msgstr "Обичан текст"
 msgid "Format part as plain text"
 msgstr "Обликује део као обичан текст"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid "Unsigned"
 msgstr "Непотписано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ова порука није потписана. Није сигурно да је ова порука веродостојна."
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11004,22 +10994,22 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно веродостојан."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Потпис ове поруке није могао бити проверен, можда је измењена у преносу."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature, but cannot verify sender"
 msgstr "Исправан потпис, али не могу да проверим пошиљаоца"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11027,21 +11017,32 @@ msgstr ""
 "Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
 "бити проверен."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid "Signature exists, but need public key"
-msgstr "Потпис постоји, али тражи јавни кључ"
+#: ../em-format/e-mail-formatter-secure-button.c:50
+#| msgid ""
+#| "This message is signed with a signature, but there is no corresponding "
+#| "public key."
+msgid "This message is signed, but the public key is not in your keyring"
+msgstr "Ова порука је потписана, али јавни кључ није у вашем привеску кључева"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:50
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "Ова порука је потписана, али нема одговарајућег јавног кључа."
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
+msgstr ""
+"Ова порука је дигитално потписана, али одговарајући јавни кључ није присутан "
+"у вашем привеску за кључеве. Ако желите да будете у стању да потврдите "
+"аутентичност порука од те особе, требало би да набавите јавни кључ кроз "
+"поуздане методе и додате га на привезак за кључеве. До тада, нема гаранције "
+"да је ова порука заиста дошла од те особе и да је стигла непромењена."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11049,11 +11050,11 @@ msgstr ""
 "Ова порука није шифрована. Њен садржај је могуће видети у преносу преко "
 "Интернета."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11062,22 +11063,22 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом. Тешко је, али не и немогуће "
 "да неко са стране у догледно време види садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid "Encrypted"
 msgstr "Шифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ова порука је шифрована.  Тешко ће неко са стране видети садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11086,15 +11087,6 @@ msgstr ""
 "Ова порука је шифрована, јаким алгоритмом. Веома је тешко да неко са стране "
 "у догледно време види садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "Прегледај _уверење"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr "Ово уверење није читљиво"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Приказује извое као МИМЕ део"
@@ -11137,8 +11129,8 @@ msgstr "С/МИМЕ шифровано"
 
 #: ../em-format/e-mail-formatter-utils.c:593
 #: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
 msgid "Security"
 msgstr "Безбедност"
 
@@ -11229,7 +11221,16 @@ msgstr "Групе вести"
 msgid "Face"
 msgstr "Лице"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "Прегледај _уверење"
+
+#: ../em-format/e-mail-part-secure-button.c:133
+msgid "This certificate is not viewable"
+msgstr "Ово уверење није читљиво"
+
+#: ../em-format/e-mail-part-utils.c:552
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
@@ -11285,7 +11286,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1851
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -11303,49 +11304,49 @@ msgstr "Не могу да започнем расправу: "
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1227
+#: ../e-util/e-attachment.c:1141
 msgid "Attached message"
 msgstr "Приложена порука"
 
-#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
+#: ../e-util/e-attachment.c:2043 ../e-util/e-attachment.c:3029
 msgid "Operation was cancelled"
 msgstr "Радња је отказана."
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
-#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
+#: ../e-util/e-attachment.c:2203 ../e-util/e-attachment.c:2891
+#: ../e-util/e-attachment.c:3262 ../e-util/e-attachment-store.c:864
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
+#: ../e-util/e-attachment.c:2284 ../e-util/e-attachment.c:3322
 msgid "A load operation is already in progress"
 msgstr "Операција учитавања је већ у току"
 
-#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
+#: ../e-util/e-attachment.c:2292 ../e-util/e-attachment.c:3330
 msgid "A save operation is already in progress"
 msgstr "Операција чувања је већ у току"
 
-#: ../e-util/e-attachment.c:2830
+#: ../e-util/e-attachment.c:2689
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Не могу да отворим „%s“"
 
-#: ../e-util/e-attachment.c:2833
+#: ../e-util/e-attachment.c:2692
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Не могу да отворим прилог"
 
-#: ../e-util/e-attachment.c:3480
+#: ../e-util/e-attachment.c:3339
 msgid "Attachment contents not loaded"
 msgstr "Садржај прилога није учитан"
 
 # * found, so just bail completely.
-#: ../e-util/e-attachment.c:3571
+#: ../e-util/e-attachment.c:3430
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Не могу да сачувам „%s“"
 
-#: ../e-util/e-attachment.c:3574
+#: ../e-util/e-attachment.c:3433
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Не могу да сачувам прилог"
@@ -11354,13 +11355,13 @@ msgstr "Не могу да сачувам прилог"
 msgid "Attachment Properties"
 msgstr "Особине прилога"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "_Назив датотеке:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:422
+#: ../e-util/e-html-editor-image-dialog.c:510
+#: ../e-util/e-html-editor-link-dialog.c:243
 msgid "_Description:"
 msgstr "_Опис:"
 
@@ -11368,7 +11369,7 @@ msgstr "_Опис:"
 msgid "MIME Type:"
 msgstr "МИМЕ врста:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи аутоматски приказ прилога"
 
@@ -11380,13 +11381,13 @@ msgstr "Не могу да поставим као позадину"
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "Учитавам"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "Чувам"
 
@@ -11398,19 +11399,19 @@ msgstr "Сакриј линију при_лога"
 msgid "Show Attachment _Bar"
 msgstr "Прикажи линију п_рилога"
 
-#: ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Додај прилог"
 
-#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
+#: ../e-util/e-attachment-store.c:666 ../e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "При_ложи"
 
-#: ../e-util/e-attachment-store.c:538
+#: ../e-util/e-attachment-store.c:706
 msgid "Archive selected directories using this format:"
 msgstr "Аривирај изабране директоријуме у овом формату:"
 
-#: ../e-util/e-attachment-store.c:631
+#: ../e-util/e-attachment-store.c:799
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Сачувај прилог"
@@ -11418,89 +11419,57 @@ msgstr[1] "Сачувај прилоге"
 msgstr[2] "Сачувај прилоге"
 msgstr[3] "Сачувај прилог"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:826
 msgid "Do _not extract files from the attachment"
 msgstr "Не _распакуј датотеке из прилога"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:831
 msgid "Save extracted files _only"
 msgstr "Сачувај _само извучене датотеке"
 
-#: ../e-util/e-attachment-store.c:668
+#: ../e-util/e-attachment-store.c:836
 msgid "Save extracted files and the original _archive"
 msgstr "Сачувај извучене датотеке и оригиналне _архиве"
 
-#: ../e-util/e-attachment-view.c:428
+#: ../e-util/e-attachment-view.c:310
 msgid "Open With Other Application..."
 msgstr "Отвори другим програмом..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:317
 msgid "S_ave All"
 msgstr "Сач_увај све"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:324
 msgid "Sa_ve As"
 msgstr "Сачувај _као"
 
-#: ../e-util/e-attachment-view.c:451
+#: ../e-util/e-attachment-view.c:333
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Сачувај _као"
 
-#: ../e-util/e-attachment-view.c:461
+#: ../e-util/e-attachment-view.c:343
 msgid "A_dd Attachment..."
 msgstr "До_дај прилог..."
 
-#: ../e-util/e-attachment-view.c:468
+#: ../e-util/e-attachment-view.c:350
 #: ../modules/addressbook/e-book-shell-view-actions.c:1097
 #: ../modules/calendar/e-cal-shell-view-actions.c:1278
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 #: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
-msgid "_Hide"
-msgstr "_Сакриј"
-
-#: ../e-util/e-attachment-view.c:492
-msgid "Hid_e All"
-msgstr "Сак_риј све"
-
-#: ../e-util/e-attachment-view.c:499
-msgid "_View Inline"
-msgstr "Пре_гледај унутар"
-
-#: ../e-util/e-attachment-view.c:506
-msgid "Vie_w All Inline"
-msgstr "Пре_гледај све унутар"
-
-#: ../e-util/e-attachment-view.c:513
-msgid "_Zoom to 100%"
-msgstr "Увећај на _100%"
-
-#: ../e-util/e-attachment-view.c:515
-msgid "Zoom the image to its natural size"
-msgstr "Поставља увећање слике на њену оригиналну величину"
-
-#: ../e-util/e-attachment-view.c:520
-msgid "_Zoom to window"
-msgstr "У_клопи у прозор"
-
-#: ../e-util/e-attachment-view.c:522
-msgid "Zoom large images to not be wider than the window width"
-msgstr "Умањује велике слике тако да се уклопе у ширину прозора"
-
-#: ../e-util/e-attachment-view.c:880
+#: ../e-util/e-attachment-view.c:660
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Отвори програмом „%s“"
 
-#: ../e-util/e-attachment-view.c:883
+#: ../e-util/e-attachment-view.c:663
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Отвори овај прилог у „%s“"
@@ -11522,40 +11491,40 @@ msgstr "Умножава садржај књиге локално за рад в
 msgid "Ctrl-click to open a link"
 msgstr "Притисните тастер Ктрл и кликните да отворите везу"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Претходни месец"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Следећи месец"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Претходна година"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Следећа година"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Месечни календар"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
@@ -11653,7 +11622,7 @@ msgid "popup list"
 msgstr "искачућа листа"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11664,7 +11633,7 @@ msgstr "Сада"
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
 #: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/itip-formatter/itip-view.c:221
+#: ../modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Данас"
 
@@ -11951,9 +11920,9 @@ msgstr "светлољубичаста"
 msgid "white"
 msgstr "бела"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
 #: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Основно"
@@ -12019,7 +11988,7 @@ msgid "Invalid Time Value"
 msgstr "Неисправно време"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Сутра"
 
@@ -12120,7 +12089,7 @@ msgstr "_Осмех"
 #. Translators: :-|
 #: ../e-util/e-emoticon-chooser.c:50
 msgid "_Plain"
-msgstr "_Равни"
+msgstr "_Нормалан"
 
 #. Translators: :-!
 #: ../e-util/e-emoticon-chooser.c:52
@@ -12229,10 +12198,10 @@ msgstr[3] "пре %d секунде"
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "%d секунда у будућности"
-msgstr[1] "%d секунде у будућности"
-msgstr[2] "%d секунди у будућности"
-msgstr[3] "%d секунда у будућности"
+msgstr[0] "за %d секунду"
+msgstr[1] "за %d секунде"
+msgstr[2] "за %d секунди"
+msgstr[3] "за %d секунду"
 
 #: ../e-util/e-filter-datespec.c:68
 #, c-format
@@ -12247,10 +12216,10 @@ msgstr[3] "пре %d минут"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "%d минут у будућности"
-msgstr[1] "%d минута у будућности"
-msgstr[2] "%d минута у будућности"
-msgstr[3] "%d минут у будућности"
+msgstr[0] "за %d минут"
+msgstr[1] "за %d минута"
+msgstr[2] "за %d минута"
+msgstr[3] "за %d минут"
 
 #: ../e-util/e-filter-datespec.c:70
 #, c-format
@@ -12265,10 +12234,10 @@ msgstr[3] "пре %d сат"
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "%d сат у будућности"
-msgstr[1] "%d сата у будућности"
-msgstr[2] "%d сати у будућности"
-msgstr[3] "%d сат у будућности"
+msgstr[0] "за %d сат"
+msgstr[1] "за %d сата"
+msgstr[2] "за %d сати"
+msgstr[3] "за %d сат"
 
 #: ../e-util/e-filter-datespec.c:72
 #, c-format
@@ -12283,10 +12252,10 @@ msgstr[3] "пре %d дан"
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "%d дан у будућности"
-msgstr[1] "%d дана у будућности"
-msgstr[2] "%d дана у будућности"
-msgstr[3] "%d дан у будућности"
+msgstr[0] "за %d дан"
+msgstr[1] "за %d дана"
+msgstr[2] "за %d дана"
+msgstr[3] "за %d дан"
 
 #: ../e-util/e-filter-datespec.c:74
 #, c-format
@@ -12301,10 +12270,10 @@ msgstr[3] "пре %d недељу"
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "%d недеља у будућности"
-msgstr[1] "%d недеље у будућности"
-msgstr[2] "%d недеља у будућности"
-msgstr[3] "%d недеља у будућности"
+msgstr[0] "за %d недељу"
+msgstr[1] "за %d недеље"
+msgstr[2] "за %d недеља"
+msgstr[3] "за %d недељу"
 
 #: ../e-util/e-filter-datespec.c:76
 #, c-format
@@ -12319,10 +12288,10 @@ msgstr[3] "пре %d месец"
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "%d месец у будућности"
-msgstr[1] "%d месеца у будућности"
-msgstr[2] "%d месеци у будућност"
-msgstr[3] "%d месец у будућности"
+msgstr[0] "за %d месец"
+msgstr[1] "за %d месеца"
+msgstr[2] "за %d месеци"
+msgstr[3] "за %d месец"
 
 #: ../e-util/e-filter-datespec.c:78
 #, c-format
@@ -12337,10 +12306,10 @@ msgstr[3] "пре %d годину"
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "%d година у будућности"
-msgstr[1] "%d године у будућности"
-msgstr[2] "%d година у будућности"
-msgstr[3] "%d година у будућности"
+msgstr[0] "за %d годину"
+msgstr[1] "за %d године"
+msgstr[2] "за %d година"
+msgstr[3] "за %d годину"
 
 #: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
@@ -12364,23 +12333,23 @@ msgstr "Изаберите време за поређење"
 msgid "Choose a File"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:765
 msgid "R_ule name:"
 msgstr "Назив _правила:"
 
-#: ../e-util/e-filter-rule.c:811
+#: ../e-util/e-filter-rule.c:815
 msgid "all the following conditions"
 msgstr "свим следећим условима"
 
-#: ../e-util/e-filter-rule.c:812
+#: ../e-util/e-filter-rule.c:816
 msgid "any of the following conditions"
 msgstr "било ком од следећих услова"
 
-#: ../e-util/e-filter-rule.c:818
+#: ../e-util/e-filter-rule.c:822
 msgid "_Find items which match:"
 msgstr "_Пронађи ставке које одговарају:"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:845
 msgid "Find items that meet the following conditions"
 msgstr "Пронађите ставке које задовољавају следеће услове"
 
@@ -12393,8 +12362,8 @@ msgstr "Пронађите ставке које задовољавају сле
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
+#: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:139
@@ -12402,874 +12371,860 @@ msgstr "Пронађите ставке које задовољавају сле
 msgid "None"
 msgstr "Ништа"
 
-#: ../e-util/e-filter-rule.c:857
+#: ../e-util/e-filter-rule.c:861
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../e-util/e-filter-rule.c:859
+#: ../e-util/e-filter-rule.c:863
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../e-util/e-filter-rule.c:860
+#: ../e-util/e-filter-rule.c:864
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../e-util/e-filter-rule.c:867
 msgid "I_nclude threads:"
 msgstr "Укључи _нити:"
 
-#: ../e-util/e-filter-rule.c:942
+#: ../e-util/e-filter-rule.c:946
 msgid "A_dd Condition"
 msgstr "Додај _услов"
 
-#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
 #: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Долазно"
 
-#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
+#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Одлазно"
 
-#: ../e-util/e-html-editor-actions.c:58
+#: ../e-util/e-html-editor-actions.c:82
 msgid "Failed to insert HTML file."
 msgstr "Не могу да уметнем ХТМЛ датотеку."
 
-#: ../e-util/e-html-editor-actions.c:95
+#: ../e-util/e-html-editor-actions.c:120
 msgid "Failed to insert text file."
 msgstr "Не могу да уметнем текстуалну датотеку."
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:321
 msgid "Insert HTML File"
 msgstr "Уметни ХТМЛ датотеку"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:327
 msgid "HTML file"
 msgstr "ХТМЛ датотека"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:354
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Уметни слику"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:412
 msgid "Insert text file"
 msgstr "Уметни текстуалну датотеку"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:418
 msgid "Text file"
 msgstr "Текстуална датотека"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:866
 msgid "Copy selected text to the clipboard"
 msgstr "Умножава изабрани текст у списак исечака"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:873
 msgid "Cut selected text to the clipboard"
 msgstr "Сече изабрани текст у списак исечака"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:880
 msgid "Paste text from the clipboard"
 msgstr "Убацује текст из списка исечака"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:887
 msgid "Redo the last undone action"
 msgstr "Понавља последњу опозвану радњу"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:901
 msgid "Undo the last action"
 msgstr "Враћа последњу радњу"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:922
 msgid "For_mat"
 msgstr "_Формат"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:929
 msgid "_Paragraph Style"
 msgstr "Стил _пасуса"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-image-dialog.c:587
 msgid "_Alignment"
 msgstr "По_равнање"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:950
 msgid "Current _Languages"
 msgstr "Тренутни _језици"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:967
 msgid "_Increase Indent"
 msgstr "_Веће увлачење"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:969
 msgid "Increase Indent"
 msgstr "Веће увлачење"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:974
 msgid "_HTML File..."
 msgstr "_ХТМЛ датотека..."
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:981
 msgid "Te_xt File..."
 msgstr "_Текстуална датотека"
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:988
 msgid "Paste _Quotation"
 msgstr "Уметни _цитат"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:995
 msgid "_Find..."
 msgstr "_Нађи..."
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:997
 msgid "Search for text"
 msgstr "Текст за претрагу"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1002
 msgid "Find A_gain"
 msgstr "Н_ађи наредно"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1009
 msgid "Re_place..."
 msgstr "_Замени..."
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1011
 msgid "Search for and replace text"
 msgstr "Тражи жељени текст и мења га другим"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1016
 msgid "Check _Spelling..."
 msgstr "_Провери писање..."
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1023
 msgid "_Decrease Indent"
 msgstr "_Мање увлачење"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1025
 msgid "Decrease Indent"
 msgstr "Мање увлачење"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1030
 msgid "_Wrap Lines"
 msgstr "П_релом линија"
 
-#: ../e-util/e-html-editor-actions.c:1249
-msgid "Open Inspector"
-msgstr "Отворени инспектор"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1040
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Средина"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1042
 msgid "Center Alignment"
 msgstr "Средишње поравнање"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1047
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Лево"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1049
 msgid "Left Alignment"
 msgstr "Поравнање по левој страни"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1054
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Десно"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1056
 msgid "Right Alignment"
 msgstr "Поравнање по десној страни"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1064
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_ХТМЛ"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1066
 msgid "HTML editing mode"
 msgstr "Режим за уређивање ХТМЛ поруке"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1071
 msgid "Plain _Text"
 msgstr "Обичан _текст"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1073
 msgid "Plain text editing mode"
 msgstr "Режим уређивања за обичан текст"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1081
 msgid "_Normal"
 msgstr "_Обично"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Header _1"
 msgstr "Наслов _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Header _2"
 msgstr "Наслов _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1102
 msgid "Header _3"
 msgstr "Наслов _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Header _4"
 msgstr "Наслов _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1116
 msgid "Header _5"
 msgstr "Наслов _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1123
 msgid "Header _6"
 msgstr "Наслов _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "_Preformatted"
 msgstr "Пр_едодређено"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "A_ddress"
 msgstr "А_дреса"
 
-#: ../e-util/e-html-editor-actions.c:1363
-msgid "_Blockquote"
-msgstr "_Цитирање одељка"
-
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "_Bulleted List"
 msgstr "Набрајање _симболима"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "_Roman Numeral List"
 msgstr "Набрајање _римским бројевима"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Numbered _List"
 msgstr "Набрајање _бројевима"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1165
 msgid "_Alphabetical List"
 msgstr "Нарајање с_ловима"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "_Image..."
 msgstr "_Слика..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1184
 msgid "Insert Image"
 msgstr "Умеће слику"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1226
 msgid "_Link..."
 msgstr "_Веза..."
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1191
 msgid "Insert Link"
 msgstr "Умеће везу"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1241
 msgid "_Rule..."
 msgstr "Прави_ло..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1200
 msgid "Insert Rule"
 msgstr "Умеће правило"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1248
 msgid "_Table..."
 msgstr "_Табела..."
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1207
 msgid "Insert Table"
 msgstr "Умеће табелу"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1212
 msgid "_Cell..."
 msgstr "_Ћелија"
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1233
 msgid "Pa_ge..."
 msgstr "Ст_раница..."
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Font _Size"
 msgstr "Величина _фонта"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "_Font Style"
 msgstr "Врста фо_нта"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Paste As _Text"
 msgstr "Уметни _као текст"
 
-#: ../e-util/e-html-editor-actions.c:1508
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-text-dialog.c:203
 msgid "_Bold"
 msgstr "_Подебљано"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Bold"
 msgstr "Подебљано"
 
-#: ../e-util/e-html-editor-actions.c:1516
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Italic"
 msgstr "_Искошено"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Italic"
 msgstr "Искошено"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "_Plain Text"
 msgstr "О_бичан текст"
 
-#: ../e-util/e-html-editor-actions.c:1532
-#: ../e-util/e-html-editor-text-dialog.c:246
+#: ../e-util/e-html-editor-actions.c:1306
+#: ../e-util/e-html-editor-text-dialog.c:235
 msgid "_Strikethrough"
 msgstr "Пре_цртано"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Strikethrough"
 msgstr "Прецртано"
 
-#: ../e-util/e-html-editor-actions.c:1540
-#: ../e-util/e-html-editor-text-dialog.c:236
+#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Underline"
 msgstr "Подв_учено"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1316
 msgid "Underline"
 msgstr "Подвучени текст"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1326
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1568
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1576
+#: ../e-util/e-html-editor-actions.c:1350
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "Cell Contents"
 msgstr "Садржај ћелије"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Column"
 msgstr "Колона"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Row"
 msgstr "Ред"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Table"
 msgstr "Табела"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1424
 msgid "Table Delete"
 msgstr "Брисање табеле"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
-msgid "Input Methods"
-msgstr "Начини уноса"
-
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1665
+#: ../e-util/e-html-editor-actions.c:1432
 msgid "Table Insert"
 msgstr "Уметање табеле"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1439
 msgid "Properties"
 msgstr "Особине"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1457
 msgid "Column After"
 msgstr "Колона након"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "Column Before"
 msgstr "Колона пре"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "Insert _Link"
 msgstr "Уметни _везу"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1478
 msgid "Row Above"
 msgstr "Ред изнад"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "Row Below"
 msgstr "Ред испод"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "Cell..."
 msgstr "Ћелија..."
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1499
 msgid "Image..."
 msgstr "Слика..."
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Link..."
 msgstr "Веза..."
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "Page..."
 msgstr "Страница..."
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paragraph..."
 msgstr "Пасус..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Rule..."
 msgstr "Правило..."
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1535
 msgid "Table..."
 msgstr "Табеле..."
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "Text..."
 msgstr "Текст..."
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Remove Link"
 msgstr "Уклони везу"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1566
 msgid "Add Word to Dictionary"
 msgstr "Додај реч у речник"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1573
 msgid "Ignore Misspelled Word"
 msgstr "Занемари погрешно написане речи"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "Add Word To"
 msgstr "Додај реч у"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../e-util/e-html-editor-actions.c:1589
 msgid "More Suggestions"
 msgstr "Још предлога"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1950
+#: ../e-util/e-html-editor-actions.c:1713
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s речник"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:1792
 msgid "_Emoticon"
 msgstr "_Смајлић"
 
 # shell:noshell-reason title
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Insert Emoticon"
 msgstr "Уметни смајлић"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:1861
 msgid "Re_place"
 msgstr "_Замени"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:1864
 msgid "_Image"
 msgstr "_Слика"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:1867
 msgid "_Link"
 msgstr "_Веза"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:1871
 msgid "_Rule"
 msgstr "_Правило"
 
-#: ../e-util/e-html-editor-actions.c:2122
-#: ../e-util/e-html-editor-cell-dialog.c:738
+#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-cell-dialog.c:450
 msgid "_Table"
 msgstr "_Табела"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:689
 msgid "Paragraph Style"
 msgstr "Стил пасуса"
 
-#: ../e-util/e-html-editor.c:718
+#: ../e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Режим за уређивање"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Боја фонта"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Величина фонта"
 
-#: ../e-util/e-html-editor-cell-dialog.c:698
+#: ../e-util/e-html-editor-cell-dialog.c:410
 msgid "<b>Scope</b>"
 msgstr "<b>Опсег</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-cell-dialog.c:424
 msgid "C_ell"
 msgstr "_Ћелија"
 
-#: ../e-util/e-html-editor-cell-dialog.c:725
+#: ../e-util/e-html-editor-cell-dialog.c:437
 msgid "_Row"
 msgstr "_Ред"
 
-#: ../e-util/e-html-editor-cell-dialog.c:751
+#: ../e-util/e-html-editor-cell-dialog.c:463
 msgid "Col_umn"
 msgstr "_Колона"
 
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:473
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Поравнање и понашање</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:774
-#: ../e-util/e-html-editor-hrule-dialog.c:413
-#: ../e-util/e-html-editor-table-dialog.c:900
+#: ../e-util/e-html-editor-cell-dialog.c:486
+#: ../e-util/e-html-editor-hrule-dialog.c:330
+#: ../e-util/e-html-editor-table-dialog.c:651
 msgid "Left"
 msgstr "Лево"
 
-#: ../e-util/e-html-editor-cell-dialog.c:775
-#: ../e-util/e-html-editor-hrule-dialog.c:415
-#: ../e-util/e-html-editor-table-dialog.c:901
+#: ../e-util/e-html-editor-cell-dialog.c:487
+#: ../e-util/e-html-editor-hrule-dialog.c:332
+#: ../e-util/e-html-editor-table-dialog.c:652
 msgid "Center"
 msgstr "Средина"
 
-#: ../e-util/e-html-editor-cell-dialog.c:776
-#: ../e-util/e-html-editor-hrule-dialog.c:417
-#: ../e-util/e-html-editor-table-dialog.c:902
+#: ../e-util/e-html-editor-cell-dialog.c:488
+#: ../e-util/e-html-editor-hrule-dialog.c:334
+#: ../e-util/e-html-editor-table-dialog.c:653
 msgid "Right"
 msgstr "Десно"
 
 # Белешке:
 # Додај белешку
-#: ../e-util/e-html-editor-cell-dialog.c:784
+#: ../e-util/e-html-editor-cell-dialog.c:496
 msgid "_Horizontal:"
 msgstr "_Водоравно:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-cell-dialog.c:504
+#: ../e-util/e-html-editor-image-dialog.c:577
 msgid "Top"
 msgstr "Врх"
 
-#: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-cell-dialog.c:505
+#: ../e-util/e-html-editor-image-dialog.c:578
 msgid "Middle"
 msgstr "Средина"
 
-#: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-cell-dialog.c:506
+#: ../e-util/e-html-editor-image-dialog.c:579
 msgid "Bottom"
 msgstr "Дно"
 
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:514
 msgid "_Vertical:"
 msgstr "_Усправно:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:808
+#: ../e-util/e-html-editor-cell-dialog.c:520
 msgid "_Wrap Text"
 msgstr "_Преламај текст"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:816
+#: ../e-util/e-html-editor-cell-dialog.c:528
 msgid "_Header Style"
 msgstr "Врста заглавља"
 
-#: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:812
+#: ../e-util/e-html-editor-cell-dialog.c:542
+#: ../e-util/e-html-editor-image-dialog.c:517
+#: ../e-util/e-html-editor-table-dialog.c:563
 msgid "<b>Layout</b>"
 msgstr "<b>Распоред</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:841
+#: ../e-util/e-html-editor-cell-dialog.c:553
 msgid "_Width"
 msgstr "_Ширина"
 
-#: ../e-util/e-html-editor-cell-dialog.c:880
+#: ../e-util/e-html-editor-cell-dialog.c:593
 msgid "Row S_pan:"
 msgstr "_Распон реда:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:894
+#: ../e-util/e-html-editor-cell-dialog.c:607
 msgid "Co_lumn Span:"
 msgstr "Р_аспон колоне:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:901
-#: ../e-util/e-html-editor-table-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:614
+#: ../e-util/e-html-editor-table-dialog.c:667
 msgid "<b>Background</b>"
 msgstr "<b>Позадина</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:914
-#: ../e-util/e-html-editor-table-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:627
+#: ../e-util/e-html-editor-table-dialog.c:680
 msgid "Transparent"
 msgstr "Провидна"
 
-#: ../e-util/e-html-editor-cell-dialog.c:922
+#: ../e-util/e-html-editor-cell-dialog.c:635
 msgid "C_olor:"
 msgstr "_Боја:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
-#: ../e-util/e-html-editor-table-dialog.c:945
+#: ../e-util/e-html-editor-cell-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:479
+#: ../e-util/e-html-editor-table-dialog.c:696
 msgid "Choose Background Image"
 msgstr "Изаберите боју позадине"
 
-#: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
-#: ../e-util/e-html-editor-table-dialog.c:950
+#: ../e-util/e-html-editor-cell-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:485
+#: ../e-util/e-html-editor-table-dialog.c:701
 msgid "Images"
 msgstr "Слике"
 
-#: ../e-util/e-html-editor-cell-dialog.c:948
+#: ../e-util/e-html-editor-cell-dialog.c:661
 msgid "_Image:"
 msgstr "_Слика_"
 
-#: ../e-util/e-html-editor-cell-dialog.c:955
-#: ../e-util/e-html-editor-page-dialog.c:660
-#: ../e-util/e-html-editor-table-dialog.c:970
+#: ../e-util/e-html-editor-cell-dialog.c:668
+#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-table-dialog.c:721
 msgid "_Remove image"
 msgstr "У_клони слику"
 
-#: ../e-util/e-html-editor-cell-dialog.c:975
+#: ../e-util/e-html-editor-cell-dialog.c:688
 msgid "Cell Properties"
 msgstr "Особине ћелије"
 
-#: ../e-util/e-html-editor-find-dialog.c:105
-#: ../e-util/e-html-editor-replace-dialog.c:90
-#: ../e-util/e-html-editor-replace-dialog.c:108
+#: ../e-util/e-html-editor-find-dialog.c:94
+#: ../e-util/e-html-editor-replace-dialog.c:70
 msgid "No match found"
 msgstr "Није нађено поклапање"
 
-#: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-find-dialog.c:217
+#: ../e-util/e-html-editor-replace-dialog.c:297
 msgid "Search _backwards"
 msgstr "Тражи у_назад"
 
-#: ../e-util/e-html-editor-find-dialog.c:167
+#: ../e-util/e-html-editor-find-dialog.c:224
 msgid "Case _Sensitive"
 msgstr "_Разликуј велика слова"
 
-#: ../e-util/e-html-editor-find-dialog.c:174
+#: ../e-util/e-html-editor-find-dialog.c:231
 msgid "_Wrap Search"
 msgstr "Пре_ламај"
 
-#: ../e-util/e-html-editor-find-dialog.c:213
+#: ../e-util/e-html-editor-find-dialog.c:270
 msgid "Find"
 msgstr "Нађи"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../e-util/e-html-editor-hrule-dialog.c:265
 msgid "<b>Size</b>"
 msgstr "<b>Величина</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:823
+#: ../e-util/e-html-editor-hrule-dialog.c:285
+#: ../e-util/e-html-editor-image-dialog.c:535
+#: ../e-util/e-html-editor-table-dialog.c:574
 msgid "_Width:"
 msgstr "_Ширина:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:393
+#: ../e-util/e-html-editor-hrule-dialog.c:310
 msgid "_Size:"
 msgstr "_Величина:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:400
+#: ../e-util/e-html-editor-hrule-dialog.c:317
 msgid "<b>Style</b>"
 msgstr "<b>Стил</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:425
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-table-dialog.c:660
 msgid "_Alignment:"
 msgstr "По_равнање:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:431
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "S_haded"
 msgstr "Осен_чено"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:448
+#: ../e-util/e-html-editor-hrule-dialog.c:365
 msgid "Rule properties"
 msgstr "Особине правила"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:467
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:766
+#: ../e-util/e-html-editor-table-dialog.c:517
 msgid "<b>General</b>"
 msgstr "<b>Опште</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:496
 msgid "_Source:"
 msgstr "И_звор:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:559
 msgid "_Height:"
 msgstr "_Висина:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:600
 msgid "_X-Padding:"
 msgstr "X-_попуна:"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:616
 msgid "_Y-Padding:"
 msgstr "Y-п_опуна:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-image-dialog.c:632
+#: ../e-util/e-html-editor-table-dialog.c:641
 msgid "_Border:"
 msgstr "_Ивица"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:642
 msgid "<b>Link</b>"
 msgstr "<b>Веза</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:400
+#: ../e-util/e-html-editor-image-dialog.c:660
+#: ../e-util/e-html-editor-link-dialog.c:221
 msgid "_URL:"
 msgstr "_УРЛ:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
-#: ../e-util/e-html-editor-link-dialog.c:405
+#: ../e-util/e-html-editor-image-dialog.c:665
+#: ../e-util/e-html-editor-link-dialog.c:226
 msgid "_Test URL..."
 msgstr "_Тест УРЛ:"
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:682
 msgid "Image Properties"
 msgstr "Особине слике"
 
-#: ../e-util/e-html-editor-link-dialog.c:429
+#: ../e-util/e-html-editor-link-dialog.c:250
 msgid "_Remove Link"
 msgstr "_Уклони везу"
 
-#: ../e-util/e-html-editor-link-dialog.c:454
+#: ../e-util/e-html-editor-link-dialog.c:275
 msgid "Link Properties"
 msgstr "Особине везе"
 
-#: ../e-util/e-html-editor-page-dialog.c:72
+#: ../e-util/e-html-editor-page-dialog.c:70
 msgid "Perforated Paper"
 msgstr "Перфориран папир"
 
-#: ../e-util/e-html-editor-page-dialog.c:81
+#: ../e-util/e-html-editor-page-dialog.c:79
 msgid "Blue Ink"
 msgstr "Плаво мастило"
 
-#: ../e-util/e-html-editor-page-dialog.c:90
+#: ../e-util/e-html-editor-page-dialog.c:88
 msgid "Paper"
 msgstr "Папир"
 
-#: ../e-util/e-html-editor-page-dialog.c:99
+#: ../e-util/e-html-editor-page-dialog.c:97
 msgid "Ribbon"
 msgstr "Трака"
 
-#: ../e-util/e-html-editor-page-dialog.c:108
+#: ../e-util/e-html-editor-page-dialog.c:106
 msgid "Midnight"
 msgstr "Поноћ"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
 #: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Нацрт"
 
-#: ../e-util/e-html-editor-page-dialog.c:135
+#: ../e-util/e-html-editor-page-dialog.c:133
 msgid "Graph Paper"
 msgstr "Милиметарски папир"
 
-#: ../e-util/e-html-editor-page-dialog.c:544
+#: ../e-util/e-html-editor-page-dialog.c:381
 msgid "<b>Colors</b>"
 msgstr "<b>Боје</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:563
+#: ../e-util/e-html-editor-page-dialog.c:400
 msgid "_Text:"
 msgstr "_Текст:"
 
-#: ../e-util/e-html-editor-page-dialog.c:578
+#: ../e-util/e-html-editor-page-dialog.c:415
 msgid "_Link:"
 msgstr "_Веза:"
 
-#: ../e-util/e-html-editor-page-dialog.c:593
+#: ../e-util/e-html-editor-page-dialog.c:430
 msgid "_Visited Link:"
 msgstr "_Посећена веза:"
 
-#: ../e-util/e-html-editor-page-dialog.c:608
+#: ../e-util/e-html-editor-page-dialog.c:445
 msgid "_Background:"
 msgstr "По_задина:"
 
-#: ../e-util/e-html-editor-page-dialog.c:616
+#: ../e-util/e-html-editor-page-dialog.c:453
 msgid "<b>Background Image</b>"
 msgstr "<b>Позадинска слика</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../e-util/e-html-editor-page-dialog.c:475
 #: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "_Шаблон:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-html-editor-page-dialog.c:653
+#: ../e-util/e-html-editor-page-dialog.c:490
 msgid "_Custom:"
 msgstr "_Произвољно:"
 
-#: ../e-util/e-html-editor-page-dialog.c:680
+#: ../e-util/e-html-editor-page-dialog.c:517
 msgid "Page Properties"
 msgstr "Особине странице"
 
@@ -13285,7 +13240,7 @@ msgstr "<b>Поравнање</b>"
 msgid "Paragraph Properties"
 msgstr "Особине пасуса"
 
-#: ../e-util/e-html-editor-replace-dialog.c:163
+#: ../e-util/e-html-editor-replace-dialog.c:92
 #, c-format
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
@@ -13294,134 +13249,126 @@ msgstr[1] "%d појаве су замењене"
 msgstr[2] "%d појава је замењено"
 msgstr[3] "Појава је замењена"
 
-#: ../e-util/e-html-editor-replace-dialog.c:227
+#: ../e-util/e-html-editor-replace-dialog.c:280
 msgid "R_eplace:"
 msgstr "_Замени:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:239
+#: ../e-util/e-html-editor-replace-dialog.c:289
 msgid "_With:"
 msgstr "_Ширина:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:251
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgid "_Case sensitive"
 msgstr "_Разликуј велика и мала слова"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:305
 msgid "Wra_p search"
 msgstr "Пре_ламај"
 
-#: ../e-util/e-html-editor-replace-dialog.c:265
+#: ../e-util/e-html-editor-replace-dialog.c:315
 msgid "_Skip"
 msgstr "Прес_кочи"
 
-#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-html-editor-replace-dialog.c:323
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../e-util/e-html-editor-replace-dialog.c:281
+#: ../e-util/e-html-editor-replace-dialog.c:331
 msgid "Replace _All"
 msgstr "Замени _све"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../e-util/e-html-editor-replace-dialog.c:351
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Замени"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#: ../e-util/e-html-editor-spell-check-dialog.c:85
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Предлог за „%s“</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:390
 msgid "<b>Suggestions</b>"
 msgstr "<b>Предлози</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:425
 msgid "Replace"
 msgstr "Замени"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:434
 msgid "Replace All"
 msgstr "Замени све"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:110
+#: ../e-util/e-html-editor-spell-check-dialog.c:443
+#: ../mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Занемари"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:452
 msgid "Skip"
 msgstr "Прескочи"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:461
 msgid "Back"
 msgstr "Назад"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:470
 msgid "<b>Dictionary</b>"
 msgstr "<b>Речник</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:490
 msgid "Add word"
 msgstr "Додај реч"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: ../e-util/e-html-editor-table-dialog.c:788
+#: ../e-util/e-html-editor-table-dialog.c:539
 msgid "_Rows:"
 msgstr "_Редови:"
 
-#: ../e-util/e-html-editor-table-dialog.c:805
+#: ../e-util/e-html-editor-table-dialog.c:556
 msgid "C_olumns:"
 msgstr "_Колоне:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:607
 msgid "_Spacing:"
 msgstr "_Размак:"
 
-#: ../e-util/e-html-editor-table-dialog.c:873
+#: ../e-util/e-html-editor-table-dialog.c:624
 msgid "_Padding:"
 msgstr "_Оквир:"
 
-#: ../e-util/e-html-editor-table-dialog.c:937
-#: ../e-util/e-html-editor-text-dialog.c:261
+#: ../e-util/e-html-editor-table-dialog.c:688
+#: ../e-util/e-html-editor-text-dialog.c:250
 msgid "_Color:"
 msgstr "_Боја:"
 
-#: ../e-util/e-html-editor-table-dialog.c:963
+#: ../e-util/e-html-editor-table-dialog.c:714
 msgid "Image:"
 msgstr "Слика:"
 
-#: ../e-util/e-html-editor-table-dialog.c:990
+#: ../e-util/e-html-editor-table-dialog.c:741
 msgid "Table Properties"
 msgstr "Особине табеле"
 
-#: ../e-util/e-html-editor-text-dialog.c:281
+#: ../e-util/e-html-editor-text-dialog.c:270
 msgid "Si_ze:"
 msgstr "_Величина:"
 
-#: ../e-util/e-html-editor-text-dialog.c:296
+#: ../e-util/e-html-editor-text-dialog.c:285
 msgid "Text Properties"
 msgstr "Особине текста"
 
-#: ../e-util/e-html-editor-view.c:6381
-msgid "Changed property"
-msgstr "Измењена особина"
-
-#: ../e-util/e-html-editor-view.c:6382
-msgid "Whether editor changed"
-msgstr "Да ли је уређивач променио"
-
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -13429,32 +13376,32 @@ msgstr ""
 "Изаберите датотеку коју желите да увезете у Еволуцију и из листе изаберите "
 "којег је типа та датотека."
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "_Врста датотеке:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Изаберите одредиште за овај увоз"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
-msgstr "Изаберите тип увозника:"
+msgstr "Изаберите врсту увозника:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Увези податке и подешавања из _старијих програма"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "Изаберите податке које желите да увезете:"
 
-#: ../e-util/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:538
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -13464,40 +13411,40 @@ msgstr ""
 "Елм, иКалендар, К-пошта. Нема подешавања за увоз. Уколико желите да покушате "
 "поново, кликните на дугме „Назад“."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "_Откажи увожење"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Прегледај податке који се увозе"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "Увези податке"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "Изаберите са списка које врсте датотека желите да увезете."
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Помоћник Еволуције за увоз"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Увези локацију"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13507,19 +13454,19 @@ msgstr ""
 "Овај помоћник ће вас провести кроз поступак увоза спољних датотека у "
 "Еволуцију."
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Врста увозника"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Изаберите информацију за увоз"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Кликните на „Примени“ да започнете увоз датотеке у Еволуцију."
 
@@ -13527,35 +13474,35 @@ msgstr "Кликните на „Примени“ да започнете ув
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Затвори"
 
-#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Сачувај и затвори"
 
-#: ../e-util/e-mail-signature-editor.c:533
+#: ../e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Уреди потпис"
 
-#: ../e-util/e-mail-signature-editor.c:566
+#: ../e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "Назив _потписа:"
 
-#: ../e-util/e-mail-signature-editor.c:602
+#: ../e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Без имена"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Додај ск_рипту"
 
-#: ../e-util/e-mail-signature-manager.c:426
+#: ../e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Додај скрипту за потпис"
 
-#: ../e-util/e-mail-signature-manager.c:497
+#: ../e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Уреди скрипту потписа"
 
@@ -13589,35 +13536,35 @@ msgstr ""
 "Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
 "врши из доњег оквира."
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:255
 msgid "Could not open the link."
 msgstr "Не могу да отворим везу."
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:338
 msgid "Could not display help for Evolution."
 msgstr "Не могу да прикажем помоћ за Еволуцију."
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2503
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Отварам календар „%s“"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2506
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Отварам списак белешки „%s“"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2509
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Отварам списак задатака „%s“"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2512
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Отварам адресар „%s“"
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3290
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Не приказуј више ову поруку"
@@ -13836,48 +13783,48 @@ msgid "Edit Rule"
 msgstr "Уреди правило"
 
 # bug: plural-forms if put as "%d matches"
-#: ../e-util/e-search-bar.c:83
+#: ../e-util/e-search-bar.c:84
 #, c-format
 msgid "Matches: %u"
 msgstr "Поклапања: %u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Затвори траку претраге"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Про_нађи:"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Очисти претрагу"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:655
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Нађи претходно појављивање израза"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:667
 msgid "_Next"
 msgstr "_Следеће"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Нађи следеће појављивање израза"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "_Упореди величину слова"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Стигао сам до дна странице, настављам са врха"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Стигао сам до врха странице, настављам са дна"
 
@@ -14067,6 +14014,10 @@ msgstr "Прикажи"
 msgid "Group name"
 msgstr "Назив групе"
 
+#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:746
+msgid "_Hide"
+msgstr "_Сакриј"
+
 #: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
 msgid "_Show"
 msgstr "_Прикажи"
@@ -14157,7 +14108,7 @@ msgstr "Не могу да отворим датотеку „{0}“."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Не могу да уклоним извор података „{0}“."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Пријављена грешка бејаше „{1}“."
 
@@ -14304,11 +14255,11 @@ msgstr "Очисти _све"
 msgid "_Show field in View"
 msgstr "_Прикажи поље у прегледу"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
 msgid "Ascending"
 msgstr "Растуће"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
 msgid "Descending"
 msgstr "Опадајуће"
 
@@ -14374,60 +14325,61 @@ msgstr[1] "%s (%d ставке)"
 msgstr[2] "%s (%d ставки)"
 msgstr[3] "%s (једна ставка)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "Прилагодите тренутни преглед"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "Разврстај _растуће"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Разврстај _опадајуће"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "_Не разврставај"
+#: ../e-util/e-table-header-item.c:1648
+#| msgid "_Reset Order"
+msgid "_Reset sort"
+msgstr "_Поврати редослед"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Групиши по овоме _пољу"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Групиши по _оквиру"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Уклони ову _колону"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "Додај ко_лону..."
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "По_равнање"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "На_јбоље уклапање"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "Обликуј коло_не..."
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "Прила_годи тренутни преглед..."
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "_Поређај по"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "_Произвољно"
 
@@ -14435,12 +14387,16 @@ msgstr "_Произвољно"
 msgid "Select All"
 msgstr "Изабери све"
 
+#: ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "Начини уноса"
+
 # Универзално време, или УТ
 # Ваљда УВ?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
-#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
-#: ../e-util/e-timezone-dialog.c:804
+#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
+#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
+#: ../e-util/e-timezone-dialog.c:901
 msgid "UTC"
 msgstr "КУВ"
 
@@ -14491,94 +14447,99 @@ msgid "Flags"
 msgstr "Опције"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:779
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:337
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../e-util/e-web-view.c:320
+#: ../e-util/e-web-view.c:339
 msgid "Copy the link to the clipboard"
 msgstr "Умножава везу у списак исечака"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:347
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у прегледнику"
 
-#: ../e-util/e-web-view.c:330
+#: ../e-util/e-web-view.c:349
 msgid "Open the link in a web browser"
 msgstr "Отвори везу у веб претраживачу"
 
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:357
 msgid "_Copy Email Address"
 msgstr "_Умножи е-адресу"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:364
 msgid "Copy _Raw Email Address"
 msgstr "Умножи са_мо е-адресу"
 
-#: ../e-util/e-web-view.c:347
+#: ../e-util/e-web-view.c:366
 msgid "Copy the raw email address to the clipboard"
 msgstr "Умножава само чисту адресу електронске поште у списак исечака"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:381
 msgid "_Copy Image"
 msgstr "_Умножи слику"
 
-#: ../e-util/e-web-view.c:364
+#: ../e-util/e-web-view.c:383
 msgid "Copy the image to the clipboard"
 msgstr "Умножите слику у оставу"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:388
 msgid "Save _Image..."
 msgstr "Сачувај _слику..."
 
-#: ../e-util/e-web-view.c:371
+#: ../e-util/e-web-view.c:390
 msgid "Save the image to a file"
 msgstr "Сачувајте слику у датотеку"
 
-#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
+#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1830
 msgid "Select all text and images"
 msgstr "Изабери сав текст и слике"
 
-#: ../e-util/e-web-view.c:1074
+#: ../e-util/e-web-view.c:1284
 #, c-format
 msgid "Click to call %s"
 msgstr "Кликните да позовете %s"
 
-#: ../e-util/e-web-view.c:1076
+#: ../e-util/e-web-view.c:1286
 msgid "Click to hide/unhide addresses"
 msgstr "Кликните да сакријете/откријете адресе"
 
-#: ../e-util/e-web-view.c:1087
+#: ../e-util/e-web-view.c:1297
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Иди на одељак %s ове поруке"
 
-#: ../e-util/e-web-view.c:1089
+#: ../e-util/e-web-view.c:1299
 msgid "Go to the beginning of the message"
 msgstr "Иди на почетак поруке"
 
-#: ../e-util/e-web-view.c:1093
+#: ../e-util/e-web-view.c:1303
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3651
 msgid "Copying image to clipboard"
 msgstr "Умножавам слику у оставу"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3839
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3875
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Чувам слику у „%s“"
 
+#: ../e-util/e-web-view.c:3970
+#, c-format
+msgid "Cannot get URI '%s', do not know how to download it."
+msgstr "Не могу да добавим путању „%s“, не знам како да је преузмем."
+
 #: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Поништи „Уметни текст“"
@@ -14625,7 +14586,7 @@ msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Не могу да преведем регуларан израз „{1}“."
 
 # mail:no-name-vfolder primary
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Недостаје име."
 
@@ -14758,12 +14719,12 @@ msgid "toggle the cell"
 msgstr "бирање ћелије"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "разгранава ред у Естабло које сдржи ову ћелију"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "скупља ред у Естабло које садржи ову ћелију"
 
@@ -14787,7 +14748,7 @@ msgstr "_Направи нови преглед"
 msgid "_Replace existing view"
 msgstr "_Замени постојећи преглед"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Да ли желите да сачувате измене?"
 
@@ -14795,7 +14756,7 @@ msgstr "Да ли желите да сачувате измене?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Овај потпис је промењен, али није сачуван."
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Одбаци измене"
 
@@ -14873,7 +14834,7 @@ msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:946
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14882,29 +14843,29 @@ msgstr[1] "Преузимам %d поруке"
 msgstr[2] "Преузимам %d порука"
 msgstr[3] "Преузимам поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:778
+#: ../libemail-engine/e-mail-folder-utils.c:786
 msgid "Scanning messages for duplicates"
 msgstr "Тражим дупликате у порукама"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1159
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Уклањам фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1340
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Датотека „%s“ је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1344
 msgid "File has been removed."
 msgstr "Датотека је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1421
 msgid "Removing attachments"
 msgstr "Уклањам прилоге"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1593
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -14913,68 +14874,67 @@ msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 msgstr[3] "Чувам једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1971
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Неисправна путања фасцикле „%s“"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
-#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1052
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
+#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Inbox"
 msgstr "Сандуче"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Drafts"
 msgstr "Нацрти"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 msgid "Outbox"
 msgstr "За слање"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Sent"
 msgstr "Послато"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../libemail-engine/e-mail-session.c:1262
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "Корисник је отказао радњу"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1362
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Није достављена одредишна адреса, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1375
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Није пронађен идентитет за коришћење, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:2362
+#: ../libemail-engine/e-mail-session.c:2405
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "Чекам на „%s“"
@@ -14984,26 +14944,26 @@ msgid "No mail transport service available"
 msgstr "Нема доступне услуге преноса поште"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Качим поруку на „%s“"
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспела примена одлазних пропусника: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Чувам послату поруку у „%s“"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15013,13 +14973,13 @@ msgstr ""
 "Уместо тога прикачићу у локалну фасциклу „Послато“."
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Не могу да прикачим у локалну фасциклу „Послато“: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "Слање поруке"
 
@@ -15051,8 +15011,8 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 "Не могу да издвојим изабране поруке. Један од разлога може бити и тај да је "
-"неисправно место фасцикле подешено у једном или више пропусника. Молим "
-"проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
+"неисправно место фасцикле подешено у једном или више филтера. Проверите ваше "
+"филтере у изборнику „Уређивање—>Филтери порука“.\n"
 "Изворна грешка беше: %s"
 
 #: ../libemail-engine/mail-ops.c:229
@@ -15060,7 +15020,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Преузимам пошту са „%s“"
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -15068,18 +15028,18 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Не могу да применим одлазне пропуснике. Један од разлога може бити и тај да "
-"је неисправно место фасцикле подешено у једном или више пропусника. Молим "
-"проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
+"Не могу да применим одлазне филтере. Један од разлога може бити и тај да је "
+"неисправно место фасцикле подешено у једном или више филтера. Проверите ваше "
+"филтере у изборнику „Уређивање—>Филтери порука“.\n"
 "Изворна грешка беше: %s"
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -15088,45 +15048,46 @@ msgstr[1] "Не могу да пошаљем %d од %d порука"
 msgstr[2] "Не могу да пошаљем %d од %d порука"
 msgstr[3] "Не могу да пошаљем %d од %d порукe"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+#| msgid "Cancelled"
+msgid "Cancelled."
 msgstr "Отказано."
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Премештам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Умножавам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам фасциклу „%s“"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Празним и смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацујем смеће у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Обрађујем измене фасцикле у „%s“"
@@ -15211,7 +15172,7 @@ msgstr "Под_разумевано"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1282
+#: ../modules/mail/em-composer-prefs.c:1281
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -15223,18 +15184,18 @@ msgstr "Назив налога"
 
 #: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
-msgstr "Није достављена адреса ел. поште"
+msgstr "Није достављена адреса е-поште"
 
 #: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
-msgstr "Недостаје домен у адреси ел. поште"
+msgstr "Недостаје домен у адреси е-поште"
 
 #: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "Затворите овај прозор"
 
-#: ../mail/e-mail-browser.c:288
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(Без субјекта)"
 
@@ -15252,7 +15213,7 @@ msgstr "_Прескочи претрагу"
 msgid "Evolution Account Assistant"
 msgstr "Помоћник налога Еволуције"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "_Обнови појединости"
 
@@ -15282,133 +15243,143 @@ msgstr ""
 msgid "Done"
 msgstr "Урађено"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "Проверавам подешавања сервера..."
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Користи општа подешавања"
 
-#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Приложи"
 
-#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Унутар (Аутлук стил)"
 
-#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Не цитирај"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Посебне фасцикле"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Фасцикла порука _нацрта:"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Изаберите фасциклу за чување порука нацрта."
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Изаберите фасциклу за чување послатих порука."
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Сачувај _одговоре у фасцикли поруке на коју се одговара"
 
-#: ../mail/e-mail-config-defaults-page.c:901
+#: ../mail/e-mail-config-defaults-page.c:908
 msgid "Archi_ve Folder:"
 msgstr "Фасцикла _архиве:"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Изаберите фасцикле за архивирање поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+#| msgid "_Template:"
+msgid "_Templates Folder:"
+msgstr "Фасцикла _шаблона:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+#| msgid "Choose a folder for deleted messages."
+msgid "Choose a folder to use for template messages."
+msgstr "Изаберите фасциклу за шаблонске поруке."
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "_Поврати основно"
 
-#: ../mail/e-mail-config-defaults-page.c:946
+#: ../mail/e-mail-config-defaults-page.c:981
 msgid "_Lookup Folders"
 msgstr "_Претражи фасциклу"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "Користи стварну фасциклу за _смеће:"
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Изаберите фасциклу за обрисане поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "Користи стварну фасциклу за _ђубре:"
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "Изаберите фасциклу за непожељне поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _графитну копију (Цц):"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _невидљиву графитну копију (Бцц):"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 msgid "Re_ply style:"
 msgstr "_Стил одговора:"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "Признанице поруке"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "_Пошаљи повратнице:"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Никада"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Увек"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Основно"
 
-#: ../mail/e-mail-config-identity-page.c:286
+#: ../mail/e-mail-config-identity-page.c:304
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -15417,12 +15388,12 @@ msgstr ""
 "Унесите име и електронску адресу. „Необавезна“ поља не морају бити попуњена, "
 "осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-identity-page.c:332
 #: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Подаци о налогу"
 
-#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-identity-page.c:370
 #: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
@@ -15431,56 +15402,59 @@ msgstr ""
 "Ово име ће бити корисно за препознавање налога.\n"
 "На пример, „Пословни“ или „Лични“."
 
-#: ../mail/e-mail-config-identity-page.c:369
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Required Information"
 msgstr "Обавезни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:378
+#: ../mail/e-mail-config-identity-page.c:396
 msgid "Full Nam_e:"
 msgstr "_Име и презиме:"
 
-#: ../mail/e-mail-config-identity-page.c:407
+#: ../mail/e-mail-config-identity-page.c:425
 msgid "Email _Address:"
-msgstr "Адреса _ел. поште:"
+msgstr "Адреса _е-поште:"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:474
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Додатни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/e-mail-config-identity-page.c:494
+#: ../mail/e-mail-config-identity-page.c:512
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/e-mail-config-identity-page.c:549
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../mail/e-mail-config-identity-page.c:585
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "Подаци за тражење сервера е-поште на основу унетих мејл адреса"
 
-#: ../mail/e-mail-config-identity-page.c:611
-msgid "Full Name cannot be empty"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:630
+#| msgid "Full Name cannot be empty"
+msgid "Full Name should not be empty"
 msgstr "Име и презиме не може бити празно"
 
-#: ../mail/e-mail-config-identity-page.c:618
+#: ../mail/e-mail-config-identity-page.c:637
 msgid "Email Address cannot be empty"
-msgstr "Адреса ел. поште не може бити празна"
+msgstr "Адреса е-поште не може бити празна"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:642
 msgid "Email Address is not a valid email"
-msgstr "Адреса ел. поште није исправна ел. пошта"
+msgstr "Адреса е-поште није исправна е-пошта"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:654
 msgid "Reply To is not a valid email"
-msgstr "Прималац није исправна ел. пошта"
+msgstr "Прималац није исправна е-пошта"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:665
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "Име налога не може бити празно"
@@ -15513,11 +15487,12 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
 #: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/mail/e-mail-shell-backend.c:731
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Опште"
@@ -15650,7 +15625,7 @@ msgstr "Име и презиме:"
 
 #: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
-msgstr "Адреса ел. поште:"
+msgstr "Адреса е-поште:"
 
 #: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
@@ -15701,30 +15676,58 @@ msgstr "Добродошли"
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:124
 msgid "_Add to Address Book..."
 msgstr "_Додај у адресар..."
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:131
 msgid "_To This Address"
 msgstr "_На ову адресу"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:138
 msgid "_From This Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:145
 msgid "Send _Reply To..."
 msgstr "_Пошаљи одговор..."
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:147
 msgid "Send a reply message to this address"
 msgstr "Пошаљите поруку одговора на ову адресу"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:154
 msgid "Create Search _Folder"
 msgstr "Направи фасциклу _претраге"
 
+#: ../mail/e-mail-display.c:753
+msgid "Hid_e All"
+msgstr "Сак_риј све"
+
+#: ../mail/e-mail-display.c:760
+msgid "_View Inline"
+msgstr "Пре_гледај унутар"
+
+#: ../mail/e-mail-display.c:767
+msgid "Vie_w All Inline"
+msgstr "Пре_гледај све унутар"
+
+#: ../mail/e-mail-display.c:774
+msgid "_Zoom to 100%"
+msgstr "Увећај на _100%"
+
+#: ../mail/e-mail-display.c:776
+msgid "Zoom the image to its natural size"
+msgstr "Поставља увећање слике на њену оригиналну величину"
+
+#: ../mail/e-mail-display.c:781
+msgid "_Zoom to window"
+msgstr "У_клопи у прозор"
+
+#: ../mail/e-mail-display.c:783
+msgid "Zoom large images to not be wider than the window width"
+msgstr "Умањује велике слике тако да се уклопе у ширину прозора"
+
 #: ../mail/e-mail-folder-create-dialog.c:327
 msgid "Create Folder"
 msgstr "Направи фасциклу"
@@ -15819,7 +15822,7 @@ msgid "_Later"
 msgstr "Касни_је"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "Add Label"
 msgstr "Додајте натпис"
 
@@ -15839,23 +15842,23 @@ msgstr ""
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
 msgid "Message Note"
 msgstr "Напомена поруке"
 
-#: ../mail/e-mail-notes.c:612
+#: ../mail/e-mail-notes.c:639
 msgid "Cannot find message in its folder summary"
 msgstr "Не могу да нађем поруку у њеном сажетку фасцикле"
 
-#: ../mail/e-mail-notes.c:815
+#: ../mail/e-mail-notes.c:842
 msgid "Storing changes..."
 msgstr "Смештам измене..."
 
-#: ../mail/e-mail-notes.c:940
+#: ../mail/e-mail-notes.c:968
 msgid "Edit Message Note"
 msgstr "Уредите напомену поруке"
 
-#: ../mail/e-mail-notes.c:1058
+#: ../mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Преузимам поруку..."
 
@@ -15887,11 +15890,11 @@ msgstr "Назив заглавља"
 msgid "Header Value"
 msgstr "Вредност заглавља"
 
-#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
+#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/e-mail-printer.c:155
+#: ../mail/e-mail-printer.c:153
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
@@ -15905,7 +15908,7 @@ msgid "Copy to Folder"
 msgstr "Умножи у фасциклу"
 
 #: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "Пре_мести"
 
@@ -15917,648 +15920,652 @@ msgstr "_Умножи"
 msgid "Deleting message note..."
 msgstr "Бришем напомену поруке..."
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1562
 msgid "_Do not ask me again."
 msgstr "_Не питај ме поново."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1568
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Увек занемари „Одговор-за:“ за дописне листе."
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1771
 msgid "Failed to retrieve message:"
 msgstr "Не могу да довучем поруку:"
 
-#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
+#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Преузимам поруку „%s“"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2004
 msgid "A_dd Sender to Address Book"
 msgstr "До_дај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
 msgid "Add sender to address book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2011
 msgid "_Archive..."
 msgstr "_Архива..."
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Премешта изабране поруке у фасциклу за архивирање поруке у овом налогу"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2018
 msgid "Check for _Junk"
 msgstr "Провери да ли има _ђубрета"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрира да ли међу изабраним порукама има ђубрета"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2025
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
 msgid "Copy selected messages to another folder"
 msgstr "Умножава изабране поруке у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2032
 msgid "_Delete Message"
 msgstr "_Обриши поруку"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
 msgid "Mark the selected messages for deletion"
 msgstr "Означите изабрану(е) поруку(е) за брисање"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2039
 msgid "_Add note..."
 msgstr "_Додај белешку..."
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041
 msgid "Add a note for the selected message"
 msgstr "Додајте белешку за изабрану поруку"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2046
 msgid "Delete no_te"
 msgstr "Обриши _белешку"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2048
 msgid "Delete the note for the selected message"
 msgstr "Обришите белешку за изабрану поруку"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2053
 msgid "_Edit note..."
 msgstr "_Уреди белешку..."
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2055
 msgid "Edit a note for the selected message"
 msgstr "Уредите белешку за изабрану поруку"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2060
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Направи правило пропусника за дописну _листу..."
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2062
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Наравите правило за пропуштање порука на ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2067
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Направи правило пропусника за _примаоце..."
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2069
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направите правило за пропуштање порука овим примаоцима"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2074
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Направи правило пропусника за _пошиљаоца..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2076
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направите правило за пропуштање порука са овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2081
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Направи правило пропусника за _наслов..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2083
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направите правило за прпуштање порука са овим насловом"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2088
 msgid "A_pply Filters"
 msgstr "При_мени пропуснике"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2090
 msgid "Apply filter rules to the selected messages"
 msgstr "Примените правила пропуштања на изабране поруке"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2095
 msgid "_Find in Message..."
 msgstr "П_ронађи у поруци..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2097
 msgid "Search for text in the body of the displayed message"
 msgstr "Потражите текст у телу приказане поруке"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2102
 msgid "_Clear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2104
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Уклоните ознаку за праћење са изабраних порука"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2109
 msgid "_Flag Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2111
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Поставите ознаку за праћење као завршену на изабраним порукама"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2116
 msgid "Follow _Up..."
 msgstr "Сле_ди..."
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2118
 msgid "Flag the selected messages for follow-up"
 msgstr "Означите изабране поруке за праћење"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
 msgid "_Attached"
 msgstr "При_ложено"
 
-#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
+#: ../modules/mail/e-mail-attachment-handler.c:434
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Проследите изабрану поруку некоме као прилог"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2130
 msgid "Forward As _Attached"
 msgstr "Проследи као _прилог"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
 msgid "_Inline"
 msgstr "Унут_ар"
 
-#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
+#: ../modules/mail/e-mail-attachment-handler.c:441
 msgid "Forward the selected message in the body of a new message"
 msgstr "Проследите изабрану поруку у телу нове поруке"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2144
 msgid "Forward As _Inline"
 msgstr "Проследи као _унутар поруке"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
+#: ../modules/mail/e-mail-attachment-handler.c:448
 msgid "Forward the selected message quoted like a reply"
 msgstr "Проследите изабрану поруку цитирану као одговор"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2158
 msgid "Forward As _Quoted"
 msgstr "Проследи као _цитат"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2165
 msgid "_Load Images"
 msgstr "_Учитај слике"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2167
 msgid "Force images in HTML mail to be loaded"
 msgstr "Присилите учитавање слика у ХТМЛ порукама"
 
-#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
+#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
 msgid "_Ignore Subthread"
 msgstr "За_немари подрасправу"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2174
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Аутоматски означава нове е-поруке у овој подрасправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
 msgid "_Ignore Thread"
 msgstr "_Занемари расправу"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2181
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Аутоматски означава нове е-поруке у овој расправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2186
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2188
 msgid "Mark the selected messages as important"
 msgstr "Означава изабрану поруку као важну"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2193
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2195
 msgid "Mark the selected messages as junk"
 msgstr "Означава изабрану поруку као нежељену пошту"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2200
 msgid "_Not Junk"
 msgstr "Ни_је ђубре"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2202
 msgid "Mark the selected messages as not being junk"
 msgstr "Означава изабрану поруку као пожељну пошту"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2207
 msgid "_Read"
 msgstr "Про_читано"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2209
 msgid "Mark the selected messages as having been read"
 msgstr "Означава изабрану поруку као прочитану"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
 msgid "Do not _Ignore Subthread"
 msgstr "Не занема_руј подрасправе"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2216
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Не означава нове поруке у овој подрасправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
+#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
 msgid "Do not _Ignore Thread"
 msgstr "Не занемар_уј расправе"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2223
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Не означава нове поруке у овој расправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2228
 msgid "Uni_mportant"
 msgstr "Не_важно"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2230
 msgid "Mark the selected messages as unimportant"
 msgstr "Означите изабрану(е) поруку(е) као неважно"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2235
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2237
 msgid "Mark the selected messages as not having been read"
 msgstr "Означите изабрану(е) поруку(е) као непрочитано"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
 msgid "Open the selected messages in the composer for editing"
 msgstr "Отворите изабрану поруку у састављачу ради уређивања"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2249
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2251
 msgid "Open a window for composing a mail message"
 msgstr "Отворите прозор за састављање поруке"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2256
 msgid "_Open in New Window"
 msgstr "_Отвори у новом прозору"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2258
 msgid "Open the selected messages in a new window"
 msgstr "Отворите изабране поруке у новом прозору"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2263
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2265
 msgid "Move selected messages to another folder"
 msgstr "Преместите изабрану(е) поруку(е) у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2270
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2272
 msgid "Display the next message"
 msgstr "Прикажите следећу поруку"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2277
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2279
 msgid "Display the next important message"
 msgstr "Прикажите следећу важну поруку"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2284
 msgid "Next _Thread"
 msgstr "_Следећа расправа"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2286
 msgid "Display the next thread"
 msgstr "Прикажите следећу расправу"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2291
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2293
 msgid "Display the next unread message"
 msgstr "Прикажите следећу непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2298
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2300
 msgid "Display the previous message"
 msgstr "Прикажите претходну поруку"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2305
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2307
 msgid "Display the previous important message"
 msgstr "Прикажите претходну важну поруку"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2312
 msgid "Previous T_hread"
 msgstr "_Претходна тема"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2314
 msgid "Display the previous thread"
 msgstr "Прикажите претходну тему"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2319
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2321
 msgid "Display the previous unread message"
 msgstr "Прикажите претходну непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2328
 msgid "Print this message"
 msgstr "Штампајте ову поруку"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2335
 msgid "Preview the message to be printed"
 msgstr "Прегледајте поруку пред штампу"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преусмерите (без читања) изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2347
 msgid "Remo_ve Attachments"
 msgstr "_Уклони прилоге"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2349
 msgid "Remove attachments"
 msgstr "Уклоните прилоге"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2354
 msgid "Remove Du_plicate Messages"
 msgstr "Уклони _дуплиране поруке"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2356
 msgid "Checks selected messages for duplicates"
 msgstr "Проверите изабране поруке за дупликате"
 
-#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:397
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Саставите одговор свим примаоцима изабране поруке"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:404
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Саставите одговор дописној листи изабране поруке"
 
-#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Саставите одговор пошиљаоцу изабране поруке"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2382
 msgid "_Save as mbox..."
 msgstr "_Сачувај као мбокс..."
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2384
 msgid "Save selected messages as an mbox file"
 msgstr "Сачувајте изабране поруке као „mbox“ датотеку"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2389
 msgid "_Message Source"
 msgstr "Изво_рни код поруке"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2391
 msgid "Show the raw email source of the message"
 msgstr "Прикажите изворни код електронске поруке"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2403
 msgid "_Undelete Message"
 msgstr "П_оврати поруку"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2405
 msgid "Undelete the selected messages"
 msgstr "Повратите изабране поруке"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2410
 msgid "_Normal Size"
 msgstr "_Уобичајена величина"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2412
 msgid "Reset the text to its original size"
 msgstr "Вратите текст на оригиналну величину"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2417
 msgid "_Zoom In"
 msgstr "У_већај"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2419
 msgid "Increase the text size"
 msgstr "Увећајте величину текста"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2426
 msgid "Decrease the text size"
 msgstr "Умањите величину текста"
 
-#: ../mail/e-mail-reader.c:2394
+#: ../mail/e-mail-reader.c:2433
 msgid "Cre_ate"
 msgstr "_Направи"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2440
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
 msgid "F_orward As"
 msgstr "_Проследи као"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2454
 msgid "_Group Reply"
 msgstr "О_дговори групи"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2461
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2468
 msgid "Mar_k As"
 msgstr "О_значи као"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2475
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2482
 msgid "_Zoom"
 msgstr "Ув_ећај"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2492
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Направи фасциклу претраге са дописне _листе..."
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2494
 msgid "Create a search folder for this mailing list"
 msgstr "Направите фасциклу претраге за ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2499
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Направи фасциклу претраге од при_малаца..."
 
-#: ../mail/e-mail-reader.c:2462
+#: ../mail/e-mail-reader.c:2501
 msgid "Create a search folder for these recipients"
 msgstr "Направите фасциклу претраге за ове примаоце"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2506
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Направи фасциклу претраге од по_шиљаоца..."
 
-#: ../mail/e-mail-reader.c:2469
+#: ../mail/e-mail-reader.c:2508
 msgid "Create a search folder for this sender"
 msgstr "Направите фасциклу претраге за овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2513
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Направи фасциклу претраге из _наслова..."
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2515
 msgid "Create a search folder for this subject"
 msgstr "Направите фасциклу претраге за овај наслов"
 
-#: ../mail/e-mail-reader.c:2515
+#: ../mail/e-mail-reader.c:2554
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/e-mail-reader.c:2531
+#: ../mail/e-mail-reader.c:2570
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2574
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/e-mail-reader.c:2539
+#: ../mail/e-mail-reader.c:2578
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/e-mail-reader.c:2543
+#: ../mail/e-mail-reader.c:2582
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2594
 msgid "Mark as Uni_mportant"
 msgstr "Означи као _неважно"
 
-#: ../mail/e-mail-reader.c:2559
+#: ../mail/e-mail-reader.c:2598
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/e-mail-reader.c:2603
+#: ../mail/e-mail-reader.c:2642
 msgid "_Caret Mode"
 msgstr "Метод у_метања"
 
-#: ../mail/e-mail-reader.c:2605
+#: ../mail/e-mail-reader.c:2644
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажите трепћући курсор у телу приказаних порука"
 
-#: ../mail/e-mail-reader.c:2611
+#: ../mail/e-mail-reader.c:2650
 msgid "All Message _Headers"
 msgstr "Сва _заглавља поруке"
 
-#: ../mail/e-mail-reader.c:2613
+#: ../mail/e-mail-reader.c:2652
 msgid "Show messages with all email headers"
-msgstr "Прикажите поруку са свим заглављима ел. поште"
+msgstr "Прикажите поруку са свим заглављима е-поште"
 
-#: ../mail/e-mail-reader.c:3164
+#: ../mail/e-mail-reader.c:3192
 msgid "Retrieving message"
 msgstr "Преузимам поруку"
 
-#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/e-mail-reader.c:4217
+#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:4236
+#: ../mail/e-mail-reader.c:4262
 msgid "Group Reply"
 msgstr "Одговор групи"
 
-#: ../mail/e-mail-reader.c:4237
+#: ../mail/e-mail-reader.c:4263
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Одговорите дописној листи или свим примаоцима"
 
-#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
+#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../mail/e-mail-reader.c:4315
+#: ../mail/e-mail-reader.c:4341
 #: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Следеће"
 
-#: ../mail/e-mail-reader.c:4319
+#: ../mail/e-mail-reader.c:4345
 #: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Претходно"
 
-#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/e-mail-reader.c:5406
+#: ../mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Дозволи удаљени садржај свима са %s"
 
-#: ../mail/e-mail-reader.c:5408
+#: ../mail/e-mail-reader.c:5428
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Дозволи удаљени садржај за %s"
 
-#: ../mail/e-mail-reader.c:5425
+#: ../mail/e-mail-reader.c:5445
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Дозволи удаљени садржај свима од %s"
 
-#: ../mail/e-mail-reader.c:5442
+#: ../mail/e-mail-reader.c:5462
 msgid "Do not show this message again"
 msgstr "Не приказуј више ову поруку"
 
-#: ../mail/e-mail-reader.c:5490
+#: ../mail/e-mail-reader.c:5510
 msgid "Load remote content"
 msgstr "Учитај удаљени садржај"
 
@@ -16566,34 +16573,34 @@ msgstr "Учитај удаљени садржај"
 msgid "Do not warn me again"
 msgstr "Не упозоравај ме поново"
 
-#: ../mail/e-mail-reader-utils.c:572
+#: ../mail/e-mail-reader-utils.c:570
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Освежавам фасциклу „%s“"
 
-#: ../mail/e-mail-reader-utils.c:1165
+#: ../mail/e-mail-reader-utils.c:1163
 msgid "Marking thread to be ignored"
 msgstr "Означавам расправу као занемарену"
 
-#: ../mail/e-mail-reader-utils.c:1169
+#: ../mail/e-mail-reader-utils.c:1167
 msgid "Unmarking thread from being ignored"
 msgstr "Означавам расправи као да није занемарена"
 
-#: ../mail/e-mail-reader-utils.c:1173
+#: ../mail/e-mail-reader-utils.c:1171
 msgid "Marking subthread to be ignored"
 msgstr "Означавам подрасправу као занемарену"
 
-#: ../mail/e-mail-reader-utils.c:1177
+#: ../mail/e-mail-reader-utils.c:1175
 msgid "Unmarking subthread from being ignored"
 msgstr "Означавам подрасправу као да није занемарена"
 
-#: ../mail/e-mail-reader-utils.c:1421
+#: ../mail/e-mail-reader-utils.c:1419
 msgid "Printing"
 msgstr "Штампам"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1658
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16614,7 +16621,7 @@ msgstr[3] ""
 "Фасцикла „%s“ садржи %u дуплирану поруку. Да ли сте сигурни да желите да је "
 "избришете?"
 
-#: ../mail/e-mail-reader-utils.c:2489
+#: ../mail/e-mail-reader-utils.c:2656
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Сачувај поруку"
@@ -16627,7 +16634,7 @@ msgstr[3] "Сачувај поруку"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2510
+#: ../mail/e-mail-reader-utils.c:2677
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Порука"
@@ -16635,11 +16642,11 @@ msgstr[1] "Поруке"
 msgstr[2] "Поруке"
 msgstr[3] "Порука"
 
-#: ../mail/e-mail-reader-utils.c:2883
+#: ../mail/e-mail-reader-utils.c:3050
 msgid "Parsing message"
 msgstr "Обрађујем поруку"
 
-#: ../mail/e-mail-request.c:207
+#: ../mail/e-mail-request.c:272
 msgid "The message has no text content."
 msgstr "Порука не садржи текст."
 
@@ -16711,7 +16718,7 @@ msgstr[3] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:790
+#: ../mail/em-composer-utils.c:791
 msgid "Waiting for attachments to load..."
 msgstr "Чекам да се учитају прилози..."
 
@@ -16721,7 +16728,7 @@ msgstr "Чекам да се учитају прилози..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1686
+#: ../mail/em-composer-utils.c:1742
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16729,24 +16736,24 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1748
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1753
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
-#: ../mail/em-composer-utils.c:2984
+#: ../mail/em-composer-utils.c:2968
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3471
+#: ../mail/em-composer-utils.c:3440
 msgid "Posting destination"
 msgstr "Одредишна пошта"
 
-#: ../mail/em-composer-utils.c:3476
+#: ../mail/em-composer-utils.c:3445
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
@@ -16755,16 +16762,16 @@ msgid "Select Folder"
 msgstr "Изабери фасциклу"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../mail/em-filter-rule.c:597
 msgid "Then"
 msgstr "Потом"
 
-#: ../mail/em-filter-rule.c:652
+#: ../mail/em-filter-rule.c:662
 msgid "Add Ac_tion"
 msgstr "Додај ра_дњу"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Непрочитаних порука:"
@@ -16773,7 +16780,7 @@ msgstr[2] "Непрочитаних порука:"
 msgstr[3] "Непрочитаних порука:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Укупно порука:"
@@ -16782,76 +16789,76 @@ msgstr[2] "Укупно порука:"
 msgstr[3] "Укупно порука:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Искоришћеност квоте (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:261
 #, c-format
 msgid "Quota usage"
 msgstr "Искоришћеност квоте"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:287
+#: ../mail/em-folder-properties.c:385
 msgid "_Send Account Override:"
 msgstr "_Препиши налог слања"
 
-#: ../mail/em-folder-properties.c:491
+#: ../mail/em-folder-properties.c:589
 msgid "_Archive this folder using these settings:"
 msgstr "_Архивирај ову фасциклу користећи следећа подешавања:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:500
+#: ../mail/em-folder-properties.c:598
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "О_чисти поруке старије од"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:516
+#: ../mail/em-folder-properties.c:614
 msgctxt "autoarchive"
 msgid "days"
 msgstr "дана"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:518
+#: ../mail/em-folder-properties.c:616
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "недеља"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:520
+#: ../mail/em-folder-properties.c:618
 msgctxt "autoarchive"
 msgid "months"
 msgstr "месеци"
 
-#: ../mail/em-folder-properties.c:526
+#: ../mail/em-folder-properties.c:624
 msgid "Move old messages to the default archive _folder"
 msgstr "Премести старе поруке међу _архивиране"
 
-#: ../mail/em-folder-properties.c:537
+#: ../mail/em-folder-properties.c:635
 msgid "_Move old messages to:"
 msgstr "_Премести старе поруке у:"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "AutoArchive folder"
 msgstr "Фасцикла АутоАрхиве"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "Select folder to use for AutoArchive"
 msgstr "Изаберите фасциклу за АутоАрхиву"
 
-#: ../mail/em-folder-properties.c:547
+#: ../mail/em-folder-properties.c:645
 msgid "_Delete old messages"
 msgstr "_Обриши старе поруке"
 
-#: ../mail/em-folder-properties.c:606
+#: ../mail/em-folder-properties.c:704
 msgid "AutoArchive"
 msgstr "АутоАрхива"
 
-#: ../mail/em-folder-properties.c:685
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "Особине фасцикле"
 
@@ -16887,12 +16894,12 @@ msgstr "Премештам фасциклу „%s“"
 msgid "Copying folder %s"
 msgstr "Умножавам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавам поруке у фасциклу „%s“"
@@ -16907,7 +16914,7 @@ msgstr "Не могу да убацим поруку(е) у оставу на н
 msgid "UNMATCHED"
 msgstr "НЕОДГОВАРА"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "Учитавам..."
 
@@ -16931,8 +16938,8 @@ msgstr "Пријави се на _приказане"
 msgid "Subscribe To _All"
 msgstr "Пријави се _на све"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
+#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Unsubscribe"
 msgstr "_Одјави се"
 
@@ -16945,7 +16952,7 @@ msgid "Unsubscribe From _All"
 msgstr "Одја_ви се са свих"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16955,7 +16962,7 @@ msgstr[2] "%d непрочитаних, "
 msgstr[3] "%d непрочитана, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16964,66 +16971,66 @@ msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 msgstr[3] "%d укупно"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Пријаве на фасцикле"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Налог:"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Очисти претрагу"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "_Прикажи ставке које садрже:"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Пријавите се на изабрану фасциклу"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "П_ријави се"
 
-#: ../mail/em-subscription-editor.c:1911
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../mail/em-subscription-editor.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Unsubscribe from the selected folder"
 msgstr "Одјавите се са изабране фасцикле"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Скупите све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "_Скупи све"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Разгранајте све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "_Разгранај све"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Освежите списак фасцикли"
 
-#: ../mail/em-subscription-editor.c:1974
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../mail/em-subscription-editor.c:1976
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Зауставите тренутну операцију"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Заустави"
@@ -17451,14 +17458,14 @@ msgstr[3] "Адреса"
 
 #: ../mail/importers/kmail-importer.c:354
 msgid "Evolution KMail importer"
-msgstr "Еволуцијин увоз КМејлова"
+msgstr "Еволуцијин увоз К-поште"
 
 #: ../mail/importers/kmail-importer.c:355
 msgid "Import mail and contacts from KMail."
-msgstr "Увози пошту и контакте из КМејла."
+msgstr "Увози пошту и контакте из К-поште."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 msgid "Trash"
 msgstr "Смеће"
 
@@ -17468,7 +17475,7 @@ msgstr "Увожење поштанског сандучета"
 
 #: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
-msgstr "Увозим пошту и контакте из КМејла."
+msgstr "Увозим пошту и контакте из К-поште."
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
@@ -17555,8 +17562,8 @@ msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
-"Све нове ел. поруке са заглављем које се подудара са датим садржајем ће бити "
-"аутоматски филтриране као нежељене"
+"Све нове е-поруке са заглављем које се подудара са датим садржајем ће бити "
+"аутоматски издвојене као нежељене"
 
 #: ../mail/mail-config.ui.h:5
 msgid "Header name"
@@ -17677,8 +17684,8 @@ msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
-"Да бисте избегли непогодности и нелагодност ел. поште, питајте за потврду "
-"пре извршавања следећих означених радњи:"
+"Да бисте избегли непогодности и нелагодност е-поште, питајте за потврду пре "
+"извршавања следећих означених радњи:"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:42
@@ -17719,7 +17726,7 @@ msgstr "Слања поруке са _примаоцима који нису у
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
-msgstr "Слања поруке помоћу пре_чице (Ctrl + Enter)"
+msgstr "Слања поруке помоћу пре_чице (Ктрл + Унеси)"
 
 #: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
@@ -17737,7 +17744,7 @@ msgid "Use for Recipients"
 msgstr "Користи за примаоце"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Налог"
 
@@ -17968,8 +17975,8 @@ msgid "Check cu_stom headers for junk"
 msgstr "Провери има ли ђубрета у _прилагођеним заглављима"
 
 #: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
 msgid "No encryption"
 msgstr "Без шифровања"
 
@@ -18124,7 +18131,7 @@ msgid ""
 msgstr ""
 "Контакат листа којој шаљете је подешена да скрива примаоце листе.\n"
 "\n"
-"Многи системи ел. поште додају порукама заглавље „Привидно-ка“ које има само "
+"Многи системи е-поште додају порукама заглавље „Привидно-ка“ које има само "
 "БЦЦ примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
 "Да избегнете ово, додајте барем једног „Прима:“ или „ЦЦ:“ примаоца. "
 
@@ -18135,10 +18142,10 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Многи системи ел. поште додају порукама заглавље „Привидно-ка“ које имају "
-"само БЦЦ примаоце. Ово ће заглавље, ако је додато, у сваком случају "
-"излистати све примаоце поруке. Да избегнете ово, додајте барем једног "
-"„Прима:“ или „ЦЦ:“ примаоца."
+"Многи системи е-поште додају порукама заглавље „Привидно-ка“ које имају само "
+"БЦЦ примаоце. Ово ће заглавље, ако је додато, у сваком случају излистати све "
+"примаоце поруке. Да избегнете ово, додајте барем једног „Прима:“ или „ЦЦ:“ "
+"примаоца."
 
 # mail:ask-send-only-bcc primary
 #: ../mail/mail.error.xml.h:17
@@ -18150,7 +18157,7 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Следећи прималац није препознат као исправна адреса ел. поште:\n"
+"Следећи прималац није препознат као исправна адреса е-поште:\n"
 "{0}"
 
 # mail:ask-send-only-bcc primary
@@ -18163,7 +18170,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Следећи примаоци нису препознати као исправне адресе ел. поште:\n"
+"Следећи примаоци нису препознати као исправне адресе е-поште:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:23
@@ -18217,26 +18224,33 @@ msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Унесите важећу адресу ел. поште у поље „Прима:“. Можете претражити адресе "
-"ел. поште кликом на дугме „Прима:“ поред поља за унос."
+"Унесите важећу адресу е-поште у поље „Прима:“. Можете претражити адресе е-"
+"поште кликом на дугме „Прима:“ поред поља за унос."
 
 #: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Да користим подразумевану фасциклу нацрта?"
 
 #: ../mail/mail.error.xml.h:34
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?"
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 msgstr ""
 "Не могу да отворим фасциклу нацрта за овај налог. Да користим системску "
-"фасциклу нацрта уместо тога?"
+"фасциклу нацрта уместо тога?\n"
+"\n"
+"Грешка је „{0}“."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Користи _основно"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -18244,38 +18258,38 @@ msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из фасцикле „{0}“?"
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наставите, нећете моћи да вратите ове поруке."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "Из_баци"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
-#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварање превише порука одједном може да потраје мало дуже."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Отвори поруке"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, да ли желите ипак да изађете?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18286,59 +18300,59 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Грешка приликом {0}."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Грешка током извршавања операције."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Унесите лозинку."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Грешка при учитавању дефиниција филтера."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не могу да сачувам у директоријуму „{0}“."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Не могу да сачувам у датотеку „{0}“."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Не могу да направим директоријум за чување, због „{1}“"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Не могу да направим привремени директоријум за чување."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Датотека постоји али не могу да је препишем."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Датотека постоји али није регуларна."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Не могу да обришем фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Не могу да обришем системску фасциклу „{0}“."
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18346,23 +18360,23 @@ msgstr ""
 "Системске фасцикле су неопходне Еволуцији да би исправно радила и не могу "
 "бити преименоване, премештене или обрисане."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Не могу да избацим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Не могу да освежим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Не могу да преименујем или да преместим системску фасциклу„{0}“."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Да обришем фасциклу „{0}“ и све подфасцикле?"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -18370,20 +18384,40 @@ msgstr ""
 "Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли биће трајно "
 "обрисани."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder \"{0}\"?"
+msgstr "Да отпишем фасциклу „{0}“?"
+
+#: ../mail/mail.error.xml.h:71
+msgid ""
+"If you unsubscribe the folder, it might not be visible in the Evolution, "
+"while still being available on the server. You can re-subscribe in Folder-"
+">Subscriptions... menu."
+msgstr ""
+"Ако отпишете фасциклу, може бити невидљива у Еволуцији, док ће још увек бити "
+"доступна на серверу. Можете поново да се претплатите у изборнику „Фасцикла → "
+"Пријаве...“"
+
+#: ../mail/mail.error.xml.h:72
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "_Не отписуј"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Really delete folder \"{0}\"?"
 msgstr "Да обришем фасциклу „{0}“?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Уколико обришете фасциклу, сав њен садржај биће трајно обрисан."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "Ове поруке нису умношци."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -18394,70 +18428,70 @@ msgstr ""
 "којима се физички налазе. Да ли заиста желите да избришете ове поруке?"
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Не могу да преименујем „{0}“ у „{1}“."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Фасцикла са именом „{1}“ већ постоји. Доделите јој неки други назив."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да преместим фасциклу „{0}“ у „{1}“."
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу извора. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу мете. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да умножим фасциклу „{0}“ у „{1}“."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Cannot create folder \"{0}\"."
 msgstr "Не могу да направим фасциклу „{0}“."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Не могу да отворим фасциклу. Грешка: {1}"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Не могу да сачувам измене на налогу."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете да направите два налога са истим именом."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци о налогу биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Сигурно желите да обришете овај налог и све припадајуће елементе?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18465,28 +18499,28 @@ msgstr ""
 "Уколико наставите, подаци о налогу и сви\n"
 "подаци посредника биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Сигурно желите да искључите овај налог и обришете све посреднике?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ако наставите, сви налози посредника биће трајно уклоњени."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "Немој _искључити"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Искључи"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:98
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Не могу да уредим фасциклу претраге „{0}“ јер не постоји."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18494,39 +18528,39 @@ msgstr ""
 "Ова фасцикла је можда посредно додата,\n"
 "идите у уређивач фасцикле претраге и додајте је изричито, ако желите."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Не могу да додам фасциклу претраге „{0}“."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Фасцикла са именом „{0}“ већ постоји. Доделите јој неки други назив."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Фасцикле претраге су аутоматски ажуриране."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Пропусници поште су аутоматски ажурирани."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Недостајућа фасцикла."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Морате да наведете фасциклу."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Морате да дате назив овој фасцикли претраге."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Није изабрана ниједна фасцикла."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18536,11 +18570,11 @@ msgstr ""
 "Било да појединачно изаберете фасцикле, и/или да изаберете све локалне "
 "фасцикле, све мрежне фасцикле или и једне и друге."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем при преносу старе фасцикле поште „{0}“."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18552,19 +18586,19 @@ msgstr ""
 "Можете или да игноришете ову фасциклу, да је препишете или да допуните њен "
 "садржај, или да изађете."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Препиши"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Прикачи"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid "Evolution's local mail format has changed."
 msgstr "Еволуцијин локални формат поште је промењен."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -18582,19 +18616,19 @@ msgstr ""
 "избришете налог након успешног пресељавања података. Уверите се да има "
 "довољно простора на диску уколико одлучите да их преселите сада."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Изађи из Еволуције"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "П_ресели сада"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Не могу да прочитам датотеку лиценце."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -18602,31 +18636,31 @@ msgstr ""
 "Не могу да прочитам датотеку лиценце „{0}“, због проблема са инсталацијом. "
 "Нећете моћи да користите овог достављача док не прихватите лиценцу."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Сачекајте."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Слање упита серверу за листу подржаних механизама потврђивања идентитета."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Не могу да пропитам сервер за списак подржаних механизама потврђивања "
 "идентитета."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:130
 msgid "Failed to get server setup."
 msgstr "Нисам успео да добавим подешавање сервера."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ускладити фасцикле локално за рад ван мреже?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18634,27 +18668,27 @@ msgstr ""
 "Желите ли локално да ускладите фасцикле које су означене за коришћење ван "
 "мреже?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "_Не усклађуј"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Усклади"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Да ли желите да све поруке означите прочитаним?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Ово означава све поруке као прочитане у изабраној фасцикли."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Да означим такође и поруке у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18662,138 +18696,138 @@ msgstr ""
 "Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и "
 "оне у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "У тренутној фасцикли и _подфасциклама"
 
 # bug: requires a comment on usage
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "Само у тренутној _фасцикли"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Треба ли Еволуција да затвори овај прозор када одговара или прослеђује?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Да, увек"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "_Не, никада"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "Умножите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да умножите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "Н_е умножавај"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Увек умножи"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever copy"
 msgstr "_Никад не умножавај"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Преместите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:151
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да преместите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "Н_е премештај"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Увек премести"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:155
 msgid "N_ever move"
 msgstr "_Никад не премештај"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ова порука се не може послати пошто је искључен налог са којег шаљете"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr "Омогућите налог или пошаљите користећи други налог."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Неуспешно брисање поште"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате довољна овлашћења да обришете ову пошту."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "\"Check Junk\" Failed"
 msgstr "Провера ђубрета није успела"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "\"Report Junk\" Failed"
 msgstr "Извештај за ђубре није успео"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "\"Report Not Junk\" Failed"
 msgstr "Извештавање да није ђубре није успело"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Да уклоним дуплиране поруке?"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "Нису пронађене дупле поруке."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Фасцикла „{0}“ не садржи никакве дупле поруке."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Не могу да се повежем на налог „{0}“."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Не могу да прекинем везу са налогом „{0}“."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Не могу да се одјавим са фасцикле „{0}“."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Не могу да довучем поруку."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:172
 msgid "Message is not available in offline mode."
 msgstr "Порука није доступна у режиму ван мреже."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:173
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18807,42 +18841,42 @@ msgstr ""
 "поруке за рад ван мреже. Тако ћете преузети све поруке и моћи да их читате и "
 "када нисте при интернету."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "Не могу да отворим фасциклу."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "Не могу да пронађем дуплиране поруке."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Не могу да довучем поруке."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "Не могу да означим поруке прочитаним."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Не могу да уклоним прилоге из порука."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:180
 msgid "Failed to download messages for offline viewing."
 msgstr "Не могу да преузмем поруке за прегледање ван мреже."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Не могу да сачувам поруке на диск."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Скривена датотека је приложена."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18850,47 +18884,47 @@ msgstr ""
 "Прилог под називом {0} је скривена датотека и може да садржи осетљиве "
 "податке. Прегледајте је пре него ли је пошаљете."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Штампање није успело."
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:185
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Штампач је одговорио „{0}“."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:186
 msgid "Could not perform this operation on {0}."
 msgstr "Не могу да извршим ову радњу над „{0}“."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr "Морате да будете на мрежи да бисте завршили ову радњу."
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:188
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Порука са „{0}“ налога:"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:189
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Не могу да означим расправу као занемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:190
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Не могу да означим расправу као незанемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:191
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Не могу да означим подрасправу као занемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:192
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Не могу да означим подрасправу као незанемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:193
 msgid "Remote content download had been blocked for this message."
 msgstr "Преузимање удаљеног садржаја је забрањено за ову поруку."
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:194
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18899,31 +18933,31 @@ msgstr ""
 "преузима са овог сајта или од овог пошиљаоца."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:190
+#: ../mail/mail.error.xml.h:196
 msgid "{0}, Completed on {1}"
 msgstr "{0}, завршено је {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:192
+#: ../mail/mail.error.xml.h:198
 msgid "{0} by {1}"
 msgstr "{0} до {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:194
+#: ../mail/mail.error.xml.h:200
 msgid "Overdue: {0} by {1}"
 msgstr "Завршен: {0} до {1}"
 
-#: ../mail/mail.error.xml.h:196
+#: ../mail/mail.error.xml.h:202
 msgid "This message note has been changed, but has not been saved."
 msgstr "Ова белешка поруке је измењена, али није сачувана."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:199
+#: ../mail/mail.error.xml.h:205
 msgid "Failed to delete message note in folder '{0}'"
 msgstr "Нисам успео да обришем белешку поруке у фасцикли „{0}“"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:201
+#: ../mail/mail.error.xml.h:207
 msgid "Failed to store message note in folder '{0}'"
 msgstr "Нисам успео да сместим белешку поруке у фасциклу „{0}“"
 
@@ -18931,38 +18965,38 @@ msgstr "Нисам успео да сместим белешку поруке у
 msgid "Canceling..."
 msgstr "Отказујем..."
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "Слање и примање поште"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "Откажи _све"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "Освежавам..."
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1229
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Вршим проверу за новом поштом на „%s“"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Бришем непожељно и избацујем смеће из „%s“"
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1458
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Бришем ђубре из „%s“"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1460
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Избацујем смеће из „%s“"
@@ -18979,86 +19013,86 @@ msgstr "Уреди фасциклу претраге"
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6168
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Данас у %l:%M %p"
 
-#: ../mail/message-list.c:2069
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче у %l:%M %p"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%a у %l:%M %p"
 
-#: ../mail/message-list.c:2089
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%d. %b у %l:%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2997
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../mail/message-list.c:3699 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Поруке"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:5105
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "Следи"
 
-#: ../mail/message-list.c:6107
+#: ../mail/message-list.c:6125
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -19070,7 +19104,7 @@ msgstr ""
 "покрените нову претрагу било чишћењем исте помоћу ставке изборника „Претрага—"
 ">Очисти“ или изменивши горњи упит."
 
-#: ../mail/message-list.c:6115
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -19115,32 +19149,32 @@ msgid "Subject or Addresses contains"
 msgstr "Наслов или адресе садрже"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2159
+#: ../modules/mail/e-mail-shell-view-actions.c:2239
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2152
+#: ../modules/mail/e-mail-shell-view-actions.c:2232
 msgid "Message contains"
 msgstr "Порука садржи"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2173
+#: ../modules/mail/e-mail-shell-view-actions.c:2253
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2166
+#: ../modules/mail/e-mail-shell-view-actions.c:2246
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2138
+#: ../modules/mail/e-mail-shell-view-actions.c:2218
 msgid "Body contains"
 msgstr "Тело садржи"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2145
+#: ../modules/mail/e-mail-shell-view-actions.c:2225
 msgid "Free form expression"
 msgstr "Израз у слободној форми"
 
@@ -19166,22 +19200,22 @@ msgstr "Самодовршавање"
 msgid "Always _show address of the autocompleted contact"
 msgstr "Увек _приказуј адресу самодопуњеног контакта"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:100
 msgid "Multiple vCards"
 msgstr "Вишеструке вКарте"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:108
 #, c-format
 msgid "vCard for %s"
 msgstr "вКарта за %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:119
+#: ../modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information"
 msgstr "Подаци за ступање у везу"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:148
 #, c-format
 msgid "Contact information for %s"
 msgstr "Подаци о контакту за %s"
@@ -19299,7 +19333,7 @@ msgstr "Прикажите мапу са свим контактима из из
 #: ../modules/calendar/e-cal-shell-view-actions.c:1299
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
 #: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
@@ -19380,7 +19414,7 @@ msgstr "_Радње"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1080
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Preview"
 msgstr "_Преглед"
 
@@ -19414,7 +19448,7 @@ msgstr "Прикажите мапе у прозору за преглед кон
 #: ../modules/addressbook/e-book-shell-view-actions.c:1166
 #: ../modules/calendar/e-memo-shell-view-actions.c:743
 #: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
@@ -19425,7 +19459,7 @@ msgstr "Прикажите преглед контакта испод конта
 #: ../modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2127
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
@@ -19444,7 +19478,7 @@ msgstr "Не одговара"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1657
 #: ../modules/calendar/e-memo-shell-view-actions.c:777
 #: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2131
+#: ../modules/mail/e-mail-shell-view-actions.c:2211
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Напредна претрага"
@@ -19756,8 +19790,8 @@ msgstr "Бого-филтер непожељних порука"
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
 #: ../modules/cal-config-google/e-cal-config-google.c:177
 #: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
 msgid "User name cannot be empty"
 msgstr "Корисничко име не може бити празно"
 
@@ -19792,8 +19826,8 @@ msgid "Port:"
 msgstr "Порт:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
 msgid "Port number is not valid"
 msgstr "Број прикључника није исправан"
 
@@ -19806,8 +19840,8 @@ msgid "Encryption:"
 msgstr "Шифровање:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
@@ -19817,7 +19851,7 @@ msgstr "Анонимно"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
-msgstr "Користи адресу ел. поште"
+msgstr "Користи адресу е-поште"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
@@ -19834,7 +19868,7 @@ msgid ""
 "LDAP server."
 msgstr ""
 "Ово је начин који ће Еволуција да користи да вам потврди идентитет.  Знајте "
-"да ће ово ако поставите на „Користи адресу ел. поште“ захтевати анонимни "
+"да ће ово ако поставите на „Користи адресу е-поште“ захтевати анонимни "
 "приступ на ваш ЛДАП сервер."
 
 #. Page 2
@@ -19900,59 +19934,69 @@ msgid "Browse until limit is reached"
 msgstr "Разгледај све док се не достигне ограничење"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
 msgid "Server address cannot be empty"
 msgstr "Адреса сервера може бити празна"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+#| msgid "New Address Book"
+msgid "Choose an Address Book"
+msgstr "Изаберите адресар"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Адреса:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+#| msgid "Address Book"
+msgid "Find Address Books"
+msgstr "Нађите адресар"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Избегавај ако-поклапа (потребно на Апачу < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Адреса није исправна „http://“ или „https://“ адреса"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
 #: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Изаберите календар"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
 #: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Изаберите списак белешки"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
 #: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Изаберите списак садатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 msgid "Find Calendars"
 msgstr "Пронађите календаре"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Memo Lists"
 msgstr "Пронађите спискове белешки"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Task Lists"
 msgstr "Пронађите спискове задатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
-msgstr "Ел. пошта:"
+msgstr "Е-пошта:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "Сервер управља позивима на састанак"
 
@@ -20196,11 +20240,11 @@ msgstr "Облик времена:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
-msgstr "_12 - часовни (AM/PM)"
+msgstr "_12-часовни (ПрП/ПоП)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
-msgstr "_24 - часовни"
+msgstr "_24-часовни"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 #: ../modules/calendar/e-cal-shell-view-actions.c:1609
@@ -20783,7 +20827,7 @@ msgid "New _Memo"
 msgstr "Нова _белешка"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-backend.c:81
 #: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Направите једну нову белешку"
@@ -20810,15 +20854,15 @@ msgstr "Отвори _Веб страницу"
 msgid "Print the selected memo"
 msgstr "Штампајте изабрану белешку"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "Тражим следећи одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "Тражим претходни одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -20827,7 +20871,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у следећих %d година"
 msgstr[3] "Не могу да пронађем одговарајући догађај у следећој %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -20836,7 +20880,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у претходних %d години"
 msgstr[3] "Не могу да пронађем одговарајући догађај у претходној %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Не могу да тражим ако нема активног календара"
 
@@ -20879,7 +20923,7 @@ msgid "New _Task"
 msgstr "Нови зад_атак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-backend.c:79
 #: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Направите нови задатак"
@@ -20899,26 +20943,26 @@ msgstr "Прегледајте изабрани задатак"
 msgid "Print the selected task"
 msgstr "Штампа изабрани задатак"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Белешк_а"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Дељена белешка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "Направите нову дељену белешку"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Спи_сак белешки"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Саставите нови списак белешки"
@@ -21027,26 +21071,26 @@ msgstr[3] "%d белешка"
 msgid "%d selected"
 msgstr "изабраних — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:61
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:68
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_и задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:70
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "Направите нови додељени задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:78
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Списак за_датака"
 
-#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-backend.c:96
 #: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Направите нови списак задатака"
@@ -21189,59 +21233,59 @@ msgstr[1] "%d задатака"
 msgstr[2] "%d задатака"
 msgstr[3] "%d задатак"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
 msgid "ITIP"
 msgstr "ИТИП"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
 msgid "Display part as an invitation"
 msgstr "Приказује делове као позивницу"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:226
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "Данас у %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M:%S"
 msgstr "Данас у %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M:%S %p"
 msgstr "Данас у %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:254
+#: ../modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "Сутра у %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:258
+#: ../modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M:%S"
 msgstr "Сутра у %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "Tomorrow %l:%M %p"
 msgstr "Сутра у %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сутра у %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:286
+#: ../modules/itip-formatter/itip-view.c:320
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -21251,71 +21295,71 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:291
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A %H:%M"
-msgstr "%A %H:%M"
+msgstr "%A у %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
+msgstr "%A у %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
+msgstr "%A у %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
+msgstr "%A у %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:319
+#: ../modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
+msgstr "%A, %e. %B у %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:323
+#: ../modules/itip-formatter/itip-view.c:357
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
+msgstr "%A, %e. %B у %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:362
 msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
+msgstr "%A, %e. %B у %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:366
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e. %B у %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %e, %Y."
+msgstr "%A, %e. %B %Y."
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:343
+#: ../modules/itip-formatter/itip-view.c:377
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %e, %Y. %H:%M"
+msgstr "%A, %e. %B %Y. у %H:%M"
 
 # strptime format of a weekday, a date and a time,
 # in 24-hour format.
@@ -21323,167 +21367,169 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:381
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %B %e, %Y. %H:%M:%S"
+msgstr "%A, %e. %B %Y. у %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:386
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %B %e, %Y. %l:%M %p"
+msgstr "%A, %e. %B %Y. у %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %B %e, %Y. %l:%M:%S %p"
+msgstr "%A, %e. %B %Y. у %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:394
-#: ../modules/itip-formatter/itip-view.c:395
-#: ../modules/itip-formatter/itip-view.c:484
-#: ../modules/itip-formatter/itip-view.c:485
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:429
+#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:519
+#: ../modules/itip-formatter/itip-view.c:608
 msgid "An unknown person"
 msgstr "Непозната особа"
 
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Одговорите у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Примљено у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s преко %s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s вам делегира следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:416
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s преко %s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:424
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s преко %s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:460
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s преко %s жели да прими најновије информације за следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s жели да прими најновији податак за следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:436
+#: ../modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s преко %s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:472
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../modules/itip-formatter/itip-view.c:476
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s преко %s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:478
 #, c-format
-msgid "%s has canceled the following meeting:"
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:448
+#: ../modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s преко %s предлаже следеће промене састанка."
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s предлаже следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:454
+#: ../modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s преко %s одбија следеће промене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s одбија следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s преко %s објављује следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s објави следеће задужење:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s захтева да %s преузме следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:506
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s преко %s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:514
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s преко %s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:550
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -21491,335 +21537,340 @@ msgid ""
 msgstr ""
 "%s преко %s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:556
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:526
+#: ../modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s преко %s враћа следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:562
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s шаље назад следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../modules/itip-formatter/itip-view.c:566
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#| msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s преко %s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:568
 #, c-format
-msgid "%s has canceled the following assigned task:"
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:538
+#: ../modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s преко %s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:544
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s преко %s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s преко %s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s преко %s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:628
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:598
+#: ../modules/itip-formatter/itip-view.c:632
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#| msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s преко %s отказује следећу дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:634
 #, c-format
-msgid "%s has canceled the following shared memo:"
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s отказује следеће дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:674
+#: ../modules/itip-formatter/itip-view.c:893
 msgid "All day:"
 msgstr "Целодневно:"
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:899
 msgid "Start day:"
 msgstr "Почетак дана:"
 
-#: ../modules/itip-formatter/itip-view.c:680
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:899
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Start time:"
 msgstr "Време почетка:"
 
-#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:908
 msgid "End day:"
 msgstr "Крај дана:"
 
-#: ../modules/itip-formatter/itip-view.c:689
-#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:908
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "End time:"
 msgstr "Време завршетка:"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1255
 msgid "Ope_n Calendar"
 msgstr "О_твори календар"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1258
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1261
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1264
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1267
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1270
 msgid "Acce_pt all"
 msgstr "П_рихвати све"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1273
 msgid "Acce_pt"
 msgstr "Прих_ваћено"
 
-#: ../modules/itip-formatter/itip-view.c:1060
+#: ../modules/itip-formatter/itip-view.c:1276
 msgid "Send _Information"
 msgstr "Пошаљи _податке"
 
-#: ../modules/itip-formatter/itip-view.c:1063
+#: ../modules/itip-formatter/itip-view.c:1279
 msgid "_Update Attendee Status"
 msgstr "Ажурирај стање учесни_ка"
 
-#: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../modules/itip-formatter/itip-view.c:1282
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Освежи"
 
-#: ../modules/itip-formatter/itip-view.c:1518
-#: ../modules/itip-formatter/itip-view.c:1566
-#: ../modules/itip-formatter/itip-view.c:1637
+#: ../modules/itip-formatter/itip-view.c:1728
+#: ../modules/itip-formatter/itip-view.c:1776
+#: ../modules/itip-formatter/itip-view.c:1847
 msgid "Comment:"
 msgstr "Напомена:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1764
 msgid "Send reply to sender"
 msgstr "Одговори пошиљаоцу"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1779
 msgid "Send _updates to attendees"
 msgstr "Пошаљи _ажуриране податке учесницима"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1572
+#: ../modules/itip-formatter/itip-view.c:1782
 msgid "_Apply to all instances"
 msgstr "При_мени на све нивое"
 
-#: ../modules/itip-formatter/itip-view.c:1573
+#: ../modules/itip-formatter/itip-view.c:1783
 msgid "Show time as _free"
 msgstr "Прикажи време као _слободно"
 
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1784
 msgid "_Preserve my reminder"
 msgstr "_Очувај мој подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1785
 msgid "_Inherit reminder"
 msgstr "_Наследи подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1908
+#: ../modules/itip-formatter/itip-view.c:2102
 msgid "_Tasks:"
 msgstr "_Задаци:"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:2105
 msgid "_Memos:"
 msgstr "_Белешке:"
 
-#: ../modules/itip-formatter/itip-view.c:3217
+#: ../modules/itip-formatter/itip-view.c:3059
 msgid "Sa_ve"
 msgstr "Са_чувај"
 
-#: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:3499
+#: ../modules/itip-formatter/itip-view.c:4955
 msgid "Attendee status updated"
 msgstr "Статус учесника је ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:3859
+#: ../modules/itip-formatter/itip-view.c:3664
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Једно заказивање у календару „%s“ је у исто време кад и овај састанак"
 
-#: ../modules/itip-formatter/itip-view.c:3889
+#: ../modules/itip-formatter/itip-view.c:3694
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Пронашао сам заказивање у календару „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:4024
+#: ../modules/itip-formatter/itip-view.c:3828
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../modules/itip-formatter/itip-view.c:4032
+#: ../modules/itip-formatter/itip-view.c:3836
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу да пронађем овај састанак ни у једном календару"
 
-#: ../modules/itip-formatter/itip-view.c:4037
+#: ../modules/itip-formatter/itip-view.c:3841
 msgid "Unable to find this task in any task list"
 msgstr "Не могу да пронађем овај задатак ни у једном списку задатака"
 
-#: ../modules/itip-formatter/itip-view.c:4042
+#: ../modules/itip-formatter/itip-view.c:3846
 msgid "Unable to find this memo in any memo list"
 msgstr "Ниједан списак белешки не садржи ову белешку"
 
-#: ../modules/itip-formatter/itip-view.c:4387
+#: ../modules/itip-formatter/itip-view.c:4190
 msgid "Opening the calendar. Please wait..."
 msgstr "Отварам календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4392
+#: ../modules/itip-formatter/itip-view.c:4195
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага за једном постојећом верзијом овог заказивања је у току"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4594
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не могу да пошаљем ставке календару „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4609
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Послато календару „%s“ као прихваћено"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4614
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару „%s“ као покушај"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4620
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару „%s“ као одбијено"
 
-#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:4626
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4646
+#: ../modules/itip-formatter/itip-view.c:5092
+#: ../modules/itip-formatter/itip-view.c:5195
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Чувам измене у календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4687
 msgid "Unable to parse item"
 msgstr "Не могу да обрадим ставку"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:4896
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:4900
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не могу делегату да пошаљем обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:4947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не могу да ажурирам учесника. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:4982
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Састанак није исправан и не може бити ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5057
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Статус учесника није ажуриран због неисправног стања"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5128
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Статус учесника није освежен јер ставка више не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5227
 msgid "Meeting information sent"
 msgstr "Податак о састанку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5232
 msgid "Task information sent"
 msgstr "Податак о задатку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5237
 msgid "Memo information sent"
 msgstr "Податак о белешци је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5248
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Не могу да пошаљем податак о састанку, састанак не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5253
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не могу да пошаљем податак о задатку, задужење не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5258
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Не могу да пошаљем податак о белешци, белешка не постоји"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5328
 msgid "Save Calendar"
 msgstr "Сачувај календар"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5376
+#: ../modules/itip-formatter/itip-view.c:5389
 msgid "The calendar attached is not valid"
 msgstr "Приложен календар није исправан"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5377
+#: ../modules/itip-formatter/itip-view.c:5390
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21827,15 +21878,15 @@ msgstr ""
 "Порука пријављује да садржи календар, али тај календар није исправан "
 "иКалендар."
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5432
+#: ../modules/itip-formatter/itip-view.c:5462
+#: ../modules/itip-formatter/itip-view.c:5565
 msgid "The item in the calendar is not valid"
 msgstr "Ставка у календару није исправна"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5433
+#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5566
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21843,11 +21894,11 @@ msgstr ""
 "Порука садржи календар, али он не садржи догађаје, задатке или податке "
 "слободно/заузето."
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5478
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више ставки"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5479
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21859,24 +21910,24 @@ msgstr ""
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:5974
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:5990
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6150
 msgid "This meeting recurs"
 msgstr "Овај састанак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6153
 msgid "This task recurs"
 msgstr "Овај задатак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6156
 msgid "This memo recurs"
 msgstr "Ова белешка се понавља"
 
@@ -21893,19 +21944,19 @@ msgstr "Овај састанак је делегиран"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0}“ делегира састанак. Желите ли да додате делегата „{1}“?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Гугл могућности"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 msgid "Add Google Ca_lendar to this account"
 msgstr "Додај ка_лендар Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Add Google Con_tacts to this account"
 msgstr "Додај ко_нтакте Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "Можда ћете морати да омогућите ИМАП приступ"
 
@@ -21966,42 +22017,48 @@ msgstr "Изаберите директоријум мбокс припреме"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Директоријум припреме Мсандучета не може бити празан"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "_Порт:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+#| msgid "Enter password"
+msgid "_Forget password"
+msgstr "_Заборави лозинку"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
 msgid "Encryption _method:"
 msgstr "Начин _шифровања:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "СТАРТТЛС након повезивања"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "TLS on a dedicated port"
 msgstr "ТЛС на додељеном прикључнику"
 
@@ -22040,23 +22097,23 @@ msgid "Custom binary cannot be empty"
 msgstr "Произвољни извршни не може бити празан"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи потврђивање идентитета"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "_Врста:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Јаху! могућности"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Додај Јаху! _календар и задатке овом налогу"
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:673
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -22065,46 +22122,86 @@ msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 msgstr[3] "Једна приложена порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:353
+#: ../modules/mail/e-mail-shell-backend.c:377
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:355
+#: ../modules/mail/e-mail-shell-backend.c:379
 msgid "Compose a new mail message"
 msgstr "Саставите нову поруку"
 
-#: ../modules/mail/e-mail-shell-backend.c:363
+#: ../modules/mail/e-mail-shell-backend.c:387
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Поштански _налог"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:389
 msgid "Create a new mail account"
 msgstr "Направите нови налог за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:370
+#: ../modules/mail/e-mail-shell-backend.c:394
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:372
+#: ../modules/mail/e-mail-shell-backend.c:396
 msgid "Create a new mail folder"
 msgstr "Направите нову фасциклу за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:687
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:711
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr "основно"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:714
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr "мрежна веза"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:717
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "управник везе"
+
+#: ../modules/mail/e-mail-shell-backend.c:749
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr "Начин за откривање стања на мрежи:"
+
+#. Always as the first
+#: ../modules/mail/e-mail-shell-backend.c:758
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Основно"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:772
+#| msgid "_Always move"
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "Увек на мрежи"
+
+#: ../modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: ../modules/mail/e-mail-shell-backend.c:696
+#: ../modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
-#: ../modules/mail/e-mail-shell-backend.c:705
+#: ../modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Поставке састављача"
 
-#: ../modules/mail/e-mail-shell-backend.c:715
+#: ../modules/mail/e-mail-shell-backend.c:859
 msgid "Network Preferences"
 msgstr "Поставке мреже"
 
@@ -22115,148 +22212,148 @@ msgstr "Поставке мреже"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1007
+#: ../modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:713
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Marking messages as read..."
 msgstr "Означавам поруке прочитаним..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
 msgid "Go to Folder"
 msgstr "Иди у фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Select"
 msgstr "_Изабери"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Disable Account"
 msgstr "_Онемогући налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Disable this account"
 msgstr "Искључите овај налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Трајно уклоните све обрисане поруке из свих фасцикли"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Edit properties of this account"
 msgstr "Измените особине овог налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Refresh list of folders of this account"
 msgstr "Освежите списак фасцикли за овај налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Download Messages for Offline Usage"
 msgstr "_Преузми поруке за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Преузмите поруке за налоге и фасцикле које су означене за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Fl_ush Outbox"
 msgstr "Ис_празни „За слање“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Copy the selected folder into another folder"
 msgstr "Умножите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Permanently remove this folder"
 msgstr "Трајно уклоните ову фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "E_xpunge"
 msgstr "Изба_ци"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Трајно уклоните све обрисане поруке из ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Mar_k All Messages as Read"
 msgstr "Означи све по_руке као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "Mark all messages in the folder as read"
 msgstr "Означите све поруке у фасцикли као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Move Folder To..."
 msgstr "_Премести фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Move the selected folder into another folder"
 msgstr "Преместите изабрану фасциклу у другу фасциклу"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_New..."
 msgstr "_Ново..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1711
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Create a new folder for storing mail"
 msgstr "Направите нову фасциклу за смештај поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Change the properties of this folder"
 msgstr "Измените особине ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Refresh the folder"
 msgstr "Освежите фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Change the name of this folder"
 msgstr "Промените назив ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Select Message _Thread"
 msgstr "Изабери _расправу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Означите све поруке исте расправе као изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Select Message S_ubthread"
 msgstr "Изабери п_одниз поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Select all replies to the currently selected message"
 msgstr "Изаберите све одговоре на тренутно изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Трајно уклоните све обрисане поруке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Go to _Folder"
 msgstr "Иди у _фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Отвара прозорче из кога можете изабрати да одете у одређену фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1844
 msgid "_New Label"
 msgstr "_Нова ознака"
 
@@ -22265,205 +22362,218 @@ msgstr "_Нова ознака"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "N_one"
 msgstr "Н_ишта"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "_Manage Subscriptions"
 msgstr "_Управљај пријавама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријавите се или се одјавите са фасцикли на мрежним серверима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Send / _Receive"
 msgstr "Слање / п_римање"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "Send queued items and retrieve new items"
 msgstr "Пошаљите припремљене и довуците нове ставке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "R_eceive All"
 msgstr "П_рими све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Receive new items from all accounts"
 msgstr "Примите нове ставке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Send All"
 msgstr "П_ошаљи све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Send queued items in all accounts"
 msgstr "Пошаљите ставке на чекању у свим налозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Cancel the current mail operation"
 msgstr "Откажите тренутну операцију са поштом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1858
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "Collapse All _Threads"
 msgstr "Скупи све _расправе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Collapse all message threads"
 msgstr "Скупите целокупно гранање расправа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1865
+#: ../modules/mail/e-mail-shell-view-actions.c:1937
 msgid "E_xpand All Threads"
 msgstr "Разгранај све ра_справе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Expand all message threads"
 msgstr "Разгранајте све поруке у расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1872
+#: ../modules/mail/e-mail-shell-view-actions.c:1944
 msgid "_Message Filters"
 msgstr "_Пропусници порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 msgid "Create or edit rules for filtering new mail"
 msgstr "Направите или уредите правила за издвајање нове поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1951
 msgid "_Subscriptions..."
 msgstr "_Пријаве..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "F_older"
 msgstr "_Фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Label"
 msgstr "_Натпис"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "C_reate Search Folder From Search..."
 msgstr "Направи _фасциклу претраге из претраге..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1919
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Search F_olders"
 msgstr "Фас_цикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Create or edit search folder definitions"
 msgstr "Направите или уредите дефиниције фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show Message _Preview"
 msgstr "Прика_жи преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview pane"
 msgstr "Прикажите преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1996
+#: ../modules/mail/e-mail-shell-view-actions.c:2068
+#| msgid "Show Attachment _Bar"
+msgid "Show _Attachment Bar"
+msgstr "Прикажи траку _прилога"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr ""
+"Прикажите траку прилога испод окна прегледа поруке када порука има прилоге"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show _Deleted Messages"
 msgstr "Прикажи о_брисане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Show deleted messages with a line through them"
 msgstr "Прикажите обрисане поруке (као прецртане)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Show _Junk Messages"
 msgstr "Прикажи _непожељне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Show junk messages with a red line through them"
 msgstr "Прикажите непожељне поруке прецртане црвеном линијом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "_Group By Threads"
 msgstr "Групиши по _расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "Threaded message list"
 msgstr "Списак порука по темама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2020
+#: ../modules/mail/e-mail-shell-view-actions.c:2100
 msgid "_Unmatched Folder Enabled"
 msgstr "Укључена _непоклопљена фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Окида приликом укључивања непоклопљене фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2042
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Show message preview below the message list"
 msgstr "Прикажите преглед поруке испод листе порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Show message preview alongside the message list"
 msgstr "Прикажите преглед поруке поред списка порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Messages with Notes"
 msgstr "Поруке са белешкама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2099
+#: ../modules/mail/e-mail-shell-view-actions.c:2179
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2106
+#: ../modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2113
+#: ../modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#: ../modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Message Thread"
 msgstr "Тема поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2180
+#: ../modules/mail/e-mail-shell-view-actions.c:2260
 msgid "Subject or Addresses contain"
 msgstr "Наслов или адресе садрже"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2190
+#: ../modules/mail/e-mail-shell-view-actions.c:2270
 msgid "All Accounts"
 msgstr "свим налозима"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2197
+#: ../modules/mail/e-mail-shell-view-actions.c:2277
 msgid "Current Account"
 msgstr "текућем налогу"
 
 # #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2204
+#: ../modules/mail/e-mail-shell-view-actions.c:2284
 msgid "Current Folder"
 msgstr "текућој фасцикли"
 
@@ -22475,7 +22585,7 @@ msgstr "Претрага свих налога"
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../modules/mail/e-mail-shell-view-private.c:957
+#: ../modules/mail/e-mail-shell-view-private.c:958
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -22484,8 +22594,8 @@ msgstr[1] "%d изабране, "
 msgstr[2] "%d изабраних, "
 msgstr[3] "%d изабрана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
-#: ../modules/mail/e-mail-shell-view-private.c:983
+#: ../modules/mail/e-mail-shell-view-private.c:967
+#: ../modules/mail/e-mail-shell-view-private.c:984
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -22494,8 +22604,8 @@ msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 msgstr[3] "%d обрисана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:992
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:999
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -22504,7 +22614,7 @@ msgstr[1] "%d непожељне"
 msgstr[2] "%d непожељних"
 msgstr[3] "%d непожељна"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1005
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -22513,7 +22623,7 @@ msgstr[1] "%d нацрта"
 msgstr[2] "%d нацрта"
 msgstr[3] "%d нацрт"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -22522,7 +22632,7 @@ msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 msgstr[3] "%d непослата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -22531,7 +22641,7 @@ msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 msgstr[3] "%d послата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -22540,35 +22650,35 @@ msgstr[1] "%d непрочитане"
 msgstr[2] "%d непрочитаних"
 msgstr[3] "%d непрочитана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1552
+#: ../modules/mail/e-mail-shell-view-private.c:1553
 msgid "Send / Receive"
 msgstr "Пошаљи / Прими"
 
-#: ../modules/mail/em-composer-prefs.c:414
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Изаберите фасциклу за додавање"
 
-#: ../modules/mail/em-composer-prefs.c:884
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Фасцикла"
 
-#: ../modules/mail/em-composer-prefs.c:920
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Прималац"
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../modules/mail/em-composer-prefs.c:1204
 msgid "Keep in Outbox"
 msgstr "Задржи у „За слање“"
 
-#: ../modules/mail/em-composer-prefs.c:1206
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Send immediately"
 msgstr "Одмах пошаљи"
 
-#: ../modules/mail/em-composer-prefs.c:1207
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send after 5 minutes"
 msgstr "Пошаљи након 5 минута"
 
-#: ../modules/mail/em-composer-prefs.c:1286
+#: ../modules/mail/em-composer-prefs.c:1285
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
@@ -22616,7 +22726,7 @@ msgstr "Прикажи _оригиналну вредност заглавља"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
-msgstr "Да ли желите да Еволуцију учините подразумеваним клијентом ел. поште?"
+msgstr "Да ли желите да Еволуцију учините подразумеваним клијентом е-поште?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
@@ -22631,13 +22741,13 @@ msgstr "Ваша порука за %s на тему „%s“ на %s је про
 msgid "Delivery Notification for \"%s\""
 msgstr "Обавештење о пријему за „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Пошаљи повратницу читања за „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "Обавести _пошиљаоца"
 
@@ -22826,11 +22936,11 @@ msgstr "Убица спама"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
-msgstr "Филтер непожељне поруке помоћу SpamAssassin"
+msgstr "Филтер непожељне поруке помоћу Убице спама"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Увозим датотеке"
@@ -22853,17 +22963,17 @@ msgstr ""
 "Добродошли у Еволуцију. \n"
 "\n"
 "Неколико наредних екрана ће омогућити Еволуцији да се повеже на ваше налоге "
-"ел. поште и да увезе датотеке из других програма."
+"е-поште и да увезе датотеке из других програма."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Учитавам налоге..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
 msgid "_Format as..."
 msgstr "Обликуј _као..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
 msgid "_Other languages"
 msgstr "_Други језици"
 
@@ -23086,24 +23196,24 @@ msgid "_VHDL"
 msgstr "_ВХДЛ"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../modules/vcard-inline/e-mail-part-vcard.c:187
 msgid "Show F_ull vCard"
 msgstr "Прикажи _пуну вКарту"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../modules/vcard-inline/e-mail-part-vcard.c:192
 msgid "Show Com_pact vCard"
 msgstr "Прикажи _сажету вКарту"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
 msgid "Save _To Addressbook"
 msgstr "Сачувај _у адресар"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 msgid "There is one other contact."
 msgstr "Постоји још један контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -23112,24 +23222,20 @@ msgstr[1] "Постоје још %d контакта."
 msgstr[2] "Постоји још %d контакта."
 msgstr[3] "Постоји још %d контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
 msgid "Addressbook Contact"
 msgstr "Контакт адресара"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
 msgid "Display the part as an addressbook contact"
 msgstr "Прикажите делове као контакт адресара"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-msgid "Evolution Web Inspector"
-msgstr "Надзорник веба Еволуције"
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:490
 msgid "Keywords"
 msgstr "Кључне речи"
 
@@ -23207,7 +23313,7 @@ msgid ""
 msgstr ""
 "Ослобађа вас тешког рада у управљању адресаром.\n"
 "\n"
-"Аутоматски попуњава адресар именима и адресама ел. поште када одговарате на "
+"Аутоматски попуњава адресар именима и адресама е-поште када одговарате на "
 "поруке.  Такође попуњава податке за контакт брзим гласником из списка "
 "другара."
 
@@ -23293,7 +23399,7 @@ msgid "Key"
 msgstr "Кључ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:499
 msgid "Values"
 msgstr "Вредности"
 
@@ -23308,7 +23414,7 @@ msgstr "Додајте прилагођена заглавља одлазним
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
-msgstr "Прилагођено заглавље ел. поште"
+msgstr "Прилагођено заглавље е-поште"
 
 #: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
@@ -23326,8 +23432,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Сам покрени када је нова порука измењена"
 
-#: ../plugins/external-editor/external-editor.c:530
-#: ../plugins/external-editor/external-editor.c:532
+#: ../plugins/external-editor/external-editor.c:437
+#: ../plugins/external-editor/external-editor.c:439
 msgid "Compose in External Editor"
 msgstr "Саставља у спољном уређивачу"
 
@@ -23444,63 +23550,63 @@ msgstr "Није слика"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Изабрана датотека не изгледа као исправна ПНГ слика. Грешка: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get List _Archive"
 msgstr "Прибави _архиву листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Get an archive of the list this message belongs to"
 msgstr "Прибавља архиву листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "Copy _Message Archive URL"
 msgstr "Умножи адресу архиве _поруке"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Умножите непосредну адресу за изабрану поруку у њеној архиви"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get List _Usage Information"
 msgstr "Прибави податке о _коришћењу листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Прибавља податке о коришћењу листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact List _Owner"
 msgstr "_Власник контакт листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Јавите се власнику дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "_Post Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Саставите поруку за дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "_Subscribe to List"
 msgstr "При_јави се на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Пријавите се на дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "_Unsubscribe from List"
 msgstr "О_дјави се са листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Одјавите се са дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
 msgid "Mailing _List"
 msgstr "Дописна _листа"
 
@@ -23575,7 +23681,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
-msgstr "Нема радње за ел. пошту"
+msgstr "Нема радње за е-пошту"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
@@ -23819,35 +23925,35 @@ msgstr ""
 "Изабрани списак белешки је само за читање, стога не можете направити "
 "белешку. Изаберите други списак белешки."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1235
+#: ../plugins/mail-to-task/mail-to-task.c:1231
 msgid "Create an _Appointment"
 msgstr "Направи _заказивање"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 msgid "Create a new event from the selected message"
 msgstr "Прави нови догађај од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1242
+#: ../plugins/mail-to-task/mail-to-task.c:1238
 msgid "Create a Mem_o"
 msgstr "Направи белешк_у"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1240
 msgid "Create a new memo from the selected message"
 msgstr "Прави нову белешку од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1249
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a _Task"
 msgstr "Направи _задатак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1247
 msgid "Create a new task from the selected message"
 msgstr "Прави нови задатак од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1259
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a _Meeting"
 msgstr "Направи _састанак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new meeting from the selected message"
 msgstr "Прави нови састанак од изабране поруке"
 
@@ -24024,7 +24130,7 @@ msgid "_Username:"
 msgstr "_Корисничко име:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "_Лозинка:"
 
@@ -24174,6 +24280,10 @@ msgstr "Сачувај изабрану белешку на диск"
 msgid "Save the selected task list to disk"
 msgstr "Сачувај изабрани списак задатака на диск"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "Без звања"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -24182,53 +24292,54 @@ msgid ""
 msgstr ""
 "Прикључак за образац нацрта. Можете да користите променљиве као што су "
 "$ORIG[тема], $ORIG[шаље], $ORIG[прима] or $ORIG[порука], које ће бити "
-"замењене вредностима из ел. поште на коју одговарате."
+"замењене вредностима из е-поште на коју одговарате."
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "Без звања"
+#: ../plugins/templates/templates.c:1286
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "Чувам шаблон поруке"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1307
 msgid "Save as _Template"
 msgstr "Сачувај као _шаблон"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1309
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
-#: ../shell/e-shell.c:380
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "Припремам се за рад ван мреже..."
 
-#: ../shell/e-shell.c:409
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "Припремам се за рад на мрежи..."
 
-#: ../shell/e-shell.c:520
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "Припремам се да изађем"
 
-#: ../shell/e-shell.c:526
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "Припремам се да изађем..."
 
-#: ../shell/e-shell.c:1043
+#: ../shell/e-shell.c:1044
 msgid "Credentials are required to connect to the destination host."
 msgstr "Потребна су овлашћења за приступање циљном, удаљеном рачунару."
 
-#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Нови _прозор"
 
-#: ../shell/e-shell.c:1222
+#: ../shell/e-shell.c:1223
 msgid "Quick _Reference"
 msgstr "Кратак _подсетник"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_О програму"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Изађи"
 
@@ -24665,7 +24776,7 @@ msgstr ""
 
 #: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
-msgstr "— Еволуција руководилац личним податацима и клијент ел. поште"
+msgstr "— Еволуција руководилац личним податацима и клијент е-поште"
 
 #: ../shell/main.c:536
 #, c-format
@@ -24890,9 +25001,9 @@ msgstr "МД5 Отисак"
 #: ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
-msgstr "Адреса ел. поште"
+msgstr "Адреса е-поште"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:665
 msgid "Select a file to backup your key and certificate..."
 msgstr "Изаберите датотеку за резервну копију кључева и уверења..."
 
@@ -24901,49 +25012,49 @@ msgstr "Изаберите датотеку за резервну копију 
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:677
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-резервна-копија.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:743
 msgid "Backup Certificate"
 msgstr "Резервна копија уверења"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:757
 msgid "_File name:"
 msgstr "_Назив датотеке:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:762
 msgid "Please select a file..."
 msgstr "Изаберите датотеку..."
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Include certificate chain in the backup"
-msgstr "_Укључи ланац уверења у резервну копију"
+msgstr "_Укључи ланац уверења у резерву"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:782
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 "Лозинка за резервну копију уверења коју овде поставите служи да је заштити.\n"
-"Морате да поставите лозинку како би наставили са прављењем резервне копије."
+"Морате да поставите лозинку како би наставили са прављењем резерве."
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:801
 msgid "_Repeat Password:"
 msgstr "Поновите _лозинку:"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:820
 msgid "Passwords do not match"
 msgstr "Лозинке које сте унели нису исте"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:828
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -24951,96 +25062,96 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 "Важно:\n"
-"Уколико заборавите лозинку резервне копије уверења, више нећете моћи да "
-"повратите резервну копију.\n"
+"Уколико заборавите лозинку резерве уверења, више нећете моћи да повратите "
+"резервну копију.\n"
 "Запишите је негде на сигурно место."
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:873
 msgid "No file name provided"
 msgstr "Није дат назив датотеке"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:877
 msgid "Failed to backup key and certificate"
 msgstr "Не могу да направим резервну копију кључа и уверења"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "Изаберите уверење за увоз..."
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "Не могу да увезем уверење"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Питај приликом употребе"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Никада"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Понекад"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Увек"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ултимативно"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1142
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Привремено"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1348
 msgid "Change certificate trust"
 msgstr "Измена поверења за уверење"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1360
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Измена поверења за удаљени рачунар „%s“:"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "П_итај приликом коришћења"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Никада не веруј овом уверењу"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "П_ривремено поверење (само током сесије)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Делимично поверење"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1388
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Потпуно поверење"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1389
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Неограничено поверење"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1393
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -25048,43 +25159,43 @@ msgstr ""
 "Пре веровања овом сајту прегледајте његово уверење, политику и процедуре "
 "(ако су доступни)."
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1408
 msgid "_Display certificate"
 msgstr "Прикажи _уверење"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1613
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Поседујете уверења у датотеци која одређују ове сервере е-поште:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1644
 msgid "Host name"
 msgstr "Име удаљеног рачунара"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1646
 msgid "Issuer"
 msgstr "Издавач"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1647
 msgid "Fingerprint"
 msgstr "Отисак прста"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1648
 msgid "Trust"
 msgstr "Поверење"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1669
 msgid "_Edit Trust"
 msgstr "_Уреди поверење"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2123
 msgid "All PKCS12 files"
 msgstr "Све ПКЦС12 датотеке"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2140
 msgid "All email certificate files"
 msgstr "Све датотеке уверења поште"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2157
 msgid "All CA certificate files"
 msgstr "Све датотеке ЦА уверења"
 
@@ -25197,7 +25308,7 @@ msgstr "У_верење:"
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
-msgstr "Подешавања поверења у уверења ел. поште"
+msgstr "Подешавања поверења у уверења е-поште"
 
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
@@ -25337,6 +25448,76 @@ msgstr "Са _роком"
 msgid "With _Status"
 msgstr "Са _стањем"
 
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "Наведите излазну датотеку уместо стандардног излаза"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "ИЗЛАЗНА-ДАТОТЕКА"
+
+#~ msgid "List local address book folders"
+#~ msgstr "Наводи фасцикле локалног адресара"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "Приказује карте као вкарту или цсв датотеку"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "Грешка у аргументима наредбе, користите опцију „--help“ да видите како се "
+#~ "користи."
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "Подржава само цсв или вкард облик."
+
+#~ msgid "Unhandled error"
+#~ msgstr "Непозната грешка"
+
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "Не могу да отворим „%s“: %s"
+
+#~ msgid "Canceled"
+#~ msgstr "Отказано"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "Отказано"
+
+#~ msgid "Enable developer mode"
+#~ msgstr "Укључи режим за програмере"
+
+#~ msgid ""
+#~ "Enables some hidden actions and tools aimed for development and debugging."
+#~ msgstr ""
+#~ "Укључује неке скривене радње и алате који су намењени програмерима и "
+#~ "исправљању грешака у програму."
+
+#~ msgid "Signature exists, but need public key"
+#~ msgstr "Потпис постоји, али тражи јавни кључ"
+
+#~ msgid "Open Inspector"
+#~ msgstr "Отворени инспектор"
+
+#~ msgid "_Blockquote"
+#~ msgstr "_Цитирање одељка"
+
+#~ msgid "Changed property"
+#~ msgstr "Измењена особина"
+
+#~ msgid "Whether editor changed"
+#~ msgstr "Да ли је уређивач променио"
+
+#~ msgid "_Unsort"
+#~ msgstr "_Не разврставај"
+
+#~ msgid "Canceled."
+#~ msgstr "Отказано."
+
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Надзорник веба Еволуције"
+
 #~ msgid "Edit Reminder"
 #~ msgstr "Уреди подсетник"
 
diff --git a/po/sr latin po b/po/sr latin po
index 5a2289e..72648fc 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,32 +1,29 @@
 # Serbian translation of evolution
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution package.
-#
-# Translators: 
+# Translators:
 # Igor Nestorović <igor prevod org>, 2005.
 # Slobodan D. Sredojević <slobo akrep be>
 # Miloš Popović <gpopac gmail com>, 2010—2015.
 # Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2016.
 # Marko M. Kostić <marko m kostic gmail com>, 2015—2016.
-#
 #: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-03-11 11:50+0000\n"
-"PO-Revision-Date: 2016-03-11 18:23+0100\n"
-"Last-Translator: Marko M. Kostić <marko m kostic gmail com>\n"
-"Language-Team: Serbian <gnom prevod org>\n"
-"Language: sr@latin\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evoluti"MA
+"on&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-26 01:44+0000\n"
+"PO-Revision-Date: 2016-08-30 05:48+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
+"Language-Team: srpski <gnome-sr googlegroups org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.6\n"
 
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:1
@@ -95,7 +92,7 @@ msgid "This address book will be removed permanently."
 msgstr "Ovaj adresar će biti trajno uklonjen."
 
 #: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Ne _briši"
 
@@ -201,15 +198,15 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/e-comp-editor-page-general.c:1357
-#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-mail-signature-manager.c:328
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:416
 #: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:453
+#: ../plugins/templates/templates.c:465
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -317,7 +314,7 @@ msgstr "Puno _ime..."
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
-msgstr "El. pošta"
+msgstr "E-pošta"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "_Wants to receive HTML mail"
@@ -336,7 +333,7 @@ msgid "Instant Messaging"
 msgstr "Trenutne poruke"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -345,8 +342,8 @@ msgid "_Home Page:"
 msgstr "_Lična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:631
-#: ../modules/itip-formatter/itip-view.c:1905
+#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../modules/itip-formatter/itip-view.c:2099
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -436,14 +433,14 @@ msgstr "_Godišnjica:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "Godišnjica"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "Rođendan"
 
@@ -525,8 +522,8 @@ msgstr "Dodaj X._509"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 #: ../calendar/gui/e-comp-editor-page-general.c:1373
-#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
-#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-attachment-view.c:357 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:368
 #: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
 #: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
 #: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
@@ -535,7 +532,7 @@ msgstr "Dodaj X._509"
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
+#: ../plugins/templates/templates.c:475
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -551,14 +548,14 @@ msgstr "Učitaj X.5_09"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
-#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
+#: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
+#: ../e-util/e-attachment-store.c:809
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3842
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:668
+#: ../smime/gui/certificate-manager.c:745
 msgid "_Save"
 msgstr "_Sačuvaj"
 
@@ -568,15 +565,15 @@ msgid "Certificates"
 msgstr "Uverenja"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
 #: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "Po_moć"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Mogućnosti"
@@ -596,14 +593,14 @@ msgstr "Mogućnosti"
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
 #: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
-#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:664
+#: ../e-util/e-attachment-store.c:808 ../e-util/e-attachment-view.c:303
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -611,12 +608,12 @@ msgstr "Mogućnosti"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3841
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
 #: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
@@ -626,10 +623,10 @@ msgstr "Mogućnosti"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
+#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:968
+#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Otkaži"
@@ -679,22 +676,22 @@ msgid "Show Certificates"
 msgstr "Prikaži uverenja"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
 msgid "_Undo"
 msgstr "O_pozovi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Opozovi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
 msgid "_Redo"
 msgstr "Po_novi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Ponovi"
 
@@ -726,8 +723,8 @@ msgid "PGP keys"
 msgstr "PGP ključevi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:691
+#: ../smime/gui/certificate-manager.c:980
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -741,10 +738,10 @@ msgstr "Otvoreno X.506 uverenje"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-attachment-store.c:662 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
 msgstr "_Otvori"
 
@@ -826,11 +823,11 @@ msgstr "Neispravan kontakt."
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -843,7 +840,7 @@ msgstr "Neispravan kontakt."
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "U _redu"
@@ -961,15 +958,15 @@ msgstr "_Sakrij adrese kada šalješ poštu na ovna spisku"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "Add an email to the List"
-msgstr "Dodajte el. poštu na spisak"
+msgstr "Dodajte e-poštu na spisak"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
-msgstr "Uklonite adresu el. pošte sa spiska"
+msgstr "Uklonite adresu e-pošte sa spiska"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
-msgstr "Umetnite adrese el. pošte iz adresara"
+msgstr "Umetnite adrese e-pošte iz adresara"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
@@ -1045,7 +1042,7 @@ msgstr "Polje koje sadrži"
 # note(slobo): spam , Đubre --> Neželjena pošta
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "Adresar Evolucije"
 
@@ -1054,22 +1051,22 @@ msgid "Copy _Email Address"
 msgstr "Umnoži elektronsku _adresu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:340
+#: ../e-util/e-web-view.c:359
 msgid "Copy the email address to the clipboard"
 msgstr "Umnožava adrese u spisak isečaka"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:371
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:354
+#: ../e-util/e-web-view.c:373
 msgid "Send a mail message to this address"
 msgstr "Šalje poruku na ovu adresu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1279
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
@@ -1238,7 +1235,12 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:967
 msgid "Cancelled"
 msgstr "Otkazano"
 
@@ -1260,7 +1262,7 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"Naziv ili adresa el. pošte ovog kontakta već postoji u\n"
+"Naziv ili adresa e-pošte ovog kontakta već postoji u\n"
 "ovoj fascikli. Da li ipak želite da sačuvate izmene?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:774
@@ -1268,7 +1270,7 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
 msgstr ""
-"Naziv ili adresa el. pošte ovog kontakta već postoji\n"
+"Naziv ili adresa e-pošte ovog kontakta već postoji\n"
 "u ovoj fascikli. Da li ipak želite da ga dodate?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:789
@@ -1472,15 +1474,15 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno želite da obrišete ovaj kontakt (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:678
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Obriši"
 
@@ -1621,7 +1623,7 @@ msgid "Title"
 msgstr "Titula"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Uloga"
@@ -1653,7 +1655,7 @@ msgstr "Spisak kontakta: "
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "minikarta evolucije"
 
@@ -1665,7 +1667,7 @@ msgstr "Novi kontakt"
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1685,14 +1687,14 @@ msgstr "U_većaj"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2424
 msgid "Zoom _Out"
 msgstr "U_manji"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
-#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../e-util/e-html-editor-actions.c:1858
+#: ../e-util/e-html-editor-find-dialog.c:252
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Nađi"
@@ -1755,52 +1757,62 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+#| msgid "Can not open file"
+msgid "Can't open .csv file"
+msgstr "Ne mogu da otvorim „.csv“ datoteku"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+#| msgid "Can not open file"
+msgid "Can't open .ldif file"
+msgstr "Ne mogu da otvorim „.ldif“ datoteku"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Evolucijin LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin vKart uvoznik"
 
@@ -1811,51 +1823,6 @@ msgstr "Evolucijin vKart uvoznik"
 msgid "Page %d"
 msgstr "%d. stranica"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "IZLAZNA-DATOTEKA"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "Navodi fascikle lokalnog adresara"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "Prikazuje karte kao vkartu ili csv datoteku"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Greška u argumentima naredbe, koristite opciju „--help“ da vidite kako se "
-"koristi."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "Podržava samo csv ili vkard oblik."
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "Nepoznata greška"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "Ne mogu da otvorim „%s“: %s"
-
 #: ../addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Work Email"
@@ -2003,7 +1970,7 @@ msgid "Start time"
 msgstr "Vreme početka"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "Zakazivanja"
 
@@ -2017,15 +1984,15 @@ msgstr "_Dremanje"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
-#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
-#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
+#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
+#: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
 #: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
+#: ../plugins/templates/templates.c:470 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Uređivanje"
@@ -2039,11 +2006,11 @@ msgid "_Dismiss"
 msgstr "_Zanemari"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1514
-#: ../modules/itip-formatter/itip-view.c:1625
+#: ../modules/itip-formatter/itip-view.c:1724
+#: ../modules/itip-formatter/itip-view.c:1835
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -2075,23 +2042,23 @@ msgstr "sati"
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Podsetnici Evolucije"
 
@@ -2105,21 +2072,21 @@ msgstr[1] "Imate %d potsetnika"
 msgstr[2] "Imate %d potsetnika"
 msgstr[3] "Imate jedan potsetnik"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Ne"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2136,16 +2103,27 @@ msgstr ""
 "\n"
 "Da li ste sigurni da želite da pokrenete ovaj program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "neispravno vreme"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dan"
+msgstr[1] "%d dana"
+msgstr[2] "%d dana"
+msgstr[3] "%d dan"
+
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2156,7 +2134,7 @@ msgstr[2] "%d sati"
 msgstr[3] "Jedan sat"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2169,7 +2147,7 @@ msgstr[3] "Jedan minut"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2366,7 +2344,7 @@ msgstr "Želite li da pošaljete učesnicima pozive na sastanak?"
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
-"Pozivnice će biti poslate el. poštom svim učesnicima i omogućiće im da "
+"Pozivnice će biti poslate e-poštom svim učesnicima i omogućiće im da "
 "odgovore."
 
 #: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
@@ -2396,8 +2374,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
-"Pozivnice el. poštom biće poslate svim učesnicima da bi mogli da prihvate "
-"ovaj zadatak."
+"Pozivnice e-poštom biće poslate svim učesnicima da bi mogli da prihvate ovaj "
+"zadatak."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
@@ -2444,8 +2422,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this memo."
 msgstr ""
-"Pozivnice el. poštom biće poslate svim učesnicima da bi mogli da prihvate "
-"ovu belešku."
+"Pozivnice e-poštom biće poslate svim učesnicima da bi mogli da prihvate ovu "
+"belešku."
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to send updated memo information to participants?"
@@ -2833,7 +2811,7 @@ msgstr "ne sadrži"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Opis"
@@ -2873,7 +2851,7 @@ msgstr "Lično"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
 #: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:115
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Poverljivo"
@@ -2923,7 +2901,7 @@ msgid "Do Not Exist"
 msgstr "Ne postoji"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
@@ -3048,16 +3026,6 @@ msgstr "Dugme za preskakanje"
 msgid "Click here, you can find more events."
 msgstr "Kliknite ovde, možete naći još događaja."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dan"
-msgstr[1] "%d dana"
-msgstr[2] "%d dana"
-msgstr[3] "%d dan"
-
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -3070,28 +3038,28 @@ msgstr[3] "%d nedelja"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Izbaci upozorenje"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 msgctxt "cal-reminders"
 msgid "Send an email"
-msgstr "Pošalji el. poštu"
+msgstr "Pošalji e-poštu"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Pokreni program"
@@ -3175,8 +3143,8 @@ msgstr "pregled kalendara za mesec"
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili više nedelja"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
-#: ../mail/e-mail-config-page.c:125
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Neimenovano"
 
@@ -3201,8 +3169,8 @@ msgid "Due Date:"
 msgstr "Krajnji rok:"
 
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1517
-#: ../modules/itip-formatter/itip-view.c:1634
+#: ../modules/itip-formatter/itip-view.c:1727
+#: ../modules/itip-formatter/itip-view.c:1844
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -3226,14 +3194,6 @@ msgstr "U toku"
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Otkazano"
-
 #: ../calendar/gui/e-cal-component-preview.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:310
 #: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
@@ -3248,20 +3208,20 @@ msgstr "Važnost:"
 
 #: ../calendar/gui/e-cal-component-preview.c:327
 #: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 msgid "High"
 msgstr "Visok"
 
 #: ../calendar/gui/e-cal-component-preview.c:329
 #: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:317
 msgid "Normal"
 msgstr "Običan"
 
 #: ../calendar/gui/e-cal-component-preview.c:331
 #: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "Nizak"
 
@@ -3461,7 +3421,7 @@ msgstr "Ubacujem podatke iz iKalendara"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3470,7 +3430,7 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3478,7 +3438,7 @@ msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
@@ -3489,10 +3449,10 @@ msgstr "Mesto: %s"
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2269
 #: ../calendar/gui/e-calendar-view.c:2276
 #: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3505,13 +3465,13 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
 #: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3526,17 +3486,17 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
 #: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%a %d. %b"
 
-#: ../calendar/gui/e-calendar-view.c:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y."
+msgstr "%a %d. %b %Y."
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
@@ -3567,13 +3527,13 @@ msgstr "Poslednje izmene"
 msgid "Source"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
 #: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6218
+#: ../modules/itip-formatter/itip-view.c:3425
+#: ../modules/itip-formatter/itip-view.c:5999
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Nepoznato"
@@ -3609,39 +3569,39 @@ msgid "Assigned"
 msgstr "Dodeljeno"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Da"
 
 #: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:5987
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:5993
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:5996
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -3651,7 +3611,7 @@ msgstr "Zahteva radnju"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
 #: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
@@ -3927,145 +3887,145 @@ msgstr ""
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Događaj nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/e-comp-editor-event.c:350
+#: ../calendar/gui/e-comp-editor-event.c:438
 #: ../calendar/gui/e-comp-editor-task.c:348
 msgid "Start date is not a valid date"
 msgstr "Datum početka nije ispravan datum"
 
-#: ../calendar/gui/e-comp-editor-event.c:352
+#: ../calendar/gui/e-comp-editor-event.c:440
 msgid "Start time is not a valid time"
 msgstr "Vreme početka nije ispravno vreme"
 
-#: ../calendar/gui/e-comp-editor-event.c:356
-#: ../calendar/gui/e-comp-editor-event.c:372
-#: ../calendar/gui/e-comp-editor-page-attachments.c:211
-#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:991 ../shell/e-shell.c:1013
-#: ../smime/gui/certificate-manager.c:346
+#: ../calendar/gui/e-comp-editor-event.c:444
+#: ../calendar/gui/e-comp-editor-event.c:460
+#: ../calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2008
+#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
+#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
+#: ../smime/gui/certificate-manager.c:359
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../calendar/gui/e-comp-editor-event.c:366
+#: ../calendar/gui/e-comp-editor-event.c:454
 msgid "End date is not a valid date"
 msgstr "Datum kraja nije ispravan datum"
 
-#: ../calendar/gui/e-comp-editor-event.c:368
+#: ../calendar/gui/e-comp-editor-event.c:456
 msgid "End time is not a valid time"
 msgstr "Vreme kraja nije ispravno vreme"
 
-#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-event.c:588
 #: ../calendar/gui/e-comp-editor-memo.c:106
 #: ../calendar/gui/e-comp-editor-task.c:406
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../calendar/gui/e-comp-editor-event.c:492
+#: ../calendar/gui/e-comp-editor-event.c:590
 #: ../calendar/gui/e-comp-editor-memo.c:108
 #: ../calendar/gui/e-comp-editor-task.c:408
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/e-comp-editor-event.c:498
+#: ../calendar/gui/e-comp-editor-event.c:596
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/e-comp-editor-event.c:500
+#: ../calendar/gui/e-comp-editor-event.c:598
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/e-comp-editor-event.c:506
+#: ../calendar/gui/e-comp-editor-event.c:604
 msgid "All _Day Event"
 msgstr "Celodnevni događa_j"
 
-#: ../calendar/gui/e-comp-editor-event.c:508
+#: ../calendar/gui/e-comp-editor-event.c:606
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoljava celodnevne događaje"
 
-#: ../calendar/gui/e-comp-editor-event.c:514
+#: ../calendar/gui/e-comp-editor-event.c:612
 msgid "Show Time as _Busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/e-comp-editor-event.c:516
+#: ../calendar/gui/e-comp-editor-event.c:614
 msgid "Toggles whether to show time as busy"
 msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
-#: ../calendar/gui/e-comp-editor-event.c:525
+#: ../calendar/gui/e-comp-editor-event.c:623
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/e-comp-editor-event.c:527
+#: ../calendar/gui/e-comp-editor-event.c:625
 msgid "Classify as public"
 msgstr "Označite kao javno"
 
-#: ../calendar/gui/e-comp-editor-event.c:532
+#: ../calendar/gui/e-comp-editor-event.c:630
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../calendar/gui/e-comp-editor-event.c:534
+#: ../calendar/gui/e-comp-editor-event.c:632
 msgid "Classify as private"
 msgstr "Označite kao lično"
 
-#: ../calendar/gui/e-comp-editor-event.c:539
+#: ../calendar/gui/e-comp-editor-event.c:637
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/e-comp-editor-event.c:541
+#: ../calendar/gui/e-comp-editor-event.c:639
 msgid "Classify as confidential"
 msgstr "Označite kao poverljivo"
 
-#: ../calendar/gui/e-comp-editor-event.c:642
+#: ../calendar/gui/e-comp-editor-event.c:740
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "Vreme _početka:"
 
-#: ../calendar/gui/e-comp-editor-event.c:647
+#: ../calendar/gui/e-comp-editor-event.c:745
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../calendar/gui/e-comp-editor-event.c:657
+#: ../calendar/gui/e-comp-editor-event.c:755
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Celodnevni _događaj"
 
-#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-event.c:808
 #: ../calendar/gui/e-comp-editor-memo.c:192
 #: ../calendar/gui/e-comp-editor-task.c:529
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Opšte"
 
-#: ../calendar/gui/e-comp-editor-event.c:713
+#: ../calendar/gui/e-comp-editor-event.c:811
 #: ../calendar/gui/e-comp-editor-task.c:535
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Podsetnici"
 
-#: ../calendar/gui/e-comp-editor-event.c:716
+#: ../calendar/gui/e-comp-editor-event.c:814
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
-#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-event.c:817
 #: ../calendar/gui/e-comp-editor-memo.c:195
 #: ../calendar/gui/e-comp-editor-task.c:538
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Prilozi"
 
-#: ../calendar/gui/e-comp-editor-event.c:729
+#: ../calendar/gui/e-comp-editor-event.c:827
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Planiranje"
 
-#: ../calendar/gui/e-comp-editor-event.c:758
+#: ../calendar/gui/e-comp-editor-event.c:859
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak — %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:759
+#: ../calendar/gui/e-comp-editor-event.c:860
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje — %s"
@@ -4108,8 +4068,8 @@ msgstr "Beleška — %s"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:125
 #: ../calendar/gui/e-comp-editor-page-attachments.c:130
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../em-format/e-mail-formatter-attachment.c:337
+#: ../e-util/e-attachment-bar.c:103 ../e-util/e-attachment-bar.c:108
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
@@ -4119,60 +4079,60 @@ msgstr[1] "Prilozi"
 msgstr[2] "Prilozi"
 msgstr[3] "Prilog"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../e-util/e-attachment.c:2542
+#: ../calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../e-util/e-attachment.c:2401
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ne mogu da učitam „%s“"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:208
-#: ../e-util/e-attachment.c:2545
+#: ../calendar/gui/e-comp-editor-page-attachments.c:198
+#: ../e-util/e-attachment.c:2404
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ne mogu da učitam prilog"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#: ../calendar/gui/e-comp-editor-page-attachments.c:403
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr ""
 "Neki prilozi se još uvek preuzimaju. Sačekajte dok se ne završi preuzimanje."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#: ../calendar/gui/e-comp-editor-page-attachments.c:430
 #, c-format
 msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgstr "Ne mogu da nađem prilog „%s“, uklonite ga sa spiska"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#: ../calendar/gui/e-comp-editor-page-attachments.c:447
 #, c-format
 msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
 msgstr "Prilog „%s“ nema ispravnu putanju, uklonite ga sa spiska"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:618
-#: ../composer/e-composer-actions.c:327
+#: ../calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../composer/e-composer-actions.c:319
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:620
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+#: ../calendar/gui/e-comp-editor-page-attachments.c:610
+#: ../composer/e-composer-actions.c:321 ../e-util/e-attachment-view.c:345
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#: ../calendar/gui/e-comp-editor-page-attachments.c:617
 msgid "_Attachments"
 msgstr "_Prilozi"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#: ../calendar/gui/e-comp-editor-page-attachments.c:619
 msgid "Show attachments"
 msgstr "Prikažite priloge"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:781
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+#: ../calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../e-util/e-attachment-bar.c:766 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "Pregled ikonicama"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:783
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+#: ../calendar/gui/e-comp-editor-page-attachments.c:774
+#: ../e-util/e-attachment-bar.c:768 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "Pregled spiskom"
 
@@ -4252,17 +4212,17 @@ msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "_Učesnici..."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
 msgid "Modify exception"
 msgstr "Izmenite izuzetak"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "u"
 
@@ -4270,7 +4230,7 @@ msgstr "u"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "prvog"
@@ -4280,7 +4240,7 @@ msgstr "prvog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "drugog"
@@ -4289,7 +4249,7 @@ msgstr "drugog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "trećeg"
@@ -4298,7 +4258,7 @@ msgstr "trećeg"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "četvrtog"
@@ -4307,7 +4267,7 @@ msgstr "četvrtog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "petog"
@@ -4316,14 +4276,14 @@ msgstr "petog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "poslednjeg"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Drugog datuma"
@@ -4332,7 +4292,7 @@ msgstr "Drugog datuma"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
@@ -4341,7 +4301,7 @@ msgstr "od prvog do desetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
@@ -4350,7 +4310,7 @@ msgstr "od jedanaestog do dvadesetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "od dvadesetprvog do tridesetprvog"
@@ -4358,42 +4318,42 @@ msgstr "od dvadesetprvog do tridesetprvog"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "dana"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "ponedeljka"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "utorka"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "srede"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "četvrtka"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "petka"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "subote"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "nedelje"
@@ -4401,126 +4361,126 @@ msgstr "nedelje"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "pojave"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "Ovo zakazivanje se _ponavlja"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Ovaj zadatak se _ponavlja"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "Ova beleška se _ponavlja"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Ovaj sastojak se _ponavlja"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
 msgid "Recurrence exception date is invalid"
 msgstr "Datum izuzetka ponavljanja nije ispravan"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
 msgid "End time of the recurrence is before the start"
 msgstr "Vreme završetka ponavljanja je pre početka"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
 msgid "R_ecurrence"
 msgstr "_Ponavljanje"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
 msgid "Set or unset recurrence"
 msgstr "Podesite ili poništite ponavljanje"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Svakog"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "dana"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "nedelje"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "meseca"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "godine"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "za"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "do"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "uvek"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../mail/mail-config.ui.h:62
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "_Ukloni"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
 msgid "Preview"
 msgstr "Pregled"
 
@@ -4528,24 +4488,24 @@ msgstr "Pregled"
 msgid "Send To"
 msgstr "Pošalji"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "_Podsetnici"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 msgid "Set or unset reminders"
 msgstr "Podesite ili poništite podsetnike"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
 #: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "Podsetnici"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "_Podsetnik"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
@@ -4554,7 +4514,7 @@ msgstr[1] "%d dana pre"
 msgstr[2] "%d dana pre"
 msgstr[3] "%d dan pre"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
@@ -4563,7 +4523,7 @@ msgstr[1] "%d sata pre"
 msgstr[2] "%d sati pre"
 msgstr[3] "%d sat pre"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -4578,132 +4538,132 @@ msgstr[3] "%d minut pre"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ništa"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "pre 15 minuta"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "pre %d sat"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "pre 1 dana"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Proizvoljno"
 
 # bug: plural-forms
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minut(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "sat(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "dan(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "pre"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "posle"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "početka"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "kraja"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 msgid "Re_peat the reminder"
 msgstr "_Ponovi podsetnik"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "prikaži još na svakih"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minuta"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "sati"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "dana"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Proizvoljna _poruka"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Proizvoljan _zvuk podsetnika"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 msgid "_Send To:"
 msgstr "_Pošalji:"
 
@@ -4787,8 +4747,9 @@ msgid "Completed"
 msgstr "Završeno"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1173
+#| msgid "Cancelled"
 msgctxt "ECompEditor"
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkazano"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
@@ -4881,102 +4842,102 @@ msgstr "Dodeljen zadatak — %s"
 msgid "Task - %s"
 msgstr "Zadatak — %s"
 
-#: ../calendar/gui/e-comp-editor.c:254
+#: ../calendar/gui/e-comp-editor.c:255
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/e-comp-editor.c:609
+#: ../calendar/gui/e-comp-editor.c:610
 msgid "Sending notifications to attendees..."
 msgstr "Šaljem obaveštenja učesnicima..."
 
-#: ../calendar/gui/e-comp-editor.c:991
+#: ../calendar/gui/e-comp-editor.c:995
 msgid "Saving changes..."
 msgstr "Čuvam izmene..."
 
-#: ../calendar/gui/e-comp-editor.c:1247
+#: ../calendar/gui/e-comp-editor.c:1251
 msgid "No Summary"
 msgstr "Bez sažetka"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:299
+#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
-#: ../mail/em-subscription-editor.c:1759
+#: ../mail/e-mail-notes.c:931 ../mail/em-folder-properties.c:786
+#: ../mail/em-subscription-editor.c:1765
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2068
+#: ../smime/gui/certificate-manager.c:2214
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../calendar/gui/e-comp-editor.c:1974
+#: ../calendar/gui/e-comp-editor.c:1978
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: ../calendar/gui/e-comp-editor.c:1981 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
-#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
+#: ../e-util/e-web-view.c:1815 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:801
 msgid "Copy the selection"
 msgstr "Umnožite izabrano"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../calendar/gui/e-comp-editor.c:1988 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1805
 #: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../calendar/gui/e-comp-editor.c:1995 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../calendar/gui/e-comp-editor.c:2002
+#: ../calendar/gui/e-comp-editor.c:2006
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "_Ubaci"
 
-#: ../calendar/gui/e-comp-editor.c:2009 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1825
 #: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
-#: ../mail/e-mail-reader.c:2287
+#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
+#: ../mail/e-mail-reader.c:2326
 #: ../modules/addressbook/e-book-shell-view-actions.c:1231
 #: ../modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "_Print..."
 msgstr "_Štampaj..."
 
-#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
 #: ../modules/addressbook/e-book-shell-view-actions.c:1238
 #: ../modules/calendar/e-cal-shell-view-actions.c:1695
 #: ../modules/calendar/e-memo-shell-view-actions.c:815
@@ -4984,52 +4945,52 @@ msgstr "_Štampaj..."
 msgid "Pre_view..."
 msgstr "_Pregled..."
 
-#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../calendar/gui/e-comp-editor.c:2030 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/e-comp-editor.c:2051
+#: ../calendar/gui/e-comp-editor.c:2055
 msgid "_Classification"
 msgstr "_Razvrstavanje"
 
-#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
-#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/e-comp-editor.c:2105
+#: ../calendar/gui/e-comp-editor.c:2109
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:308
-#: ../mail/e-mail-notes.c:912
+#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
+#: ../mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ../calendar/gui/e-comp-editor.c:2112
+#: ../calendar/gui/e-comp-editor.c:2116
 msgid "Save current changes and close editor"
 msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
 
@@ -5058,13 +5019,13 @@ msgstr "pop"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 msgid "%A %d %B"
-msgstr "%A %d %B"
+msgstr "%A %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3742
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
@@ -5104,94 +5065,94 @@ msgstr "Ništa"
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Obavezni učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
 #: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
 #: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
 #: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
 #: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Stolica"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
 #: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
 #: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "Učesnik                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "MVOM"
@@ -5282,7 +5243,7 @@ msgstr "_Vreme početka:"
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5291,7 +5252,7 @@ msgstr ""
 "Sažetak: %s\n"
 "Mesto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
@@ -5328,38 +5289,38 @@ msgstr "Jezik"
 msgid "Memos"
 msgstr "Beleške"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* Bez sažetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "Početak: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Umnožava izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Briše izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -5387,7 +5348,7 @@ msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
+#: ../calendar/importers/icalendar-importer.c:1116
 #: ../data/evolution.desktop.in.in.h:12
 #: ../modules/calendar/e-calendar-preferences.ui.h:65
 #: ../modules/calendar/e-cal-shell-content.c:1627
@@ -5397,24 +5358,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "Umnožava izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../calendar/gui/e-task-table.c:1016
+#: ../calendar/gui/e-task-table.c:1051
 #: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
@@ -5430,7 +5391,7 @@ msgstr "Datum početka"
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
 msgid "Complete"
 msgstr "Završeno"
 
@@ -5461,32 +5422,32 @@ msgstr "Izaberi vremensku zonu"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -5494,7 +5455,7 @@ msgstr "Podaci o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -5503,7 +5464,7 @@ msgstr "Prihvaćeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -5515,7 +5476,7 @@ msgstr "Prihvaćeno s rezervom"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -5524,7 +5485,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -5532,7 +5493,7 @@ msgstr "Delegirano"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -5540,7 +5501,7 @@ msgstr "Osveženo"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -5548,7 +5509,7 @@ msgstr "Otkaži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -5556,42 +5517,42 @@ msgstr "Osveži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ne mogu da sačuvam unos, novi događaj se sukobljava sa nekim drugim."
 
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "Ne mogu da sačuvam unos, greška: "
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1986
 msgid "Sending an event"
 msgstr "Šaljem događaj"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1990
 msgid "Sending a memo"
 msgstr "Šaljem belešku"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1994
 msgid "Sending a task"
 msgstr "Šaljem zadatak"
 
@@ -5857,40 +5818,40 @@ msgstr "je manje od"
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../modules/calendar/e-cal-base-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/importers/icalendar-importer.c:315
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../modules/calendar/e-cal-base-shell-backend.c:191
 #: ../modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Novi spisak zadataka"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "Napravi _novi kalendar"
 
-#: ../calendar/importers/icalendar-importer.c:361
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "_Napravi novi spisak zadataka"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
@@ -5902,157 +5863,157 @@ msgstr "Datoteke vKalendara (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 msgid "GNOME Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerak"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima podsetnike"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Lično"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Završeno"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -7606,154 +7567,144 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-actions.c:212
+#: ../composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:328
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:333
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:335
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
+#: ../composer/e-composer-actions.c:342 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:349
 msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:354
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:356
 msgid "Save the current file with a different name"
 msgstr "Sačuvajte trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:363
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:387
 msgid "Print Pre_view"
 msgstr "Pregled pred _štampu"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:394
 msgid "Save as _Draft"
 msgstr "Sačuvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:396
 msgid "Save as draft"
 msgstr "Sačuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:401
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:403
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:411
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:413
 msgid "Encrypt this message with PGP"
 msgstr "Šifrujte ovu poruku pomoću PGP-a"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:421
 msgid "Sign this message with your PGP key"
 msgstr "Potpišite ovu poruku pomoću PGP ključa"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:427
 msgid "_Picture Gallery"
 msgstr "Galerija _slika"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:429
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Prikazuje zbirku slika koje možete da prevučete u vašu poruku"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:435
 msgid "_Prioritize Message"
 msgstr "V_ažnost poruke"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:437
 msgid "Set the message priority to high"
 msgstr "Postavlja važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:443
 msgid "Re_quest Read Receipt"
 msgstr "T_raži povratnicu"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:445
 msgid "Get delivery notification when your message is read"
 msgstr "Prima izveštaj o dostavi kada je poruka pročitana"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:451
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:453
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifruje ovu poruku pomoću S/MIME uverenja za šifrovanje"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:461
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
-#: ../composer/e-composer-actions.c:523
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode emoticons"
-msgstr "Unikod smajlići"
-
-#: ../composer/e-composer-actions.c:525
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for emoticons."
-msgstr "Koristi unikod znakove za smajliće."
-
-#: ../composer/e-composer-actions.c:531
+#: ../composer/e-composer-actions.c:515
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:533
+#: ../composer/e-composer-actions.c:517
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje Bcc prikazano"
 
-#: ../composer/e-composer-actions.c:539
+#: ../composer/e-composer-actions.c:523
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:525
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:547
+#: ../composer/e-composer-actions.c:531
 msgid "_From Override Field"
 msgstr "Prikaži polje _Šalje kao ime"
 
-#: ../composer/e-composer-actions.c:549
+#: ../composer/e-composer-actions.c:533
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7761,26 +7712,26 @@ msgstr ""
 "Određuje da li se prikazuje ime osobe ili adrese elektronske pošte u polju "
 "„Šalje“"
 
-#: ../composer/e-composer-actions.c:555
+#: ../composer/e-composer-actions.c:539
 msgid "_Reply-To Field"
 msgstr "Polje Odgo_vor-za"
 
-#: ../composer/e-composer-actions.c:557
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:596
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:602
 msgid "Save Draft"
 msgstr "Sačuvaj nacrt"
 
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-identity-page.c:341
 #: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Ime:"
@@ -7811,7 +7762,7 @@ msgstr "Š_alje:"
 # * expects the reply_to fields to be initialized.
 #: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
-msgstr "_Odgovor-za:"
+msgstr "_Odgovor prima:"
 
 #: ../composer/e-composer-header-table.c:841
 msgid "_To:"
@@ -7834,7 +7785,7 @@ msgid "S_ubject:"
 msgstr "Na_slov:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:516
+#: ../mail/e-mail-config-identity-page.c:534
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
@@ -7846,7 +7797,7 @@ msgstr "Kliknite ovde za adresar."
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7854,7 +7805,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:883
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7863,12 +7814,12 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2409
 #: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4734
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno."
 
@@ -7992,7 +7943,7 @@ msgstr "Prijavljena greška bejaše „{0}“. Poruka najverovatnije nije sačuv
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Došlo je do greške tokom slanja. Kako želite da nastavite?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:175
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Prijavljena greška bejaše „{0}“."
 
@@ -8054,6 +8005,11 @@ msgstr "_Zadrži format"
 msgid "Lose _formatting"
 msgstr "Z_anemari format"
 
+#: ../composer/mail-composer.error.xml.h:41
+#| msgid "An error occurred while saving to your Drafts folder."
+msgid "An error occurred while saving to your Templates folder."
+msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Šabloni."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Obaveštenje alarma Evolucije"
@@ -8063,7 +8019,7 @@ msgid "Calendar event notifications"
 msgstr "Obaveštenja o događajima kalendara"
 
 #: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1118
+#: ../mail/e-mail-browser.c:1101
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8086,7 +8042,7 @@ msgstr "Upravljajte vašom poštom, kontaktima i obavezama"
 
 #: ../data/evolution.desktop.in.in.h:5
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "el.pošta;pošta;kalendar;kontakt;adresar;zadatak;"
+msgstr "e-pošta;pošta;kalendar;kontakt;adresar;zadatak;"
 
 #: ../data/evolution.desktop.in.in.h:6
 msgid "New Window"
@@ -8103,7 +8059,7 @@ msgstr "Kontakti"
 #: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:422
 #: ../modules/mail/e-mail-shell-view.c:1242
-#: ../smime/gui/certificate-manager.c:1671
+#: ../smime/gui/certificate-manager.c:1684
 msgid "Mail"
 msgstr "Pošta"
 
@@ -8139,7 +8095,7 @@ msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"Da li će u unosu da prisili prikazivanje adrese el. pošte sa imenom "
+"Da li će u unosu da prisili prikazivanje adrese e-pošte sa imenom "
 "samodopunjenog kontakta."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
@@ -8287,10 +8243,9 @@ msgid ""
 "used, usually /usr/bin/bogofilter. The command should not contain any other "
 "arguments."
 msgstr ""
-"Puna putanja do naredbe za pokretanje Bogo-filtera (Bogofilter). Ukoliko nije "
-"je postavljena koristi se podrazumevana putanja zadata tokom kompajliranja "
-"programa, obično /usr/bin/bogofilter. Naredba ne treba da sadrži dodatne "
-"opcije."
+"Puna putanja do naredbe za pokretanje Bogo-filtera. Ukoliko nije je postavljena "
+"koristi se podrazumevana putanja zadata tokom kompajliranja programa, obično "
+"„/usr/bin/bogofilter“. Naredba ne treba da sadrži dodatne opcije."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
@@ -8404,8 +8359,8 @@ msgid ""
 "or -1 to use day-start-hour and day-start-minute"
 msgstr ""
 "Vreme u koje počinje radni dan. Daje se u dvadesetčetvoročasovnom obliku "
-"HHMM, od 0000 do 2359, ili -1 ukoliko želite da koristite day-start-hour i "
-"day-start-minute"
+"ČČMM, od 0000 do 2359, ili -1 ukoliko želite da koristite „day-start-hour“ i "
+"„day-start-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
 msgid "Workday end time for Monday"
@@ -8417,8 +8372,8 @@ msgid ""
 "-1 to use day-end-hour and day-end-minute"
 msgstr ""
 "Vreme u koje se završava radni dan. Daje se u dvadesetčetvoročasovnom "
-"obliku, od 0000 do 2359, ili -1 ukoliko želite da koristite day-end-hour i "
-"day-end-minute"
+"obliku, od 0000 do 2359, ili -1 ukoliko želite da koristite „day-end-hour“ i "
+"„day-end-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
 msgid "Workday start time for Tuesday"
@@ -8430,8 +8385,8 @@ msgid ""
 "-1 to use day-start-hour and day-start-minute"
 msgstr ""
 "Vreme u koje se završava radni dan. Daje se u dvadesetčetvoročasovnom "
-"obliku, od 0000 do 2359, ili -1 ukoliko želite da koristite day-start-hour i "
-"day-start-minute"
+"obliku, od 0000 do 2359, ili -1 ukoliko želite da koristite „day-start-hour“ "
+"i „day-start-minute“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
 msgid "Workday end time for Tuesday"
@@ -8636,7 +8591,7 @@ msgstr "Vreme poslednjeg pokretanja podsetnika, u „time_t“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Boja Markus Bejns linije - Dnevni pregled"
+msgstr "Boja Markus Bejns linije — Dnevni pregled"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
@@ -8644,7 +8599,7 @@ msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Boja Markus Bejns linije - traka vremena"
+msgstr "Boja Markus Bejns linije — traka vremena"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
@@ -8911,8 +8866,8 @@ msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
 msgstr ""
-"Da lida prikaže podsetnike za završene zadatke. Kada je stavljeno na netačno "
-"(false), neće se prikazivati podsetnici za završene zadatke."
+"Da li da prikaže podsetnike za završene zadatke. Kada nije postavljeno, neće "
+"se prikazivati podsetnici za završene zadatke."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
@@ -8963,7 +8918,7 @@ msgstr "24-časovni oblik vremena"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr "Da li da prikaže vreme u dvadesetočasovnom formatu, umesto am/pm"
+msgstr "Da li da prikaže vreme u dvadesetočasovnom formatu, umesto prp/pop"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
@@ -9131,10 +9086,23 @@ msgstr ""
 "postavljeno."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Name of the editor to prefer in the message composer"
+msgstr "Naziv uređivača koji se želi u sastavljaču poruka"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn't correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+"Ako naziv ne odgovara ni jednom poznatom uređivaču, onda se koristi ugrađeni "
+"editor Vebkit."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
 msgid "Path where picture gallery should search for its content"
 msgstr "Putanja u kojoj galerija slika treba da traži svoj sadržaj."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -9144,27 +9112,27 @@ msgstr ""
 "fasciklu sa slikama, obično podešena na ~/Slike. Ova fascikla će se takođe "
 "koristi kada podešena putanja ne ukazuje na postojeću fasciklu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Spell check inline"
 msgstr "Unutrašnja provera pravopisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Iscrtava oznake greški pri kucanju uz reči dok kucate."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Automatsko prepoznavanje smajlića"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
@@ -9172,10 +9140,18 @@ msgstr ""
 "Prepoznaje smajliće u tekstu i zamenjuje ih slikama ili Unikod znakovima."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Unicode emoticons"
+msgstr "Unikod smajlići"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr "Koristi unikod znakove za smajliće."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Attribute message"
 msgstr "Priložena poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -9183,11 +9159,11 @@ msgstr ""
 "Tekst koji se ubacuje kada odgovarate na poruku, pripisujući poruku "
 "originalnom autoru"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Forward message"
 msgstr "Prosleđuje poruku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -9195,11 +9171,11 @@ msgstr ""
 "Tekst koji se ubacuje prilikom prosleđivanja poruke, koji je rekao da "
 "prosleđena poruka sledi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Original message"
 msgstr "Originalna poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -9207,11 +9183,11 @@ msgstr ""
 "Tekst koji se ubacuje prilikom prosleđivanja poruke (objava pri vrhu), koji "
 "je rekao da prosleđena poruka sledi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Group Reply replies to list"
 msgstr "Grupisanje odgovora Odgovori na spisku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -9222,11 +9198,11 @@ msgstr ""
 "„Odgovor grupi“ na traci alata koje će pokušati da odgovori samo na dopisnu "
 "listi preko koje ste navikli da primate primerak poruke na koju odgovarate."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Put the cursor at the bottom of replies"
 msgstr "Postavlja kursor na dno odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -9236,35 +9212,35 @@ msgstr ""
 "odgovara na poruku. Ovo utvrđuje da li će biti postavljen na vrh ili na dno "
 "poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Always request read receipt"
 msgstr "Uvek traži povratnicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Da li se povratnica podrazumevano dodaje svakoj poruci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano slanje HTML pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "Send HTML mail by default."
 msgstr "Šalje HTML poštu po podrazumevanoj vrednosti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Spisak oznaka jezika rečnika koji se koriste za proveru pravopisa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Prikazivanje polja „Bcc“ pri slanju poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9272,11 +9248,11 @@ msgstr ""
 "Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
 "„Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Prikazivanje polja „Cc“ pri slanju poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -9284,11 +9260,11 @@ msgstr ""
 "Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
 "„Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Prikazuje polje „Šalje“ sa imenom kontakta pri slanju poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"From\" override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -9296,11 +9272,11 @@ msgstr ""
 "Prikazuje polje „Šalje“ sa imenom kontakta pri slanju poruke. Ovo se postavlja "
 "iz menija „Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Prikazivanje polja „Odgovor za“ kada šalje poruku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -9308,11 +9284,11 @@ msgstr ""
 "Prikazuje polje „Odgovor za“ pri slanju na poruke. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Prikazivanje polja „Šalje“ pri slanju na dopisnu listu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -9320,11 +9296,11 @@ msgstr ""
 "Prikazuje polje „Šalje“ pri slanju na dopisnu listu. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Prikazivanje polja „Odgovor za“ pri slanju na dopisnna spisku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -9332,11 +9308,11 @@ msgstr ""
 "Prikazuje polje „Odgovor za“ pri slanju na dopisnu listu. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitalno potpisuje odgovore kada je potpisana originalna poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -9344,11 +9320,11 @@ msgstr ""
 "Sam uključuje PGP ili S/MIME potpise kada odgovara na poruke koje su takođe "
 "PGP ili S/MIME potpisane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodiranje naziva datoteka na način Autluka/Gpošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -9359,11 +9335,11 @@ msgstr ""
 "kako bi ispravno prikazali nazive sa UTF-8 slovima koje šalje Evolucija, "
 "pošto se ne pridržavaju RFC 2231, nego koriste neispravan standard RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Send messages through Outbox folder"
 msgstr "Šalji poruku kroz fasciklu Za slanje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
@@ -9371,11 +9347,11 @@ msgstr ""
 "Uvek čuva poruku u fasciklu „Za slanje“ prilikom slanja, što omogućava "
 "korisniku da pošalje poruku po potrebi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavlja personalizovane potpise iznad odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -9385,11 +9361,11 @@ msgstr ""
 "se odgovara na poruku. Ovo utvrđuje da li će biti postavljen na vrh ili na "
 "dno poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaje razdvojnik potpisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -9397,11 +9373,11 @@ msgstr ""
 "Izaberite ovu opciju u slučaju da ne želite dodavanje razdvojnika ispred "
 "potpisa prilikom pisanja poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Ignore list Reply-To:"
 msgstr "Zanemaruje listu „Odgovor-za:“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -9419,11 +9395,11 @@ msgstr ""
 "koristite radnju „Odgovori na listu“ onda će to da uradi. Vrši se upoređivanje "
 "zaglavlje „Odgovor-za“ sa zaglavljem „Spisak objava“, ako postoji."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "List of localized 'Re'"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -9433,17 +9409,6 @@ msgstr ""
 "preskočene u tekstu prilikom odgovaranja na poruku, kao dodatak standardnom "
 "„Odg“ prefiksu. Jedan primer je „SV,AV“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Enable developer mode"
-msgstr "Uključi režim za programere"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-msgid ""
-"Enables some hidden actions and tools aimed for development and debugging."
-msgstr ""
-"Uključuje neke skrivene radnje i alate koji su namenjeni programerima i "
-"ispravljanju grešaka u programu."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr "Broj znakova za prelom"
@@ -9475,9 +9440,9 @@ msgid ""
 "always shown in the composer's toolbar. Otherwise they are shown only when "
 "being used."
 msgstr ""
-"Ukoliko je postavljeno na tačno (true), dugmići za potpis i šifrovanje pomoću "
-"PGP ili S/MIME će uvek biti prikazani unutar trake sa alatima sastavljača "
-"poruka. U suprotnom će biti prikazani samo kada se koriste."
+"Ako je izabrano, dugmići za potpis i šifrovanje pomoću PGP ili S/MIME će uvek "
+"biti prikazani unutar trake sa alatima sastavljača poruka. U suprotnom će "
+"biti prikazani samo kada se koriste."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Wrap quoted text in replies"
@@ -9488,18 +9453,30 @@ msgid "If set to 'true' quoted text in replies will be wrapped."
 msgstr "Ako je izabrano citirani tekst u odgovorima biće prelomljen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr "Da li da posluša savet zaglavlja poruke „Razmeštaj-sadržaja:na_mreži“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
+"Set to 'false' to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+"Poništite ovu opciju da blokirate automatski prikaz priloga sa "
+"„razmeštajem-sadržaja:na mreži“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Save file format for drag-and-drop operation"
 msgstr "Format datoteke čuvanja za radnju prevlačenja i ubacivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Može biti „mbox“ ili „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Show image animations"
 msgstr "Prikazivanje animiranih slika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9507,11 +9484,11 @@ msgstr ""
 "Omogućava animirane slike u HTML pošti. Mnogim korisnicima smetaju animirane "
 "slike i umesto njih žele nepokretne slike."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable type ahead search feature"
 msgstr "Uključuje ili isključuje mogućnost traženja kucanja unapred"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9519,11 +9496,11 @@ msgstr ""
 "Omogućava pretraživanje iz bočne površi, što donosi interaktivnost u pretrazi "
 "naziva fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable or disable magic space bar"
 msgstr "Uključuje ili isključuje magičnu razmaknicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9531,57 +9508,57 @@ msgstr ""
 "Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
 "spisak poruka i fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kursora, tako da vidite kursor dok čitate poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Samostalno učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show notification about missing remote content"
 msgstr "Prikazuje obaveštenje o nedostajućem udaljenom sadržaju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -9591,27 +9568,27 @@ msgstr ""
 "sadržaja, a preuzimanje nije dopušteno korisnicima ili sajtu, tada prikazuje "
 "obaveštenje o tome na vrhu panela za pregled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Show all the headers when viewing a messages."
 msgstr "Prikazuje sva zaglavlja pri pregledu poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "List of headers to show when viewing a message."
 msgstr "Spisak zaglavlja za prikazivanje pri pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -9621,82 +9598,94 @@ msgstr ""
 "koja ukazuje da li je zaglavlje uključeno. Isključena zaglavlja nisu prikazana "
 "uprilikom pregleda pruke, ali su još uvek na spisku u postavkama."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Pretražuje gravatar.com kako bi našao sliku pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 "Omogućava pretragu sajta gravatar.com kako bi pronašao fotografiju pošiljaoca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava poruku viđenom posle navedenog roka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Mark as Seen always after specified timeout"
 msgstr "Uvek označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr ""
-"Ukoliko je postavljeno na tačno (true), izabrana poruka će biti označena kao "
-"nepročitana nakon određeno vremena i nakon izmene fascikle."
+"Ako je izabrano, izabrana poruka će biti označena kao nepročitana nakon "
+"određeno vremena i nakon izmene fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Timeout for marking messages as seen"
 msgstr "Vreme za označavanje poruka kao viđenim"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Vreme u milisekundama za koje će poruke biti označene kao viđenim."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "Prikaz trake priloga"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+"Prikazuje traku priloga ispod okna pregleda poruke kada poruka ima priloge."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Sender email-address column in the message list"
 msgstr "Prikaz kolone e-adresa pošiljaoca u spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show junk messages in the message-list"
 msgstr "Prikazivanje nepoželjnih poruka na spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Prikazuje nepoželjne poruke (precrtane crvenom bojom) na spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Enable Unmatched search folder"
 msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9704,11 +9693,11 @@ msgstr ""
 "Uključuje nepoklopljene fascikle pretrage unutar fascikli pretrage. Ne radi "
 "ništa ako je su isključene fascikle pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9716,31 +9705,31 @@ msgstr ""
 "Ovak ključ je pročitan jednom i potom vraćen na „false“ (netačno). Ovo uklanja "
 "poštu sa spiska i pregled za tu fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Da li su zaglavlja poruke skupljena u korisničkom sučelju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9751,47 +9740,47 @@ msgstr ""
 "poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — "
 "(vertikalan pregled) smešta površ pored spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veličine za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagođene fontove za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažima prikaz adresa u Za/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Vrši sažimanje prikaza adresa u Za/CC/BCC na broj određen u address_count "
-"(broj adresa)."
+"Vrši sažimanje prikaza adresa u Prima/CC/BCC na broj određen u broju adresa "
+"(address_count)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9799,11 +9788,11 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je prikazano „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9811,11 +9800,11 @@ msgstr ""
 "Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja „In-"
 "Reply-To“ ili „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9823,11 +9812,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti podrazumevano biti raširene ili "
 "skupljene. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Da li se poruke nižu na osnovu poslednje poruke u raspravi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9836,11 +9825,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti biti razvrstani po poslednjoj poruci "
 "jedne niti, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Whether sort thread children always ascending"
 msgstr "Da li se podrasprave ređaju rastući"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -9848,11 +9837,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će rasprave nižeg nivoa biti razvrstani "
 "rastući, umesto na istom način kao unutar roditeljskih niti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ređa naloge azbučnim redom u stablu fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9864,27 +9853,27 @@ msgstr ""
 "izuzetkom fascikli „Na ovom računaru“ i „Potraži“, u suprotnom nalozi bivaju "
 "poređani na osnovu poretka koji je zadao korisnik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9894,55 +9883,55 @@ msgstr ""
 "ove fascikle će se dogoditi samo ako se koristi neka radnja filtera "
 "„Prosledi“ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ctrl + Enter)"
+msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ktrl + Unesi)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 "Upozorava korisnika kada pokuša da pošalje pouku pomoću prečice sa tastature."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez naslova."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni smeće."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Upitaće pre slanja primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9950,19 +9939,19 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da pošaljete poruku "
 "primaocima koji nisu unešeni kao adrese pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user only fills Bcc"
 msgstr "Postavlja upit kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez primalaca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Postavlja upit kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9970,12 +9959,12 @@ msgstr ""
 "Postavlja upit kada korisnik pokuša da pošalje HTML poruku primaocima koji "
 "možda ne žele da primaju HTML poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Postavlja upit korisniku kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9983,19 +9972,19 @@ msgstr ""
 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pitaće ga da "
 "li zaista želi to da uradi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Uključuje ili isključuje upozorenje pri označavanju više poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when deleting messages in search folder"
 msgstr "Postavlja upit kod brisanja poruka iz fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10004,12 +9993,12 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da je brisanje poruke iz fascikle "
 "pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da umnoži fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -10021,12 +10010,12 @@ msgstr ""
 "fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
 "(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da premesti fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -10038,11 +10027,11 @@ msgstr ""
 "fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
 "(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying privately to list messages"
 msgstr "Postavlja upit kada odgovarate privatno na listu poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10050,11 +10039,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete privatan odgovor na "
 "poruku koja je stigla sa dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Postavlja upit kada dopisna lista oduzme privatne odgovore"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10064,25 +10053,25 @@ msgstr ""
 "odgovor na poruku koja je stigla sa dopisne liste, ali u listi zaglavlje "
 "„Odgovor-za“ je podešeno da vas preusmeri da odgovorite na listu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when replying to many recipients"
 msgstr "Postavlja upit kada odgovarate većem broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete odgovor mnogim ljudima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 "Upozorenje o gubitku formatiranja prilikom prebacivanja u ređim sastavljača"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
@@ -10090,11 +10079,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da se prebacite u "
 "režim sastavljača i pri tome izgubite formatiranje sadržaja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Upozorava kada šaljete e-poruku velikom broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -10103,7 +10092,7 @@ msgstr ""
 "pošiljaoca navedenih u poljima „Za“ ili „CC“. Vrednost „composer-many-to-cc-"
 "recips-num“ određuje prag za upozorenje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -10111,42 +10100,42 @@ msgstr ""
 "Politika za samostalno zatvaranje prozora preglednika poruka prilikom "
 "prosleđivanja ili odgovaranja na prikazanu poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje smeća, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj traci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10154,11 +10143,11 @@ msgstr ""
 "Može imati tri moguće vrednosti: 0 — za greške, 1 — za upozorenja i 2 — za "
 "poruke o dijagnozi kvara."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Show original \"Date\" header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -10168,11 +10157,11 @@ msgstr ""
 "se vremenske zone razlikuju). Inače uvek prikazuje vrednost zaglavlja „Datum“ "
 "prema postavkama i vremenskoj zoni korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10180,46 +10169,46 @@ msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "oblika ime:boja gde boja koristi HTML heksa kodiranje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Check incoming mail being junk"
 msgstr "Vrši proveru da li je pristigla pošta đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima đubreta u dolaznoj pošti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa đubretom pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje đubreta, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -10229,11 +10218,11 @@ msgstr ""
 "priključci. Ukoliko je pomenuti podrazumevani priključak isključen, preostali "
 "dostupni priključci neće biti aktivirani."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li u adresaru da pregleda adrese pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10245,7 +10234,7 @@ msgstr ""
 "samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za "
 "samodopunjavanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10253,23 +10242,23 @@ msgstr ""
 "Utvrđuje da li samo u adresaru da pregleda adrese u potrazi za neželjenom "
 "poštom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
-"Ova opcija se odnosi na ključ lookup_addressbook i koristi se za određivanje "
+"Ova opcija se odnosi na ključ „lookup_addressbook“ i koristi se za određivanje "
 "da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
 "primljena od poznatih pošiljalaca od one neželjene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10278,11 +10267,11 @@ msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Custom headers to use while checking for junk."
 msgstr "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10290,31 +10279,31 @@ msgstr ""
 "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi "
 "spiska su niz formata „headername=value“ (ime zaglavlja=vrednost)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Directory for saving mail component files."
 msgstr "Direktorijum za čuvanje datoteka modula za poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorijum za učitavanje/prilaganje datoteka u sastavljač."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Check for new messages on start"
 msgstr "Vrši proveru za novim porukama prilikom pokretanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -10322,11 +10311,11 @@ msgstr ""
 "Da li će vršiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
 "uključuje i slanje poruka iz fascikle Poslato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Check for new messages in all active accounts"
 msgstr "Vrši proveru za novim porukama u svim aktivnim nalozima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -10337,11 +10326,11 @@ msgstr ""
 "pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
 "„send_recv_on_start“ (pošalji_primi_pri_pokretanju) opcijom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10349,11 +10338,11 @@ msgstr ""
 "Kontroliše učestalost usklađivanja lokalnih izmena sa mrežnim serverom pošte. "
 "Interval mora biti najmanje 30 sekundi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Allow expunge in virtual folders"
 msgstr "Dozvoli pražnjenje virtuelnih fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -10365,12 +10354,12 @@ msgstr ""
 "pokrenuta nad svim fasciklama i za sve izbrisane poruke u virtuelnoj "
 "fascikli, ne samo za obrisane poruke koje pripadaju virtuelnoj fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "Nasledi boju teme iz HTML režima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -10378,11 +10367,11 @@ msgstr ""
 "Kada je omogućeno boja pozadine, teksta i veze će biti poslata u krajnjoj "
 "HTML poruci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "An Archive folder for On This Computer folders."
 msgstr "Fascikla Arhiva unutar fascikle Na ovom računaru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -10390,11 +10379,11 @@ msgstr ""
 "Fascikla Arhiva koja se koristi za poruke|arhive... mogućnost se javlja "
 "unutar fascikle Na ovom računaru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) Default forward style"
 msgstr "(Zastarelo) Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -10402,11 +10391,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Default reply style"
 msgstr "(Zastarelo) Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -10414,11 +10403,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Zastarelo) Spisak proizvoljnih zaglavlja i da li su uključena."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -10426,11 +10415,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Zastarelo) Učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -10438,7 +10427,7 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -10446,7 +10435,7 @@ msgstr ""
 "(Zastarelo) Pita da li da zatvori prozor sa porukom kada korisnik prosleđuje "
 "ili odgovara na poruku prikazanu u prozoru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10633,8 +10622,8 @@ msgid ""
 "and \"notify-sound-use-theme\" keys are disregarded."
 msgstr ""
 "Da li će da pusti bilo kakav zvuk kada pristignu nove poruke. Ako nije "
-"izabrano (false), onda se ključevi „notify-sound-beep“, „notify-sound-file“, "
-"„notify-sound-play-file“ i „notify-sound-use-theme“ ne uzimaju u obzir."
+"izabrano, onda se ključevi „notify-sound-beep“, „notify-sound-file“, „notify-"
+"sound-play-file“ i „notify-sound-use-theme“ ne uzimaju u obzir."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
@@ -10865,7 +10854,7 @@ msgid ""
 msgstr ""
 "Puna putanja do naredbe za ubicu nepoželjnih poruka (spamassassin). Ukoliko "
 "nije određeno, koristi se putanja koja je određena tokom kompajliranja "
-"programa, obično /usr/bin/spamassassin. Naredba ne treba da sadrži dodatne "
+"programa, obično „/usr/bin/spamassassin“. Naredba ne treba da sadrži dodatne "
 "opcije."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
@@ -10878,11 +10867,11 @@ msgid ""
 "used, usually /usr/bin/sa-learn. The command should not contain any other "
 "arguments."
 msgstr ""
-"Puna putanja do naredbe sa-learn. Ukoliko nije određeno, koristi se putanja "
-"koja je određena tokom kompajliranja programa, obično /usr/bin/sa-learn. "
+"Puna putanja do naredbe „sa-learn“. Ukoliko nije određeno, koristi se putanja "
+"koja je određena tokom kompajliranja programa, obično „/usr/bin/sa-learn“. "
 "Naredba ne treba da sadrži dodatne opcije."
 
-#: ../em-format/e-mail-formatter-attachment.c:425
+#: ../em-format/e-mail-formatter-attachment.c:338
 msgid "Display as attachment"
 msgstr "Prikaži kao prilog"
 
@@ -10917,11 +10906,11 @@ msgstr "Obična slika"
 msgid "Display part as an image"
 msgstr "Prikazuje delove kao sliku"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#: ../em-format/e-mail-formatter-message-rfc822.c:250
 msgid "RFC822 message"
 msgstr "RFC822 poruka"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../em-format/e-mail-formatter-message-rfc822.c:251
 msgid "Format part as an RFC822 message"
 msgstr "Oblikuje deo kao RFC822 poruku"
 
@@ -10933,7 +10922,7 @@ msgid "Name"
 msgstr "Naziv"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Veličina"
 
@@ -10941,7 +10930,7 @@ msgstr "Veličina"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
 msgid "Subject"
 msgstr "Naslov"
 
@@ -10963,18 +10952,18 @@ msgid "Display part as enriched text"
 msgstr "Prikazuje deo kao obogaćeni tekst"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 msgid "Format part as HTML"
 msgstr "Oblikuje deo kao HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "Plain Text"
 msgstr "Običan tekst"
 
@@ -10983,21 +10972,21 @@ msgstr "Običan tekst"
 msgid "Format part as plain text"
 msgstr "Oblikuje deo kao običan tekst"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../em-format/e-mail-formatter-secure-button.c:46
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11005,22 +10994,22 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno verodostojan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:48
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali ne mogu da proverim pošiljaoca"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:49
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11028,21 +11017,32 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
 "biti proveren."
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
-msgid "Signature exists, but need public key"
-msgstr "Potpis postoji, ali traži javni ključ"
+#: ../em-format/e-mail-formatter-secure-button.c:50
+#| msgid ""
+#| "This message is signed with a signature, but there is no corresponding "
+#| "public key."
+msgid "This message is signed, but the public key is not in your keyring"
+msgstr "Ova poruka je potpisana, ali javni ključ nije u vašem privesku ključeva"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:50
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "Ova poruka je potpisana, ali nema odgovarajućeg javnog ključa."
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
+msgstr ""
+"Ova poruka je digitalno potpisana, ali odgovarajući javni ključ nije prisutan "
+"u vašem privesku za ključeve. Ako želite da budete u stanju da potvrdite "
+"autentičnost poruka od te osobe, trebalo bi da nabavite javni ključ kroz "
+"pouzdane metode i dodate ga na privezak za ključeve. Do tada, nema garancije "
+"da je ova poruka zaista došla od te osobe i da je stigla nepromenjena."
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11050,11 +11050,11 @@ msgstr ""
 "Ova poruka nije šifrovana. Njen sadržaj je moguće videti u prenosu preko "
 "Interneta."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:60
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11063,22 +11063,22 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće "
 "da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:61
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11087,15 +11087,6 @@ msgstr ""
 "Ova poruka je šifrovana, jakim algoritmom. Veoma je teško da neko sa strane "
 "u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "Pregledaj _uverenje"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr "Ovo uverenje nije čitljivo"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Prikazuje izvoe kao MIME deo"
@@ -11138,8 +11129,8 @@ msgstr "S/MIME šifrovano"
 
 #: ../em-format/e-mail-formatter-utils.c:593
 #: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
 msgid "Security"
 msgstr "Bezbednost"
 
@@ -11230,7 +11221,16 @@ msgstr "Grupe vesti"
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-secure-button.c:118 ../shell/shell.error.xml.h:28
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "_View Certificate"
+msgstr "Pregledaj _uverenje"
+
+#: ../em-format/e-mail-part-secure-button.c:133
+msgid "This certificate is not viewable"
+msgstr "Ovo uverenje nije čitljivo"
+
+#: ../em-format/e-mail-part-utils.c:552
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
@@ -11286,7 +11286,7 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1851
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -11304,49 +11304,49 @@ msgstr "Ne mogu da započnem raspravu: "
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1227
+#: ../e-util/e-attachment.c:1141
 msgid "Attached message"
 msgstr "Priložena poruka"
 
-#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
+#: ../e-util/e-attachment.c:2043 ../e-util/e-attachment.c:3029
 msgid "Operation was cancelled"
 msgstr "Radnja je otkazana."
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
-#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
+#: ../e-util/e-attachment.c:2203 ../e-util/e-attachment.c:2891
+#: ../e-util/e-attachment.c:3262 ../e-util/e-attachment-store.c:864
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
+#: ../e-util/e-attachment.c:2284 ../e-util/e-attachment.c:3322
 msgid "A load operation is already in progress"
 msgstr "Operacija učitavanja je već u toku"
 
-#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
+#: ../e-util/e-attachment.c:2292 ../e-util/e-attachment.c:3330
 msgid "A save operation is already in progress"
 msgstr "Operacija čuvanja je već u toku"
 
-#: ../e-util/e-attachment.c:2830
+#: ../e-util/e-attachment.c:2689
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ne mogu da otvorim „%s“"
 
-#: ../e-util/e-attachment.c:2833
+#: ../e-util/e-attachment.c:2692
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ne mogu da otvorim prilog"
 
-#: ../e-util/e-attachment.c:3480
+#: ../e-util/e-attachment.c:3339
 msgid "Attachment contents not loaded"
 msgstr "Sadržaj priloga nije učitan"
 
 # * found, so just bail completely.
-#: ../e-util/e-attachment.c:3571
+#: ../e-util/e-attachment.c:3430
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ne mogu da sačuvam „%s“"
 
-#: ../e-util/e-attachment.c:3574
+#: ../e-util/e-attachment.c:3433
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne mogu da sačuvam prilog"
@@ -11355,13 +11355,13 @@ msgstr "Ne mogu da sačuvam prilog"
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "_Naziv datoteke:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:422
+#: ../e-util/e-html-editor-image-dialog.c:510
+#: ../e-util/e-html-editor-link-dialog.c:243
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -11369,7 +11369,7 @@ msgstr "_Opis:"
 msgid "MIME Type:"
 msgstr "MIME vrsta:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "_Predloži automatski prikaz priloga"
 
@@ -11381,13 +11381,13 @@ msgstr "Ne mogu da postavim kao pozadinu"
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "Učitavam"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "Čuvam"
 
@@ -11399,19 +11399,19 @@ msgstr "Sakrij liniju pri_loga"
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
 
-#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
+#: ../e-util/e-attachment-store.c:666 ../e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "Pri_loži"
 
-#: ../e-util/e-attachment-store.c:538
+#: ../e-util/e-attachment-store.c:706
 msgid "Archive selected directories using this format:"
 msgstr "Ariviraj izabrane direktorijume u ovom formatu:"
 
-#: ../e-util/e-attachment-store.c:631
+#: ../e-util/e-attachment-store.c:799
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Sačuvaj prilog"
@@ -11419,89 +11419,57 @@ msgstr[1] "Sačuvaj priloge"
 msgstr[2] "Sačuvaj priloge"
 msgstr[3] "Sačuvaj prilog"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:826
 msgid "Do _not extract files from the attachment"
 msgstr "Ne _raspakuj datoteke iz priloga"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:831
 msgid "Save extracted files _only"
 msgstr "Sačuvaj _samo izvučene datoteke"
 
-#: ../e-util/e-attachment-store.c:668
+#: ../e-util/e-attachment-store.c:836
 msgid "Save extracted files and the original _archive"
 msgstr "Sačuvaj izvučene datoteke i originalne _arhive"
 
-#: ../e-util/e-attachment-view.c:428
+#: ../e-util/e-attachment-view.c:310
 msgid "Open With Other Application..."
 msgstr "Otvori drugim programom..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:317
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:324
 msgid "Sa_ve As"
 msgstr "Sačuvaj _kao"
 
-#: ../e-util/e-attachment-view.c:451
+#: ../e-util/e-attachment-view.c:333
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Sačuvaj _kao"
 
-#: ../e-util/e-attachment-view.c:461
+#: ../e-util/e-attachment-view.c:343
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../e-util/e-attachment-view.c:468
+#: ../e-util/e-attachment-view.c:350
 #: ../modules/addressbook/e-book-shell-view-actions.c:1097
 #: ../modules/calendar/e-cal-shell-view-actions.c:1278
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 #: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
-msgid "_Hide"
-msgstr "_Sakrij"
-
-#: ../e-util/e-attachment-view.c:492
-msgid "Hid_e All"
-msgstr "Sak_rij sve"
-
-#: ../e-util/e-attachment-view.c:499
-msgid "_View Inline"
-msgstr "Pre_gledaj unutar"
-
-#: ../e-util/e-attachment-view.c:506
-msgid "Vie_w All Inline"
-msgstr "Pre_gledaj sve unutar"
-
-#: ../e-util/e-attachment-view.c:513
-msgid "_Zoom to 100%"
-msgstr "Uvećaj na _100%"
-
-#: ../e-util/e-attachment-view.c:515
-msgid "Zoom the image to its natural size"
-msgstr "Postavlja uvećanje slike na njenu originalnu veličinu"
-
-#: ../e-util/e-attachment-view.c:520
-msgid "_Zoom to window"
-msgstr "U_klopi u prozor"
-
-#: ../e-util/e-attachment-view.c:522
-msgid "Zoom large images to not be wider than the window width"
-msgstr "Umanjuje velike slike tako da se uklope u širinu prozora"
-
-#: ../e-util/e-attachment-view.c:880
+#: ../e-util/e-attachment-view.c:660
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Otvori programom „%s“"
 
-#: ../e-util/e-attachment-view.c:883
+#: ../e-util/e-attachment-view.c:663
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u „%s“"
@@ -11523,40 +11491,40 @@ msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
 msgid "Ctrl-click to open a link"
 msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "Prethodni mesec"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "Sledeći mesec"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "Prethodna godina"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "Sledeća godina"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
@@ -11654,7 +11622,7 @@ msgid "popup list"
 msgstr "iskačuća lista"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11665,7 +11633,7 @@ msgstr "Sada"
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
 #: ../modules/calendar/e-cal-shell-view-actions.c:1793
-#: ../modules/itip-formatter/itip-view.c:221
+#: ../modules/itip-formatter/itip-view.c:255
 msgid "Today"
 msgstr "Danas"
 
@@ -11952,9 +11920,9 @@ msgstr "svetloljubičasta"
 msgid "white"
 msgstr "bela"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4063
 #: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Osnovno"
@@ -12020,7 +11988,7 @@ msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:283
 msgid "Tomorrow"
 msgstr "Sutra"
 
@@ -12121,7 +12089,7 @@ msgstr "_Osmeh"
 #. Translators: :-|
 #: ../e-util/e-emoticon-chooser.c:50
 msgid "_Plain"
-msgstr "_Ravni"
+msgstr "_Normalan"
 
 #. Translators: :-!
 #: ../e-util/e-emoticon-chooser.c:52
@@ -12230,10 +12198,10 @@ msgstr[3] "pre %d sekunde"
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "%d sekunda u budućnosti"
-msgstr[1] "%d sekunde u budućnosti"
-msgstr[2] "%d sekundi u budućnosti"
-msgstr[3] "%d sekunda u budućnosti"
+msgstr[0] "za %d sekundu"
+msgstr[1] "za %d sekunde"
+msgstr[2] "za %d sekundi"
+msgstr[3] "za %d sekundu"
 
 #: ../e-util/e-filter-datespec.c:68
 #, c-format
@@ -12248,10 +12216,10 @@ msgstr[3] "pre %d minut"
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "%d minut u budućnosti"
-msgstr[1] "%d minuta u budućnosti"
-msgstr[2] "%d minuta u budućnosti"
-msgstr[3] "%d minut u budućnosti"
+msgstr[0] "za %d minut"
+msgstr[1] "za %d minuta"
+msgstr[2] "za %d minuta"
+msgstr[3] "za %d minut"
 
 #: ../e-util/e-filter-datespec.c:70
 #, c-format
@@ -12266,10 +12234,10 @@ msgstr[3] "pre %d sat"
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "%d sat u budućnosti"
-msgstr[1] "%d sata u budućnosti"
-msgstr[2] "%d sati u budućnosti"
-msgstr[3] "%d sat u budućnosti"
+msgstr[0] "za %d sat"
+msgstr[1] "za %d sata"
+msgstr[2] "za %d sati"
+msgstr[3] "za %d sat"
 
 #: ../e-util/e-filter-datespec.c:72
 #, c-format
@@ -12284,10 +12252,10 @@ msgstr[3] "pre %d dan"
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "%d dan u budućnosti"
-msgstr[1] "%d dana u budućnosti"
-msgstr[2] "%d dana u budućnosti"
-msgstr[3] "%d dan u budućnosti"
+msgstr[0] "za %d dan"
+msgstr[1] "za %d dana"
+msgstr[2] "za %d dana"
+msgstr[3] "za %d dan"
 
 #: ../e-util/e-filter-datespec.c:74
 #, c-format
@@ -12302,10 +12270,10 @@ msgstr[3] "pre %d nedelju"
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "%d nedelja u budućnosti"
-msgstr[1] "%d nedelje u budućnosti"
-msgstr[2] "%d nedelja u budućnosti"
-msgstr[3] "%d nedelja u budućnosti"
+msgstr[0] "za %d nedelju"
+msgstr[1] "za %d nedelje"
+msgstr[2] "za %d nedelja"
+msgstr[3] "za %d nedelju"
 
 #: ../e-util/e-filter-datespec.c:76
 #, c-format
@@ -12320,10 +12288,10 @@ msgstr[3] "pre %d mesec"
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "%d mesec u budućnosti"
-msgstr[1] "%d meseca u budućnosti"
-msgstr[2] "%d meseci u budućnost"
-msgstr[3] "%d mesec u budućnosti"
+msgstr[0] "za %d mesec"
+msgstr[1] "za %d meseca"
+msgstr[2] "za %d meseci"
+msgstr[3] "za %d mesec"
 
 #: ../e-util/e-filter-datespec.c:78
 #, c-format
@@ -12338,10 +12306,10 @@ msgstr[3] "pre %d godinu"
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "%d godina u budućnosti"
-msgstr[1] "%d godine u budućnosti"
-msgstr[2] "%d godina u budućnosti"
-msgstr[3] "%d godina u budućnosti"
+msgstr[0] "za %d godinu"
+msgstr[1] "za %d godine"
+msgstr[2] "za %d godina"
+msgstr[3] "za %d godinu"
 
 #: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
@@ -12365,23 +12333,23 @@ msgstr "Izaberite vreme za poređenje"
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:765
 msgid "R_ule name:"
 msgstr "Naziv _pravila:"
 
-#: ../e-util/e-filter-rule.c:811
+#: ../e-util/e-filter-rule.c:815
 msgid "all the following conditions"
 msgstr "svim sledećim uslovima"
 
-#: ../e-util/e-filter-rule.c:812
+#: ../e-util/e-filter-rule.c:816
 msgid "any of the following conditions"
 msgstr "bilo kom od sledećih uslova"
 
-#: ../e-util/e-filter-rule.c:818
+#: ../e-util/e-filter-rule.c:822
 msgid "_Find items which match:"
 msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:845
 msgid "Find items that meet the following conditions"
 msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
@@ -12394,8 +12362,8 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
+#: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:139
@@ -12403,874 +12371,860 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-filter-rule.c:857
+#: ../e-util/e-filter-rule.c:861
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../e-util/e-filter-rule.c:859
+#: ../e-util/e-filter-rule.c:863
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../e-util/e-filter-rule.c:860
+#: ../e-util/e-filter-rule.c:864
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../e-util/e-filter-rule.c:867
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../e-util/e-filter-rule.c:942
+#: ../e-util/e-filter-rule.c:946
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
 #: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
+#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Odlazno"
 
-#: ../e-util/e-html-editor-actions.c:58
+#: ../e-util/e-html-editor-actions.c:82
 msgid "Failed to insert HTML file."
 msgstr "Ne mogu da umetnem HTML datoteku."
 
-#: ../e-util/e-html-editor-actions.c:95
+#: ../e-util/e-html-editor-actions.c:120
 msgid "Failed to insert text file."
 msgstr "Ne mogu da umetnem tekstualnu datoteku."
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:321
 msgid "Insert HTML File"
 msgstr "Umetni HTML datoteku"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:327
 msgid "HTML file"
 msgstr "HTML datoteka"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:354
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Umetni sliku"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:412
 msgid "Insert text file"
 msgstr "Umetni tekstualnu datoteku"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:418
 msgid "Text file"
 msgstr "Tekstualna datoteka"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:866
 msgid "Copy selected text to the clipboard"
 msgstr "Umnožava izabrani tekst u spisak isečaka"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:873
 msgid "Cut selected text to the clipboard"
 msgstr "Seče izabrani tekst u spisak isečaka"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:880
 msgid "Paste text from the clipboard"
 msgstr "Ubacuje tekst iz spiska isečaka"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:887
 msgid "Redo the last undone action"
 msgstr "Ponavlja poslednju opozvanu radnju"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:901
 msgid "Undo the last action"
 msgstr "Vraća poslednju radnju"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:922
 msgid "For_mat"
 msgstr "_Format"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:929
 msgid "_Paragraph Style"
 msgstr "Stil _pasusa"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-image-dialog.c:587
 msgid "_Alignment"
 msgstr "Po_ravnanje"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:950
 msgid "Current _Languages"
 msgstr "Trenutni _jezici"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:967
 msgid "_Increase Indent"
 msgstr "_Veće uvlačenje"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:969
 msgid "Increase Indent"
 msgstr "Veće uvlačenje"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:974
 msgid "_HTML File..."
 msgstr "_HTML datoteka..."
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:981
 msgid "Te_xt File..."
 msgstr "_Tekstualna datoteka"
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:988
 msgid "Paste _Quotation"
 msgstr "Umetni _citat"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:995
 msgid "_Find..."
 msgstr "_Nađi..."
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:997
 msgid "Search for text"
 msgstr "Tekst za pretragu"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1002
 msgid "Find A_gain"
 msgstr "N_ađi naredno"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1009
 msgid "Re_place..."
 msgstr "_Zameni..."
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1011
 msgid "Search for and replace text"
 msgstr "Traži željeni tekst i menja ga drugim"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1016
 msgid "Check _Spelling..."
 msgstr "_Proveri pisanje..."
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1023
 msgid "_Decrease Indent"
 msgstr "_Manje uvlačenje"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1025
 msgid "Decrease Indent"
 msgstr "Manje uvlačenje"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1030
 msgid "_Wrap Lines"
 msgstr "P_relom linija"
 
-#: ../e-util/e-html-editor-actions.c:1249
-msgid "Open Inspector"
-msgstr "Otvoreni inspektor"
-
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1040
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Sredina"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1042
 msgid "Center Alignment"
 msgstr "Središnje poravnanje"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1047
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1049
 msgid "Left Alignment"
 msgstr "Poravnanje po levoj strani"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1054
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1056
 msgid "Right Alignment"
 msgstr "Poravnanje po desnoj strani"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1064
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1066
 msgid "HTML editing mode"
 msgstr "Režim za uređivanje HTML poruke"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1071
 msgid "Plain _Text"
 msgstr "Običan _tekst"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1073
 msgid "Plain text editing mode"
 msgstr "Režim uređivanja za običan tekst"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1081
 msgid "_Normal"
 msgstr "_Obično"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Header _1"
 msgstr "Naslov _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Header _2"
 msgstr "Naslov _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1102
 msgid "Header _3"
 msgstr "Naslov _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Header _4"
 msgstr "Naslov _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1116
 msgid "Header _5"
 msgstr "Naslov _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1123
 msgid "Header _6"
 msgstr "Naslov _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "_Preformatted"
 msgstr "Pr_edodređeno"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "A_ddress"
 msgstr "A_dresa"
 
-#: ../e-util/e-html-editor-actions.c:1363
-msgid "_Blockquote"
-msgstr "_Citiranje odeljka"
-
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "_Bulleted List"
 msgstr "Nabrajanje _simbolima"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "_Roman Numeral List"
 msgstr "Nabrajanje _rimskim brojevima"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Numbered _List"
 msgstr "Nabrajanje _brojevima"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1165
 msgid "_Alphabetical List"
 msgstr "Narajanje s_lovima"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "_Image..."
 msgstr "_Slika..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1184
 msgid "Insert Image"
 msgstr "Umeće sliku"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1226
 msgid "_Link..."
 msgstr "_Veza..."
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1191
 msgid "Insert Link"
 msgstr "Umeće vezu"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1241
 msgid "_Rule..."
 msgstr "Pravi_lo..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1200
 msgid "Insert Rule"
 msgstr "Umeće pravilo"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1248
 msgid "_Table..."
 msgstr "_Tabela..."
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1207
 msgid "Insert Table"
 msgstr "Umeće tabelu"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1212
 msgid "_Cell..."
 msgstr "_Ćelija"
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1233
 msgid "Pa_ge..."
 msgstr "St_ranica..."
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Font _Size"
 msgstr "Veličina _fonta"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "_Font Style"
 msgstr "Vrsta fo_nta"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Paste As _Text"
 msgstr "Umetni _kao tekst"
 
-#: ../e-util/e-html-editor-actions.c:1508
-#: ../e-util/e-html-editor-text-dialog.c:214
+#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-text-dialog.c:203
 msgid "_Bold"
 msgstr "_Podebljano"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../e-util/e-html-editor-actions.c:1516
-#: ../e-util/e-html-editor-text-dialog.c:225
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Italic"
 msgstr "_Iskošeno"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Italic"
 msgstr "Iskošeno"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "_Plain Text"
 msgstr "O_bičan tekst"
 
-#: ../e-util/e-html-editor-actions.c:1532
-#: ../e-util/e-html-editor-text-dialog.c:246
+#: ../e-util/e-html-editor-actions.c:1306
+#: ../e-util/e-html-editor-text-dialog.c:235
 msgid "_Strikethrough"
 msgstr "Pre_crtano"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Strikethrough"
 msgstr "Precrtano"
 
-#: ../e-util/e-html-editor-actions.c:1540
-#: ../e-util/e-html-editor-text-dialog.c:236
+#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Underline"
 msgstr "Podv_učeno"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1316
 msgid "Underline"
 msgstr "Podvučeni tekst"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1326
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1568
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1576
+#: ../e-util/e-html-editor-actions.c:1350
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "Cell Contents"
 msgstr "Sadržaj ćelije"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Column"
 msgstr "Kolona"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Row"
 msgstr "Red"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Table"
 msgstr "Tabela"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1424
 msgid "Table Delete"
 msgstr "Brisanje tabele"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
-msgid "Input Methods"
-msgstr "Načini unosa"
-
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1665
+#: ../e-util/e-html-editor-actions.c:1432
 msgid "Table Insert"
 msgstr "Umetanje tabele"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1439
 msgid "Properties"
 msgstr "Osobine"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1457
 msgid "Column After"
 msgstr "Kolona nakon"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "Column Before"
 msgstr "Kolona pre"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "Insert _Link"
 msgstr "Umetni _vezu"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1478
 msgid "Row Above"
 msgstr "Red iznad"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "Row Below"
 msgstr "Red ispod"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "Cell..."
 msgstr "Ćelija..."
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1499
 msgid "Image..."
 msgstr "Slika..."
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Link..."
 msgstr "Veza..."
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "Page..."
 msgstr "Stranica..."
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paragraph..."
 msgstr "Pasus..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Rule..."
 msgstr "Pravilo..."
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1535
 msgid "Table..."
 msgstr "Tabele..."
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "Text..."
 msgstr "Tekst..."
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Remove Link"
 msgstr "Ukloni vezu"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1566
 msgid "Add Word to Dictionary"
 msgstr "Dodaj reč u rečnik"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1573
 msgid "Ignore Misspelled Word"
 msgstr "Zanemari pogrešno napisane reči"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "Add Word To"
 msgstr "Dodaj reč u"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../e-util/e-html-editor-actions.c:1589
 msgid "More Suggestions"
 msgstr "Još predloga"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1950
+#: ../e-util/e-html-editor-actions.c:1713
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s rečnik"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:1792
 msgid "_Emoticon"
 msgstr "_Smajlić"
 
 # shell:noshell-reason title
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Insert Emoticon"
 msgstr "Umetni smajlić"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:1861
 msgid "Re_place"
 msgstr "_Zameni"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:1864
 msgid "_Image"
 msgstr "_Slika"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:1867
 msgid "_Link"
 msgstr "_Veza"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:1871
 msgid "_Rule"
 msgstr "_Pravilo"
 
-#: ../e-util/e-html-editor-actions.c:2122
-#: ../e-util/e-html-editor-cell-dialog.c:738
+#: ../e-util/e-html-editor-actions.c:1874
+#: ../e-util/e-html-editor-cell-dialog.c:450
 msgid "_Table"
 msgstr "_Tabela"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:689
 msgid "Paragraph Style"
 msgstr "Stil pasusa"
 
-#: ../e-util/e-html-editor.c:718
+#: ../e-util/e-html-editor.c:703
 msgid "Editing Mode"
 msgstr "Režim za uređivanje"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:715
 msgid "Font Color"
 msgstr "Boja fonta"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "Veličina fonta"
 
-#: ../e-util/e-html-editor-cell-dialog.c:698
+#: ../e-util/e-html-editor-cell-dialog.c:410
 msgid "<b>Scope</b>"
 msgstr "<b>Opseg</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-cell-dialog.c:424
 msgid "C_ell"
 msgstr "_Ćelija"
 
-#: ../e-util/e-html-editor-cell-dialog.c:725
+#: ../e-util/e-html-editor-cell-dialog.c:437
 msgid "_Row"
 msgstr "_Red"
 
-#: ../e-util/e-html-editor-cell-dialog.c:751
+#: ../e-util/e-html-editor-cell-dialog.c:463
 msgid "Col_umn"
 msgstr "_Kolona"
 
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:473
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Poravnanje i ponašanje</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:774
-#: ../e-util/e-html-editor-hrule-dialog.c:413
-#: ../e-util/e-html-editor-table-dialog.c:900
+#: ../e-util/e-html-editor-cell-dialog.c:486
+#: ../e-util/e-html-editor-hrule-dialog.c:330
+#: ../e-util/e-html-editor-table-dialog.c:651
 msgid "Left"
 msgstr "Levo"
 
-#: ../e-util/e-html-editor-cell-dialog.c:775
-#: ../e-util/e-html-editor-hrule-dialog.c:415
-#: ../e-util/e-html-editor-table-dialog.c:901
+#: ../e-util/e-html-editor-cell-dialog.c:487
+#: ../e-util/e-html-editor-hrule-dialog.c:332
+#: ../e-util/e-html-editor-table-dialog.c:652
 msgid "Center"
 msgstr "Sredina"
 
-#: ../e-util/e-html-editor-cell-dialog.c:776
-#: ../e-util/e-html-editor-hrule-dialog.c:417
-#: ../e-util/e-html-editor-table-dialog.c:902
+#: ../e-util/e-html-editor-cell-dialog.c:488
+#: ../e-util/e-html-editor-hrule-dialog.c:334
+#: ../e-util/e-html-editor-table-dialog.c:653
 msgid "Right"
 msgstr "Desno"
 
 # Beleške:
 # Dodaj belešku
-#: ../e-util/e-html-editor-cell-dialog.c:784
+#: ../e-util/e-html-editor-cell-dialog.c:496
 msgid "_Horizontal:"
 msgstr "_Vodoravno:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-cell-dialog.c:504
+#: ../e-util/e-html-editor-image-dialog.c:577
 msgid "Top"
 msgstr "Vrh"
 
-#: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-cell-dialog.c:505
+#: ../e-util/e-html-editor-image-dialog.c:578
 msgid "Middle"
 msgstr "Sredina"
 
-#: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-cell-dialog.c:506
+#: ../e-util/e-html-editor-image-dialog.c:579
 msgid "Bottom"
 msgstr "Dno"
 
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:514
 msgid "_Vertical:"
 msgstr "_Uspravno:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:808
+#: ../e-util/e-html-editor-cell-dialog.c:520
 msgid "_Wrap Text"
 msgstr "_Prelamaj tekst"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:816
+#: ../e-util/e-html-editor-cell-dialog.c:528
 msgid "_Header Style"
 msgstr "Vrsta zaglavlja"
 
-#: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:812
+#: ../e-util/e-html-editor-cell-dialog.c:542
+#: ../e-util/e-html-editor-image-dialog.c:517
+#: ../e-util/e-html-editor-table-dialog.c:563
 msgid "<b>Layout</b>"
 msgstr "<b>Raspored</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:841
+#: ../e-util/e-html-editor-cell-dialog.c:553
 msgid "_Width"
 msgstr "_Širina"
 
-#: ../e-util/e-html-editor-cell-dialog.c:880
+#: ../e-util/e-html-editor-cell-dialog.c:593
 msgid "Row S_pan:"
 msgstr "_Raspon reda:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:894
+#: ../e-util/e-html-editor-cell-dialog.c:607
 msgid "Co_lumn Span:"
 msgstr "R_aspon kolone:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:901
-#: ../e-util/e-html-editor-table-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:614
+#: ../e-util/e-html-editor-table-dialog.c:667
 msgid "<b>Background</b>"
 msgstr "<b>Pozadina</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:914
-#: ../e-util/e-html-editor-table-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:627
+#: ../e-util/e-html-editor-table-dialog.c:680
 msgid "Transparent"
 msgstr "Providna"
 
-#: ../e-util/e-html-editor-cell-dialog.c:922
+#: ../e-util/e-html-editor-cell-dialog.c:635
 msgid "C_olor:"
 msgstr "_Boja:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
-#: ../e-util/e-html-editor-table-dialog.c:945
+#: ../e-util/e-html-editor-cell-dialog.c:643
+#: ../e-util/e-html-editor-image-dialog.c:479
+#: ../e-util/e-html-editor-table-dialog.c:696
 msgid "Choose Background Image"
 msgstr "Izaberite boju pozadine"
 
-#: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
-#: ../e-util/e-html-editor-table-dialog.c:950
+#: ../e-util/e-html-editor-cell-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:485
+#: ../e-util/e-html-editor-table-dialog.c:701
 msgid "Images"
 msgstr "Slike"
 
-#: ../e-util/e-html-editor-cell-dialog.c:948
+#: ../e-util/e-html-editor-cell-dialog.c:661
 msgid "_Image:"
 msgstr "_Slika_"
 
-#: ../e-util/e-html-editor-cell-dialog.c:955
-#: ../e-util/e-html-editor-page-dialog.c:660
-#: ../e-util/e-html-editor-table-dialog.c:970
+#: ../e-util/e-html-editor-cell-dialog.c:668
+#: ../e-util/e-html-editor-page-dialog.c:497
+#: ../e-util/e-html-editor-table-dialog.c:721
 msgid "_Remove image"
 msgstr "U_kloni sliku"
 
-#: ../e-util/e-html-editor-cell-dialog.c:975
+#: ../e-util/e-html-editor-cell-dialog.c:688
 msgid "Cell Properties"
 msgstr "Osobine ćelije"
 
-#: ../e-util/e-html-editor-find-dialog.c:105
-#: ../e-util/e-html-editor-replace-dialog.c:90
-#: ../e-util/e-html-editor-replace-dialog.c:108
+#: ../e-util/e-html-editor-find-dialog.c:94
+#: ../e-util/e-html-editor-replace-dialog.c:70
 msgid "No match found"
 msgstr "Nije nađeno poklapanje"
 
-#: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-find-dialog.c:217
+#: ../e-util/e-html-editor-replace-dialog.c:297
 msgid "Search _backwards"
 msgstr "Traži u_nazad"
 
-#: ../e-util/e-html-editor-find-dialog.c:167
+#: ../e-util/e-html-editor-find-dialog.c:224
 msgid "Case _Sensitive"
 msgstr "_Razlikuj velika slova"
 
-#: ../e-util/e-html-editor-find-dialog.c:174
+#: ../e-util/e-html-editor-find-dialog.c:231
 msgid "_Wrap Search"
 msgstr "Pre_lamaj"
 
-#: ../e-util/e-html-editor-find-dialog.c:213
+#: ../e-util/e-html-editor-find-dialog.c:270
 msgid "Find"
 msgstr "Nađi"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:348
+#: ../e-util/e-html-editor-hrule-dialog.c:265
 msgid "<b>Size</b>"
 msgstr "<b>Veličina</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:823
+#: ../e-util/e-html-editor-hrule-dialog.c:285
+#: ../e-util/e-html-editor-image-dialog.c:535
+#: ../e-util/e-html-editor-table-dialog.c:574
 msgid "_Width:"
 msgstr "_Širina:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:393
+#: ../e-util/e-html-editor-hrule-dialog.c:310
 msgid "_Size:"
 msgstr "_Veličina:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:400
+#: ../e-util/e-html-editor-hrule-dialog.c:317
 msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:425
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-table-dialog.c:660
 msgid "_Alignment:"
 msgstr "Po_ravnanje:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:431
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "S_haded"
 msgstr "Osen_čeno"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:448
+#: ../e-util/e-html-editor-hrule-dialog.c:365
 msgid "Rule properties"
 msgstr "Osobine pravila"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:467
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:766
+#: ../e-util/e-html-editor-table-dialog.c:517
 msgid "<b>General</b>"
 msgstr "<b>Opšte</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:496
 msgid "_Source:"
 msgstr "I_zvor:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:559
 msgid "_Height:"
 msgstr "_Visina:"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:600
 msgid "_X-Padding:"
 msgstr "X-_popuna:"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:616
 msgid "_Y-Padding:"
 msgstr "Y-p_opuna:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:890
+#: ../e-util/e-html-editor-image-dialog.c:632
+#: ../e-util/e-html-editor-table-dialog.c:641
 msgid "_Border:"
 msgstr "_Ivica"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:642
 msgid "<b>Link</b>"
 msgstr "<b>Veza</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:400
+#: ../e-util/e-html-editor-image-dialog.c:660
+#: ../e-util/e-html-editor-link-dialog.c:221
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
-#: ../e-util/e-html-editor-link-dialog.c:405
+#: ../e-util/e-html-editor-image-dialog.c:665
+#: ../e-util/e-html-editor-link-dialog.c:226
 msgid "_Test URL..."
 msgstr "_Test URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:682
 msgid "Image Properties"
 msgstr "Osobine slike"
 
-#: ../e-util/e-html-editor-link-dialog.c:429
+#: ../e-util/e-html-editor-link-dialog.c:250
 msgid "_Remove Link"
 msgstr "_Ukloni vezu"
 
-#: ../e-util/e-html-editor-link-dialog.c:454
+#: ../e-util/e-html-editor-link-dialog.c:275
 msgid "Link Properties"
 msgstr "Osobine veze"
 
-#: ../e-util/e-html-editor-page-dialog.c:72
+#: ../e-util/e-html-editor-page-dialog.c:70
 msgid "Perforated Paper"
 msgstr "Perforiran papir"
 
-#: ../e-util/e-html-editor-page-dialog.c:81
+#: ../e-util/e-html-editor-page-dialog.c:79
 msgid "Blue Ink"
 msgstr "Plavo mastilo"
 
-#: ../e-util/e-html-editor-page-dialog.c:90
+#: ../e-util/e-html-editor-page-dialog.c:88
 msgid "Paper"
 msgstr "Papir"
 
-#: ../e-util/e-html-editor-page-dialog.c:99
+#: ../e-util/e-html-editor-page-dialog.c:97
 msgid "Ribbon"
 msgstr "Traka"
 
-#: ../e-util/e-html-editor-page-dialog.c:108
+#: ../e-util/e-html-editor-page-dialog.c:106
 msgid "Midnight"
 msgstr "Ponoć"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../e-util/e-html-editor-page-dialog.c:124 ../mail/filtertypes.xml.in.h:38
 #: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Nacrt"
 
-#: ../e-util/e-html-editor-page-dialog.c:135
+#: ../e-util/e-html-editor-page-dialog.c:133
 msgid "Graph Paper"
 msgstr "Milimetarski papir"
 
-#: ../e-util/e-html-editor-page-dialog.c:544
+#: ../e-util/e-html-editor-page-dialog.c:381
 msgid "<b>Colors</b>"
 msgstr "<b>Boje</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:563
+#: ../e-util/e-html-editor-page-dialog.c:400
 msgid "_Text:"
 msgstr "_Tekst:"
 
-#: ../e-util/e-html-editor-page-dialog.c:578
+#: ../e-util/e-html-editor-page-dialog.c:415
 msgid "_Link:"
 msgstr "_Veza:"
 
-#: ../e-util/e-html-editor-page-dialog.c:593
+#: ../e-util/e-html-editor-page-dialog.c:430
 msgid "_Visited Link:"
 msgstr "_Posećena veza:"
 
-#: ../e-util/e-html-editor-page-dialog.c:608
+#: ../e-util/e-html-editor-page-dialog.c:445
 msgid "_Background:"
 msgstr "Po_zadina:"
 
-#: ../e-util/e-html-editor-page-dialog.c:616
+#: ../e-util/e-html-editor-page-dialog.c:453
 msgid "<b>Background Image</b>"
 msgstr "<b>Pozadinska slika</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../e-util/e-html-editor-page-dialog.c:475
 #: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "_Šablon:"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:483 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-html-editor-page-dialog.c:653
+#: ../e-util/e-html-editor-page-dialog.c:490
 msgid "_Custom:"
 msgstr "_Proizvoljno:"
 
-#: ../e-util/e-html-editor-page-dialog.c:680
+#: ../e-util/e-html-editor-page-dialog.c:517
 msgid "Page Properties"
 msgstr "Osobine stranice"
 
@@ -13286,7 +13240,7 @@ msgstr "<b>Poravnanje</b>"
 msgid "Paragraph Properties"
 msgstr "Osobine pasusa"
 
-#: ../e-util/e-html-editor-replace-dialog.c:163
+#: ../e-util/e-html-editor-replace-dialog.c:92
 #, c-format
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
@@ -13295,134 +13249,126 @@ msgstr[1] "%d pojave su zamenjene"
 msgstr[2] "%d pojava je zamenjeno"
 msgstr[3] "Pojava je zamenjena"
 
-#: ../e-util/e-html-editor-replace-dialog.c:227
+#: ../e-util/e-html-editor-replace-dialog.c:280
 msgid "R_eplace:"
 msgstr "_Zameni:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:239
+#: ../e-util/e-html-editor-replace-dialog.c:289
 msgid "_With:"
 msgstr "_Širina:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:251
+#: ../e-util/e-html-editor-replace-dialog.c:301
 msgid "_Case sensitive"
 msgstr "_Razlikuj velika i mala slova"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:305
 msgid "Wra_p search"
 msgstr "Pre_lamaj"
 
-#: ../e-util/e-html-editor-replace-dialog.c:265
+#: ../e-util/e-html-editor-replace-dialog.c:315
 msgid "_Skip"
 msgstr "Pres_koči"
 
-#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-html-editor-replace-dialog.c:323
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../e-util/e-html-editor-replace-dialog.c:281
+#: ../e-util/e-html-editor-replace-dialog.c:331
 msgid "Replace _All"
 msgstr "Zameni _sve"
 
-#: ../e-util/e-html-editor-replace-dialog.c:301
+#: ../e-util/e-html-editor-replace-dialog.c:351
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Zameni"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#: ../e-util/e-html-editor-spell-check-dialog.c:85
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Predlog za „%s“</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:390
 msgid "<b>Suggestions</b>"
 msgstr "<b>Predlozi</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:425
 msgid "Replace"
 msgstr "Zameni"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:434
 msgid "Replace All"
 msgstr "Zameni sve"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:110
+#: ../e-util/e-html-editor-spell-check-dialog.c:443
+#: ../mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Zanemari"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:452
 msgid "Skip"
 msgstr "Preskoči"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:461
 msgid "Back"
 msgstr "Nazad"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:470
 msgid "<b>Dictionary</b>"
 msgstr "<b>Rečnik</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:490
 msgid "Add word"
 msgstr "Dodaj reč"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:507 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../e-util/e-html-editor-table-dialog.c:788
+#: ../e-util/e-html-editor-table-dialog.c:539
 msgid "_Rows:"
 msgstr "_Redovi:"
 
-#: ../e-util/e-html-editor-table-dialog.c:805
+#: ../e-util/e-html-editor-table-dialog.c:556
 msgid "C_olumns:"
 msgstr "_Kolone:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:607
 msgid "_Spacing:"
 msgstr "_Razmak:"
 
-#: ../e-util/e-html-editor-table-dialog.c:873
+#: ../e-util/e-html-editor-table-dialog.c:624
 msgid "_Padding:"
 msgstr "_Okvir:"
 
-#: ../e-util/e-html-editor-table-dialog.c:937
-#: ../e-util/e-html-editor-text-dialog.c:261
+#: ../e-util/e-html-editor-table-dialog.c:688
+#: ../e-util/e-html-editor-text-dialog.c:250
 msgid "_Color:"
 msgstr "_Boja:"
 
-#: ../e-util/e-html-editor-table-dialog.c:963
+#: ../e-util/e-html-editor-table-dialog.c:714
 msgid "Image:"
 msgstr "Slika:"
 
-#: ../e-util/e-html-editor-table-dialog.c:990
+#: ../e-util/e-html-editor-table-dialog.c:741
 msgid "Table Properties"
 msgstr "Osobine tabele"
 
-#: ../e-util/e-html-editor-text-dialog.c:281
+#: ../e-util/e-html-editor-text-dialog.c:270
 msgid "Si_ze:"
 msgstr "_Veličina:"
 
-#: ../e-util/e-html-editor-text-dialog.c:296
+#: ../e-util/e-html-editor-text-dialog.c:285
 msgid "Text Properties"
 msgstr "Osobine teksta"
 
-#: ../e-util/e-html-editor-view.c:6381
-msgid "Changed property"
-msgstr "Izmenjena osobina"
-
-#: ../e-util/e-html-editor-view.c:6382
-msgid "Whether editor changed"
-msgstr "Da li je uređivač promenio"
-
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -13430,32 +13376,32 @@ msgstr ""
 "Izaberite datoteku koju želite da uvezete u Evoluciju i iz liste izaberite "
 "kojeg je tipa ta datoteka."
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
-msgstr "Izaberite tip uvoznika:"
+msgstr "Izaberite vrstu uvoznika:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
-#: ../e-util/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:538
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -13465,40 +13411,40 @@ msgstr ""
 "Elm, iKalendar, K-pošta. Nema podešavanja za uvoz. Ukoliko želite da pokušate "
 "ponovo, kliknite na dugme „Nazad“."
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "_Otkaži uvoženje"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "Pregledaj podatke koji se uvoze"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "Uvezi podatke"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "Izaberite sa spiska koje vrste datoteka želite da uvezete."
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "Uvezi lokaciju"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13508,19 +13454,19 @@ msgstr ""
 "Ovaj pomoćnik će vas provesti kroz postupak uvoza spoljnih datoteka u "
 "Evoluciju."
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "Vrsta uvoznika"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "Izaberite informaciju za uvoz"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
 
@@ -13528,35 +13474,35 @@ msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:310 ../mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:315 ../mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "_Sačuvaj i zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:533
+#: ../e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Uredi potpis"
 
-#: ../e-util/e-mail-signature-editor.c:566
+#: ../e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
-#: ../e-util/e-mail-signature-editor.c:602
+#: ../e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: ../e-util/e-mail-signature-manager.c:426
+#: ../e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../e-util/e-mail-signature-manager.c:497
+#: ../e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "Uredi skriptu potpisa"
 
@@ -13590,35 +13536,35 @@ msgstr ""
 "Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone "
 "vrši iz donjeg okvira."
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:255
 msgid "Could not open the link."
 msgstr "Ne mogu da otvorim vezu."
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:338
 msgid "Could not display help for Evolution."
 msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2503
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Otvaram kalendar „%s“"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2506
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Otvaram spisak beleški „%s“"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2509
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Otvaram spisak zadataka „%s“"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2512
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "Otvaram adresar „%s“"
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3290
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
@@ -13837,48 +13783,48 @@ msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
 # bug: plural-forms if put as "%d matches"
-#: ../e-util/e-search-bar.c:83
+#: ../e-util/e-search-bar.c:84
 #, c-format
 msgid "Matches: %u"
 msgstr "Poklapanja: %u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:611
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:619
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:631
 msgid "Clear the search"
 msgstr "Očisti pretragu"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:655
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:658
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nađi prethodno pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:667
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:670
 msgid "Find the next occurrence of the phrase"
 msgstr "Nađi sledeće pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:679
 msgid "Mat_ch case"
 msgstr "_Uporedi veličinu slova"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:707
 msgid "Reached bottom of page, continued from top"
 msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:729
 msgid "Reached top of page, continued from bottom"
 msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
 
@@ -14068,6 +14014,10 @@ msgstr "Prikaži"
 msgid "Group name"
 msgstr "Naziv grupe"
 
+#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:746
+msgid "_Hide"
+msgstr "_Sakrij"
+
 #: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
 msgid "_Show"
 msgstr "_Prikaži"
@@ -14158,7 +14108,7 @@ msgstr "Ne mogu da otvorim datoteku „{0}“."
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "Ne mogu da uklonim izvor podataka „{0}“."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Prijavljena greška bejaše „{1}“."
 
@@ -14305,11 +14255,11 @@ msgstr "Očisti _sve"
 msgid "_Show field in View"
 msgstr "_Prikaži polje u pregledu"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
 msgid "Ascending"
 msgstr "Rastuće"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
 msgid "Descending"
 msgstr "Opadajuće"
 
@@ -14375,60 +14325,61 @@ msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
 msgstr[3] "%s (jedna stavka)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuće"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuće"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "_Ne razvrstavaj"
+#: ../e-util/e-table-header-item.c:1648
+#| msgid "_Reset Order"
+msgid "_Reset sort"
+msgstr "_Povrati redosled"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "Grupiši po ovome _polju"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "Grupiši po _okviru"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "Dodaj ko_lonu..."
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "Oblikuj kolo_ne..."
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pregled..."
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "_Poređaj po"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "_Proizvoljno"
 
@@ -14436,12 +14387,16 @@ msgstr "_Proizvoljno"
 msgid "Select All"
 msgstr "Izaberi sve"
 
+#: ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "Načini unosa"
+
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
-#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
-#: ../e-util/e-timezone-dialog.c:804
+#: ../e-util/e-timezone-dialog.c:270 ../e-util/e-timezone-dialog.c:510
+#: ../e-util/e-timezone-dialog.c:514 ../e-util/e-timezone-dialog.c:518
+#: ../e-util/e-timezone-dialog.c:901
 msgid "UTC"
 msgstr "KUV"
 
@@ -14492,94 +14447,99 @@ msgid "Flags"
 msgstr "Opcije"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:779
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:337
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../e-util/e-web-view.c:320
+#: ../e-util/e-web-view.c:339
 msgid "Copy the link to the clipboard"
 msgstr "Umnožava vezu u spisak isečaka"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:347
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: ../e-util/e-web-view.c:330
+#: ../e-util/e-web-view.c:349
 msgid "Open the link in a web browser"
 msgstr "Otvori vezu u veb pretraživaču"
 
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:357
 msgid "_Copy Email Address"
 msgstr "_Umnoži e-adresu"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:364
 msgid "Copy _Raw Email Address"
 msgstr "Umnoži sa_mo e-adresu"
 
-#: ../e-util/e-web-view.c:347
+#: ../e-util/e-web-view.c:366
 msgid "Copy the raw email address to the clipboard"
 msgstr "Umnožava samo čistu adresu elektronske pošte u spisak isečaka"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:381
 msgid "_Copy Image"
 msgstr "_Umnoži sliku"
 
-#: ../e-util/e-web-view.c:364
+#: ../e-util/e-web-view.c:383
 msgid "Copy the image to the clipboard"
 msgstr "Umnožite sliku u ostavu"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:388
 msgid "Save _Image..."
 msgstr "Sačuvaj _sliku..."
 
-#: ../e-util/e-web-view.c:371
+#: ../e-util/e-web-view.c:390
 msgid "Save the image to a file"
 msgstr "Sačuvajte sliku u datoteku"
 
-#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
+#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1830
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../e-util/e-web-view.c:1074
+#: ../e-util/e-web-view.c:1284
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../e-util/e-web-view.c:1076
+#: ../e-util/e-web-view.c:1286
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../e-util/e-web-view.c:1087
+#: ../e-util/e-web-view.c:1297
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Idi na odeljak %s ove poruke"
 
-#: ../e-util/e-web-view.c:1089
+#: ../e-util/e-web-view.c:1299
 msgid "Go to the beginning of the message"
 msgstr "Idi na početak poruke"
 
-#: ../e-util/e-web-view.c:1093
+#: ../e-util/e-web-view.c:1303
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3651
 msgid "Copying image to clipboard"
 msgstr "Umnožavam sliku u ostavu"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3839
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3875
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Čuvam sliku u „%s“"
 
+#: ../e-util/e-web-view.c:3970
+#, c-format
+msgid "Cannot get URI '%s', do not know how to download it."
+msgstr "Ne mogu da dobavim putanju „%s“, ne znam kako da je preuzmem."
+
 #: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Poništi „Umetni tekst“"
@@ -14626,7 +14586,7 @@ msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Ne mogu da prevedem regularan izraz „{1}“."
 
 # mail:no-name-vfolder primary
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -14759,12 +14719,12 @@ msgid "toggle the cell"
 msgstr "biranje ćelije"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "razgranava red u Establo koje sdrži ovu ćeliju"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "skuplja red u Establo koje sadrži ovu ćeliju"
 
@@ -14788,7 +14748,7 @@ msgstr "_Napravi novi pregled"
 msgid "_Replace existing view"
 msgstr "_Zameni postojeći pregled"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "Da li želite da sačuvate izmene?"
 
@@ -14796,7 +14756,7 @@ msgstr "Da li želite da sačuvate izmene?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "_Odbaci izmene"
 
@@ -14874,7 +14834,7 @@ msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:946
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14883,29 +14843,29 @@ msgstr[1] "Preuzimam %d poruke"
 msgstr[2] "Preuzimam %d poruka"
 msgstr[3] "Preuzimam poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:778
+#: ../libemail-engine/e-mail-folder-utils.c:786
 msgid "Scanning messages for duplicates"
 msgstr "Tražim duplikate u porukama"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1159
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1340
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1344
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1421
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1593
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -14914,68 +14874,67 @@ msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 msgstr[3] "Čuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1971
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neispravna putanja fascikle „%s“"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
-#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1052
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
+#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Šabloni"
 
-#: ../libemail-engine/e-mail-session.c:1262
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "Korisnik je otkazao radnju"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1362
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Nije dostavljena odredišna adresa, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1375
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session.c:2362
+#: ../libemail-engine/e-mail-session.c:2405
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "Čekam na „%s“"
@@ -14985,26 +14944,26 @@ msgid "No mail transport service available"
 msgstr "Nema dostupne usluge prenosa pošte"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Kačim poruku na „%s“"
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlaznih propusnika: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Čuvam poslatu poruku u „%s“"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15014,13 +14973,13 @@ msgstr ""
 "Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Ne mogu da prikačim u lokalnu fasciklu „Poslato“: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "Slanje poruke"
 
@@ -15052,8 +15011,8 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 "Ne mogu da izdvojim izabrane poruke. Jedan od razloga može biti i taj da je "
-"neispravno mesto fascikle podešeno u jednom ili više propusnika. Molim "
-"proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
+"neispravno mesto fascikle podešeno u jednom ili više filtera. Proverite vaše "
+"filtere u izborniku „Uređivanje—>Filteri poruka“.\n"
 "Izvorna greška beše: %s"
 
 #: ../libemail-engine/mail-ops.c:229
@@ -15061,7 +15020,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Preuzimam poštu sa „%s“"
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -15069,18 +15028,18 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Ne mogu da primenim odlazne propusnike. Jedan od razloga može biti i taj da "
-"je neispravno mesto fascikle podešeno u jednom ili više propusnika. Molim "
-"proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
+"Ne mogu da primenim odlazne filtere. Jedan od razloga može biti i taj da je "
+"neispravno mesto fascikle podešeno u jednom ili više filtera. Proverite vaše "
+"filtere u izborniku „Uređivanje—>Filteri poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -15089,45 +15048,46 @@ msgstr[1] "Ne mogu da pošaljem %d od %d poruka"
 msgstr[2] "Ne mogu da pošaljem %d od %d poruka"
 msgstr[3] "Ne mogu da pošaljem %d od %d poruke"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+#| msgid "Cancelled"
+msgid "Cancelled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Umnožavam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeće u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Obrađujem izmene fascikle u „%s“"
@@ -15212,7 +15172,7 @@ msgstr "Pod_razumevano"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1282
+#: ../modules/mail/em-composer-prefs.c:1281
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -15224,18 +15184,18 @@ msgstr "Naziv naloga"
 
 #: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
-msgstr "Nije dostavljena adresa el. pošte"
+msgstr "Nije dostavljena adresa e-pošte"
 
 #: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
-msgstr "Nedostaje domen u adresi el. pošte"
+msgstr "Nedostaje domen u adresi e-pošte"
 
 #: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "Zatvorite ovaj prozor"
 
-#: ../mail/e-mail-browser.c:288
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
@@ -15253,7 +15213,7 @@ msgstr "_Preskoči pretragu"
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "_Obnovi pojedinosti"
 
@@ -15283,133 +15243,143 @@ msgstr ""
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "Proveravam podešavanja servera..."
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Koristi opšta podešavanja"
 
-#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloži"
 
-#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
-#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ne citiraj"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "Posebne fascikle"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "Fascikla poruka _nacrta:"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Sačuvaj _odgovore u fascikli poruke na koju se odgovara"
 
-#: ../mail/e-mail-config-defaults-page.c:901
+#: ../mail/e-mail-config-defaults-page.c:908
 msgid "Archi_ve Folder:"
 msgstr "Fascikla _arhive:"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Izaberite fascikle za arhiviranje poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+#| msgid "_Template:"
+msgid "_Templates Folder:"
+msgstr "Fascikla _šablona:"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+#| msgid "Choose a folder for deleted messages."
+msgid "Choose a folder to use for template messages."
+msgstr "Izaberite fasciklu za šablonske poruke."
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "_Povrati osnovno"
 
-#: ../mail/e-mail-config-defaults-page.c:946
+#: ../mail/e-mail-config-defaults-page.c:981
 msgid "_Lookup Folders"
 msgstr "_Pretraži fasciklu"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "Koristi stvarnu fasciklu za _smeće:"
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "Izaberite fasciklu za obrisane poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "Koristi stvarnu fasciklu za _đubre:"
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek pošalji _grafitnu kopiju (Cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 msgid "Re_ply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "_Pošalji povratnice:"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-config-identity-page.c:286
+#: ../mail/e-mail-config-identity-page.c:304
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -15418,12 +15388,12 @@ msgstr ""
 "Unesite ime i elektronsku adresu. „Neobavezna“ polja ne moraju biti popunjena, "
 "osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-identity-page.c:332
 #: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-identity-page.c:370
 #: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
@@ -15432,56 +15402,59 @@ msgstr ""
 "Ovo ime će biti korisno za prepoznavanje naloga.\n"
 "Na primer, „Poslovni“ ili „Lični“."
 
-#: ../mail/e-mail-config-identity-page.c:369
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:378
+#: ../mail/e-mail-config-identity-page.c:396
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../mail/e-mail-config-identity-page.c:407
+#: ../mail/e-mail-config-identity-page.c:425
 msgid "Email _Address:"
-msgstr "Adresa _el. pošte:"
+msgstr "Adresa _e-pošte:"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:474
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:465
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/e-mail-config-identity-page.c:494
+#: ../mail/e-mail-config-identity-page.c:512
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/e-mail-config-identity-page.c:549
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../mail/e-mail-config-identity-page.c:567
+#: ../mail/e-mail-config-identity-page.c:585
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "Podaci za traženje servera e-pošte na osnovu unetih mejl adresa"
 
-#: ../mail/e-mail-config-identity-page.c:611
-msgid "Full Name cannot be empty"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:630
+#| msgid "Full Name cannot be empty"
+msgid "Full Name should not be empty"
 msgstr "Ime i prezime ne može biti prazno"
 
-#: ../mail/e-mail-config-identity-page.c:618
+#: ../mail/e-mail-config-identity-page.c:637
 msgid "Email Address cannot be empty"
-msgstr "Adresa el. pošte ne može biti prazna"
+msgstr "Adresa e-pošte ne može biti prazna"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:642
 msgid "Email Address is not a valid email"
-msgstr "Adresa el. pošte nije ispravna el. pošta"
+msgstr "Adresa e-pošte nije ispravna e-pošta"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:654
 msgid "Reply To is not a valid email"
-msgstr "Primalac nije ispravna el. pošta"
+msgstr "Primalac nije ispravna e-pošta"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:665
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "Ime naloga ne može biti prazno"
@@ -15514,11 +15487,12 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
 #: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/mail/e-mail-shell-backend.c:731
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Opšte"
@@ -15651,7 +15625,7 @@ msgstr "Ime i prezime:"
 
 #: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
-msgstr "Adresa el. pošte:"
+msgstr "Adresa e-pošte:"
 
 #: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
@@ -15702,30 +15676,58 @@ msgstr "Dobrodošli"
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:124
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:131
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:138
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:145
 msgid "Send _Reply To..."
 msgstr "_Pošalji odgovor..."
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:147
 msgid "Send a reply message to this address"
 msgstr "Pošaljite poruku odgovora na ovu adresu"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:154
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
+#: ../mail/e-mail-display.c:753
+msgid "Hid_e All"
+msgstr "Sak_rij sve"
+
+#: ../mail/e-mail-display.c:760
+msgid "_View Inline"
+msgstr "Pre_gledaj unutar"
+
+#: ../mail/e-mail-display.c:767
+msgid "Vie_w All Inline"
+msgstr "Pre_gledaj sve unutar"
+
+#: ../mail/e-mail-display.c:774
+msgid "_Zoom to 100%"
+msgstr "Uvećaj na _100%"
+
+#: ../mail/e-mail-display.c:776
+msgid "Zoom the image to its natural size"
+msgstr "Postavlja uvećanje slike na njenu originalnu veličinu"
+
+#: ../mail/e-mail-display.c:781
+msgid "_Zoom to window"
+msgstr "U_klopi u prozor"
+
+#: ../mail/e-mail-display.c:783
+msgid "Zoom large images to not be wider than the window width"
+msgstr "Umanjuje velike slike tako da se uklope u širinu prozora"
+
 #: ../mail/e-mail-folder-create-dialog.c:327
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
@@ -15820,7 +15822,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
@@ -15840,23 +15842,23 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
 msgid "Message Note"
 msgstr "Napomena poruke"
 
-#: ../mail/e-mail-notes.c:612
+#: ../mail/e-mail-notes.c:639
 msgid "Cannot find message in its folder summary"
 msgstr "Ne mogu da nađem poruku u njenom sažetku fascikle"
 
-#: ../mail/e-mail-notes.c:815
+#: ../mail/e-mail-notes.c:842
 msgid "Storing changes..."
 msgstr "Smeštam izmene..."
 
-#: ../mail/e-mail-notes.c:940
+#: ../mail/e-mail-notes.c:968
 msgid "Edit Message Note"
 msgstr "Uredite napomenu poruke"
 
-#: ../mail/e-mail-notes.c:1058
+#: ../mail/e-mail-notes.c:1122
 msgid "Retrieving message..."
 msgstr "Preuzimam poruku..."
 
@@ -15888,11 +15890,11 @@ msgstr "Naziv zaglavlja"
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
+#: ../mail/e-mail-printer.c:111 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/e-mail-printer.c:155
+#: ../mail/e-mail-printer.c:153
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
@@ -15906,7 +15908,7 @@ msgid "Copy to Folder"
 msgstr "Umnoži u fasciklu"
 
 #: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "Pre_mesti"
 
@@ -15918,648 +15920,652 @@ msgstr "_Umnoži"
 msgid "Deleting message note..."
 msgstr "Brišem napomenu poruke..."
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1310 ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1562
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1568
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1771
 msgid "Failed to retrieve message:"
 msgstr "Ne mogu da dovučem poruku:"
 
-#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
+#: ../mail/e-mail-reader.c:1816 ../mail/e-mail-reader.c:3186
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Preuzimam poruku „%s“"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2004
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2011
 msgid "_Archive..."
 msgstr "_Arhiva..."
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Premešta izabrane poruke u fasciklu za arhiviranje poruke u ovom nalogu"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2018
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2025
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
 msgid "Copy selected messages to another folder"
 msgstr "Umnožava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2032
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2039
 msgid "_Add note..."
 msgstr "_Dodaj belešku..."
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041
 msgid "Add a note for the selected message"
 msgstr "Dodajte belešku za izabranu poruku"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2046
 msgid "Delete no_te"
 msgstr "Obriši _belešku"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2048
 msgid "Delete the note for the selected message"
 msgstr "Obrišite belešku za izabranu poruku"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2053
 msgid "_Edit note..."
 msgstr "_Uredi belešku..."
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2055
 msgid "Edit a note for the selected message"
 msgstr "Uredite belešku za izabranu poruku"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2060
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2062
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Naravite pravilo za propuštanje poruka na ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2067
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2069
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2074
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2076
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravite pravilo za propuštanje poruka sa ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2081
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2083
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravite pravilo za prpuštanje poruka sa ovim naslovom"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2088
 msgid "A_pply Filters"
 msgstr "Pri_meni propusnike"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2090
 msgid "Apply filter rules to the selected messages"
 msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2095
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2097
 msgid "Search for text in the body of the displayed message"
 msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2102
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2104
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2109
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2111
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Postavite oznaku za praćenje kao završenu na izabranim porukama"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2116
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2118
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2123 ../modules/mail/e-mail-attachment-handler.c:432
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2125 ../mail/e-mail-reader.c:2132
+#: ../modules/mail/e-mail-attachment-handler.c:434
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2130
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2137 ../modules/mail/e-mail-attachment-handler.c:439
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2139 ../mail/e-mail-reader.c:2146
+#: ../modules/mail/e-mail-attachment-handler.c:441
 msgid "Forward the selected message in the body of a new message"
 msgstr "Prosledite izabranu poruku u telu nove poruke"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2144
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2151 ../modules/mail/e-mail-attachment-handler.c:446
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2160
+#: ../modules/mail/e-mail-attachment-handler.c:448
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2158
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2165
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2167
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
+#: ../mail/e-mail-reader.c:2172 ../mail/e-mail-reader.c:2562
 msgid "_Ignore Subthread"
 msgstr "Za_nemari podraspravu"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2174
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Automatski označava nove e-poruke u ovoj podraspravi kao pročitane"
 
-#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
 msgid "_Ignore Thread"
 msgstr "_Zanemari raspravu"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2181
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Automatski označava nove e-poruke u ovoj raspravi kao pročitane"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2186
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2188
 msgid "Mark the selected messages as important"
 msgstr "Označava izabranu poruku kao važnu"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2193
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2195
 msgid "Mark the selected messages as junk"
 msgstr "Označava izabranu poruku kao neželjenu poštu"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2200
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2202
 msgid "Mark the selected messages as not being junk"
 msgstr "Označava izabranu poruku kao poželjnu poštu"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2207
 msgid "_Read"
 msgstr "Pro_čitano"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2209
 msgid "Mark the selected messages as having been read"
 msgstr "Označava izabranu poruku kao pročitanu"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
 msgid "Do not _Ignore Subthread"
 msgstr "Ne zanema_ruj podrasprave"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2216
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ne označava nove poruke u ovoj podraspravi kao pročitane"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
+#: ../mail/e-mail-reader.c:2221 ../mail/e-mail-reader.c:2590
 msgid "Do not _Ignore Thread"
 msgstr "Ne zanemar_uj rasprave"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2223
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ne označava nove poruke u ovoj raspravi kao pročitane"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2228
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2230
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2235
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2237
 msgid "Mark the selected messages as not having been read"
 msgstr "Označite izabranu(e) poruku(e) kao nepročitano"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2242 ../modules/mail/e-mail-attachment-handler.c:418
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:420
 msgid "Open the selected messages in the composer for editing"
 msgstr "Otvorite izabranu poruku u sastavljaču radi uređivanja"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2249
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2251
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2256
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2258
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2263
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2265
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2270
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2272
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2277
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2279
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2284
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2286
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2291
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2293
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2298
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2300
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2305
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2307
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2312
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2314
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2319
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2321
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2328
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2335
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2340 ../modules/mail/e-mail-attachment-handler.c:453
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2342 ../modules/mail/e-mail-attachment-handler.c:455
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2347
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2349
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2354
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2356
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2361 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:397
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2363 ../modules/mail/e-mail-attachment-handler.c:399
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../mail/e-mail-reader.c:2368 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:404
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2370 ../modules/mail/e-mail-attachment-handler.c:406
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2375 ../modules/mail/e-mail-attachment-handler.c:411
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2377 ../modules/mail/e-mail-attachment-handler.c:413
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2382
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2384
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2389
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2391
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2403
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2405
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2410
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2412
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2417
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2419
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2426
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2394
+#: ../mail/e-mail-reader.c:2433
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2440
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2447 ../modules/mail/e-mail-attachment-handler.c:425
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2454
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2461
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2468
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2475
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2482
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2492
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2494
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2460
+#: ../mail/e-mail-reader.c:2499
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../mail/e-mail-reader.c:2462
+#: ../mail/e-mail-reader.c:2501
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2506
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../mail/e-mail-reader.c:2469
+#: ../mail/e-mail-reader.c:2508
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2513
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2515
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2515
+#: ../mail/e-mail-reader.c:2554
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/e-mail-reader.c:2531
+#: ../mail/e-mail-reader.c:2570
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2574
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/e-mail-reader.c:2539
+#: ../mail/e-mail-reader.c:2578
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/e-mail-reader.c:2543
+#: ../mail/e-mail-reader.c:2582
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2594
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../mail/e-mail-reader.c:2559
+#: ../mail/e-mail-reader.c:2598
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/e-mail-reader.c:2603
+#: ../mail/e-mail-reader.c:2642
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2605
+#: ../mail/e-mail-reader.c:2644
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikažite trepćući kursor u telu prikazanih poruka"
 
-#: ../mail/e-mail-reader.c:2611
+#: ../mail/e-mail-reader.c:2650
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2613
+#: ../mail/e-mail-reader.c:2652
 msgid "Show messages with all email headers"
-msgstr "Prikažite poruku sa svim zaglavljima el. pošte"
+msgstr "Prikažite poruku sa svim zaglavljima e-pošte"
 
-#: ../mail/e-mail-reader.c:3164
+#: ../mail/e-mail-reader.c:3192
 msgid "Retrieving message"
 msgstr "Preuzimam poruku"
 
-#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4242 ../modules/mail/e-mail-attachment-handler.c:390
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:4217
+#: ../mail/e-mail-reader.c:4243 ../modules/mail/e-mail-attachment-handler.c:392
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:4236
+#: ../mail/e-mail-reader.c:4262
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:4237
+#: ../mail/e-mail-reader.c:4263
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
+#: ../mail/e-mail-reader.c:4329 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../mail/e-mail-reader.c:4315
+#: ../mail/e-mail-reader.c:4341
 #: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../mail/e-mail-reader.c:4319
+#: ../mail/e-mail-reader.c:4345
 #: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4354 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:5406
+#: ../mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Dozvoli udaljeni sadržaj svima sa %s"
 
-#: ../mail/e-mail-reader.c:5408
+#: ../mail/e-mail-reader.c:5428
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Dozvoli udaljeni sadržaj za %s"
 
-#: ../mail/e-mail-reader.c:5425
+#: ../mail/e-mail-reader.c:5445
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Dozvoli udaljeni sadržaj svima od %s"
 
-#: ../mail/e-mail-reader.c:5442
+#: ../mail/e-mail-reader.c:5462
 msgid "Do not show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../mail/e-mail-reader.c:5490
+#: ../mail/e-mail-reader.c:5510
 msgid "Load remote content"
 msgstr "Učitaj udaljeni sadržaj"
 
@@ -16567,34 +16573,34 @@ msgstr "Učitaj udaljeni sadržaj"
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
-#: ../mail/e-mail-reader-utils.c:572
+#: ../mail/e-mail-reader-utils.c:570
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Osvežavam fasciklu „%s“"
 
-#: ../mail/e-mail-reader-utils.c:1165
+#: ../mail/e-mail-reader-utils.c:1163
 msgid "Marking thread to be ignored"
 msgstr "Označavam raspravu kao zanemarenu"
 
-#: ../mail/e-mail-reader-utils.c:1169
+#: ../mail/e-mail-reader-utils.c:1167
 msgid "Unmarking thread from being ignored"
 msgstr "Označavam raspravi kao da nije zanemarena"
 
-#: ../mail/e-mail-reader-utils.c:1173
+#: ../mail/e-mail-reader-utils.c:1171
 msgid "Marking subthread to be ignored"
 msgstr "Označavam podraspravu kao zanemarenu"
 
-#: ../mail/e-mail-reader-utils.c:1177
+#: ../mail/e-mail-reader-utils.c:1175
 msgid "Unmarking subthread from being ignored"
 msgstr "Označavam podraspravu kao da nije zanemarena"
 
-#: ../mail/e-mail-reader-utils.c:1421
+#: ../mail/e-mail-reader-utils.c:1419
 msgid "Printing"
 msgstr "Štampam"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1658
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16615,7 +16621,7 @@ msgstr[3] ""
 "Fascikla „%s“ sadrži %u dupliranu poruku. Da li ste sigurni da želite da je "
 "izbrišete?"
 
-#: ../mail/e-mail-reader-utils.c:2489
+#: ../mail/e-mail-reader-utils.c:2656
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -16628,7 +16634,7 @@ msgstr[3] "Sačuvaj poruku"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2510
+#: ../mail/e-mail-reader-utils.c:2677
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -16636,11 +16642,11 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
-#: ../mail/e-mail-reader-utils.c:2883
+#: ../mail/e-mail-reader-utils.c:3050
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
-#: ../mail/e-mail-request.c:207
+#: ../mail/e-mail-request.c:272
 msgid "The message has no text content."
 msgstr "Poruka ne sadrži tekst."
 
@@ -16712,7 +16718,7 @@ msgstr[3] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:790
+#: ../mail/em-composer-utils.c:791
 msgid "Waiting for attachments to load..."
 msgstr "Čekam da se učitaju prilozi..."
 
@@ -16722,7 +16728,7 @@ msgstr "Čekam da se učitaju prilozi..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1686
+#: ../mail/em-composer-utils.c:1742
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16730,24 +16736,24 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1748
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1697
+#: ../mail/em-composer-utils.c:1753
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2984
+#: ../mail/em-composer-utils.c:2968
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3471
+#: ../mail/em-composer-utils.c:3440
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../mail/em-composer-utils.c:3476
+#: ../mail/em-composer-utils.c:3445
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
@@ -16756,16 +16762,16 @@ msgid "Select Folder"
 msgstr "Izaberi fasciklu"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../mail/em-filter-rule.c:597
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:652
+#: ../mail/em-filter-rule.c:662
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepročitanih poruka:"
@@ -16774,7 +16780,7 @@ msgstr[2] "Nepročitanih poruka:"
 msgstr[3] "Nepročitanih poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -16783,76 +16789,76 @@ msgstr[2] "Ukupno poruka:"
 msgstr[3] "Ukupno poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Iskorišćenost kvote (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:261
 #, c-format
 msgid "Quota usage"
 msgstr "Iskorišćenost kvote"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:287
+#: ../mail/em-folder-properties.c:385
 msgid "_Send Account Override:"
 msgstr "_Prepiši nalog slanja"
 
-#: ../mail/em-folder-properties.c:491
+#: ../mail/em-folder-properties.c:589
 msgid "_Archive this folder using these settings:"
 msgstr "_Arhiviraj ovu fasciklu koristeći sledeća podešavanja:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:500
+#: ../mail/em-folder-properties.c:598
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "O_čisti poruke starije od"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:516
+#: ../mail/em-folder-properties.c:614
 msgctxt "autoarchive"
 msgid "days"
 msgstr "dana"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:518
+#: ../mail/em-folder-properties.c:616
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "nedelja"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../mail/em-folder-properties.c:520
+#: ../mail/em-folder-properties.c:618
 msgctxt "autoarchive"
 msgid "months"
 msgstr "meseci"
 
-#: ../mail/em-folder-properties.c:526
+#: ../mail/em-folder-properties.c:624
 msgid "Move old messages to the default archive _folder"
 msgstr "Premesti stare poruke među _arhivirane"
 
-#: ../mail/em-folder-properties.c:537
+#: ../mail/em-folder-properties.c:635
 msgid "_Move old messages to:"
 msgstr "_Premesti stare poruke u:"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "AutoArchive folder"
 msgstr "Fascikla AutoArhive"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "Select folder to use for AutoArchive"
 msgstr "Izaberite fasciklu za AutoArhivu"
 
-#: ../mail/em-folder-properties.c:547
+#: ../mail/em-folder-properties.c:645
 msgid "_Delete old messages"
 msgstr "_Obriši stare poruke"
 
-#: ../mail/em-folder-properties.c:606
+#: ../mail/em-folder-properties.c:704
 msgid "AutoArchive"
 msgstr "AutoArhiva"
 
-#: ../mail/em-folder-properties.c:685
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
@@ -16888,12 +16894,12 @@ msgstr "Premeštam fasciklu „%s“"
 msgid "Copying folder %s"
 msgstr "Umnožavam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavam poruke u fasciklu „%s“"
@@ -16908,7 +16914,7 @@ msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "Učitavam..."
 
@@ -16932,8 +16938,8 @@ msgstr "Prijavi se na _prikazane"
 msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
+#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
@@ -16946,7 +16952,7 @@ msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16956,7 +16962,7 @@ msgstr[2] "%d nepročitanih, "
 msgstr[3] "%d nepročitana, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16965,66 +16971,66 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1911
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
+#: ../mail/em-subscription-editor.c:1913
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1974
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../mail/em-subscription-editor.c:1976
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Refresh"
 msgstr "_Osveži"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Zaustavi"
@@ -17452,14 +17458,14 @@ msgstr[3] "Adresa"
 
 #: ../mail/importers/kmail-importer.c:354
 msgid "Evolution KMail importer"
-msgstr "Evolucijin uvoz KMejlova"
+msgstr "Evolucijin uvoz K-pošte"
 
 #: ../mail/importers/kmail-importer.c:355
 msgid "Import mail and contacts from KMail."
-msgstr "Uvozi poštu i kontakte iz KMejla."
+msgstr "Uvozi poštu i kontakte iz K-pošte."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 msgid "Trash"
 msgstr "Smeće"
 
@@ -17469,7 +17475,7 @@ msgstr "Uvoženje poštanskog sandučeta"
 
 #: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
-msgstr "Uvozim poštu i kontakte iz KMejla."
+msgstr "Uvozim poštu i kontakte iz K-pošte."
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
@@ -17556,8 +17562,8 @@ msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
-"Sve nove el. poruke sa zaglavljem koje se podudara sa datim sadržajem će biti "
-"automatski filtrirane kao neželjene"
+"Sve nove e-poruke sa zaglavljem koje se podudara sa datim sadržajem će biti "
+"automatski izdvojene kao neželjene"
 
 #: ../mail/mail-config.ui.h:5
 msgid "Header name"
@@ -17678,8 +17684,8 @@ msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
-"Da biste izbegli nepogodnosti i nelagodnost el. pošte, pitajte za potvrdu "
-"pre izvršavanja sledećih označenih radnji:"
+"Da biste izbegli nepogodnosti i nelagodnost e-pošte, pitajte za potvrdu pre "
+"izvršavanja sledećih označenih radnji:"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:42
@@ -17720,7 +17726,7 @@ msgstr "Slanja poruke sa _primaocima koji nisu unešeni kao adrese pošte"
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
-msgstr "Slanja poruke pomoću pre_čice (Ctrl + Enter)"
+msgstr "Slanja poruke pomoću pre_čice (Ktrl + Unesi)"
 
 #: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
@@ -17738,7 +17744,7 @@ msgid "Use for Recipients"
 msgstr "Koristi za primaoce"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Nalog"
 
@@ -17969,8 +17975,8 @@ msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
 #: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
@@ -18125,7 +18131,7 @@ msgid ""
 msgstr ""
 "Kontakat lista kojoj šaljete je podešena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi el. pošte dodaju porukama zaglavlje „Prividno-ka“ koje ima samo "
+"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje ima samo "
 "BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
 "Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ primaoca. "
 
@@ -18136,10 +18142,10 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Mnogi sistemi el. pošte dodaju porukama zaglavlje „Prividno-ka“ koje imaju "
-"samo BCC primaoce. Ovo će zaglavlje, ako je dodato, u svakom slučaju "
-"izlistati sve primaoce poruke. Da izbegnete ovo, dodajte barem jednog "
-"„Prima:“ ili „CC:“ primaoca."
+"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje imaju samo "
+"BCC primaoce. Ovo će zaglavlje, ako je dodato, u svakom slučaju izlistati sve "
+"primaoce poruke. Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ "
+"primaoca."
 
 # mail:ask-send-only-bcc primary
 #: ../mail/mail.error.xml.h:17
@@ -18151,7 +18157,7 @@ msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Sledeći primalac nije prepoznat kao ispravna adresa el. pošte:\n"
+"Sledeći primalac nije prepoznat kao ispravna adresa e-pošte:\n"
 "{0}"
 
 # mail:ask-send-only-bcc primary
@@ -18164,7 +18170,7 @@ msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Sledeći primaoci nisu prepoznati kao ispravne adrese el. pošte:\n"
+"Sledeći primaoci nisu prepoznati kao ispravne adrese e-pošte:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:23
@@ -18218,26 +18224,33 @@ msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"Unesite važeću adresu el. pošte u polje „Prima:“. Možete pretražiti adrese "
-"el. pošte klikom na dugme „Prima:“ pored polja za unos."
+"Unesite važeću adresu e-pošte u polje „Prima:“. Možete pretražiti adrese e-"
+"pošte klikom na dugme „Prima:“ pored polja za unos."
 
 #: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Da koristim podrazumevanu fasciklu nacrta?"
 
 #: ../mail/mail.error.xml.h:34
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?"
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"folder instead?\n"
+"\n"
+"The reported error was &quot;{0}&quot;."
 msgstr ""
 "Ne mogu da otvorim fasciklu nacrta za ovaj nalog. Da koristim sistemsku "
-"fasciklu nacrta umesto toga?"
+"fasciklu nacrta umesto toga?\n"
+"\n"
+"Greška je „{0}“."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Koristi _osnovno"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -18245,38 +18258,38 @@ msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz fascikle „{0}“?"
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ukoliko nastavite, nećete moći da vratite ove poruke."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
-#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "Otvaranje previše poruka odjednom može da potraje malo duže."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlate poruke, da li želite ipak da izađete?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18287,59 +18300,59 @@ msgstr ""
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "Greška prilikom {0}."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Greška tokom izvršavanja operacije."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Unesite lozinku."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Greška pri učitavanju definicija filtera."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Ne mogu da sačuvam u direktorijumu „{0}“."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Ne mogu da sačuvam u datoteku „{0}“."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Ne mogu da napravim direktorijum za čuvanje, zbog „{1}“"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Ne mogu da napravim privremeni direktorijum za čuvanje."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji ali ne mogu da je prepišem."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Ne mogu da obrišem fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Ne mogu da obrišem sistemsku fasciklu „{0}“."
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18347,23 +18360,23 @@ msgstr ""
 "Sistemske fascikle su neophodne Evoluciji da bi ispravno radila i ne mogu "
 "biti preimenovane, premeštene ili obrisane."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Ne mogu da izbacim fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Ne mogu da osvežim fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Ne mogu da preimenujem ili da premestim sistemsku fasciklu„{0}“."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Da obrišem fasciklu „{0}“ i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -18371,20 +18384,40 @@ msgstr ""
 "Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli biće trajno "
 "obrisani."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder \"{0}\"?"
+msgstr "Da otpišem fasciklu „{0}“?"
+
+#: ../mail/mail.error.xml.h:71
+msgid ""
+"If you unsubscribe the folder, it might not be visible in the Evolution, "
+"while still being available on the server. You can re-subscribe in Folder-"
+">Subscriptions... menu."
+msgstr ""
+"Ako otpišete fasciklu, može biti nevidljiva u Evoluciji, dok će još uvek biti "
+"dostupna na serveru. Možete ponovo da se pretplatite u izborniku „Fascikla → "
+"Prijave...“"
+
+#: ../mail/mail.error.xml.h:72
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "_Ne otpisuj"
+
+#: ../mail/mail.error.xml.h:74
 msgid "Really delete folder \"{0}\"?"
 msgstr "Da obrišem fasciklu „{0}“?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Ukoliko obrišete fasciklu, sav njen sadržaj biće trajno obrisan."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "Ove poruke nisu umnošci."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -18395,70 +18428,70 @@ msgstr ""
 "kojima se fizički nalaze. Da li zaista želite da izbrišete ove poruke?"
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da preimenujem „{0}“ u „{1}“."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{1}“ već postoji. Dodelite joj neki drugi naziv."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da premestim fasciklu „{0}“ u „{1}“."
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Ne mogu da otvorim fasciklu izvora. Greška: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Ne mogu da otvorim fasciklu mete. Greška: {2}"
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da umnožim fasciklu „{0}“ u „{1}“."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ne mogu da napravim fasciklu „{0}“."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "Ne mogu da otvorim fasciklu. Greška: {1}"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "Ne mogu da sačuvam izmene na nalogu."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "Ne možete da napravite dva naloga sa istim imenom."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci o nalogu biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Sigurno želite da obrišete ovaj nalog i sve pripadajuće elemente?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18466,28 +18499,28 @@ msgstr ""
 "Ukoliko nastavite, podaci o nalogu i svi\n"
 "podaci posrednika biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Sigurno želite da isključite ovaj nalog i obrišete sve posrednike?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ako nastavite, svi nalozi posrednika biće trajno uklonjeni."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "Nemoj _isključiti"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "_Isključi"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:98
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Ne mogu da uredim fasciklu pretrage „{0}“ jer ne postoji."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18495,39 +18528,39 @@ msgstr ""
 "Ova fascikla je možda posredno dodata,\n"
 "idite u uređivač fascikle pretrage i dodajte je izričito, ako želite."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Ne mogu da dodam fasciklu pretrage „{0}“."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{0}“ već postoji. Dodelite joj neki drugi naziv."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski ažurirane."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "Propusnici pošte su automatski ažurirani."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "Nedostajuća fascikla."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "Morate da navedete fasciklu."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "Morate da date naziv ovoj fascikli pretrage."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "Nije izabrana nijedna fascikla."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18537,11 +18570,11 @@ msgstr ""
 "Bilo da pojedinačno izaberete fascikle, i/ili da izaberete sve lokalne "
 "fascikle, sve mrežne fascikle ili i jedne i druge."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem pri prenosu stare fascikle pošte „{0}“."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18553,19 +18586,19 @@ msgstr ""
 "Možete ili da ignorišete ovu fasciklu, da je prepišete ili da dopunite njen "
 "sadržaj, ili da izađete."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "_Prikači"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid "Evolution's local mail format has changed."
 msgstr "Evolucijin lokalni format pošte je promenjen."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -18583,19 +18616,19 @@ msgstr ""
 "izbrišete nalog nakon uspešnog preseljavanja podataka. Uverite se da ima "
 "dovoljno prostora na disku ukoliko odlučite da ih preselite sada."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "_Izađi iz Evolucije"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "P_reseli sada"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Ne mogu da pročitam datoteku licence."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -18603,31 +18636,31 @@ msgstr ""
 "Ne mogu da pročitam datoteku licence „{0}“, zbog problema sa instalacijom. "
 "Nećete moći da koristite ovog dostavljača dok ne prihvatite licencu."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "Sačekajte."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Slanje upita serveru za listu podržanih mehanizama potvrđivanja identiteta."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Ne mogu da propitam server za spisak podržanih mehanizama potvrđivanja "
 "identiteta."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:130
 msgid "Failed to get server setup."
 msgstr "Nisam uspeo da dobavim podešavanje servera."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Uskladiti fascikle lokalno za rad van mreže?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18635,27 +18668,27 @@ msgstr ""
 "Želite li lokalno da uskladite fascikle koje su označene za korišćenje van "
 "mreže?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "_Ne usklađuj"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "Da li želite da sve poruke označite pročitanim?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Ovo označava sve poruke kao pročitane u izabranoj fascikli."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "Da označim takođe i poruke u podfasciklama?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18663,138 +18696,138 @@ msgstr ""
 "Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i "
 "one u podfasciklama?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Treba li Evolucija da zatvori ovaj prozor kada odgovara ili prosleđuje?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "_Da, uvek"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "_Ne, nikada"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "Umnožite fasciklu u stablo fascikli."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Da li ste sigurni da želite da umnožite fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not copy"
 msgstr "N_e umnožavaj"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:148
 msgid "_Always copy"
 msgstr "_Uvek umnoži"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever copy"
 msgstr "_Nikad ne umnožavaj"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Premestite fasciklu u stablo fascikli."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:151
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 "Da li ste sigurni da želite da premestite fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 msgid "Do _not move"
 msgstr "N_e premeštaj"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:154
 msgid "_Always move"
 msgstr "_Uvek premesti"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:155
 msgid "N_ever move"
 msgstr "_Nikad ne premeštaj"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr "Omogućite nalog ili pošaljite koristeći drugi nalog."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:159
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlašćenja da obrišete ovu poštu."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "\"Check Junk\" Failed"
 msgstr "Provera đubreta nije uspela"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
 msgid "\"Report Junk\" Failed"
 msgstr "Izveštaj za đubre nije uspeo"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:162
 msgid "\"Report Not Junk\" Failed"
 msgstr "Izveštavanje da nije đubre nije uspelo"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "Da uklonim duplirane poruke?"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "Nisu pronađene duple poruke."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Fascikla „{0}“ ne sadrži nikakve duple poruke."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Ne mogu da se povežem na nalog „{0}“."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Ne mogu da prekinem vezu sa nalogom „{0}“."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Ne mogu da se odjavim sa fascikle „{0}“."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "Ne mogu da dovučem poruku."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:172
 msgid "Message is not available in offline mode."
 msgstr "Poruka nije dostupna u režimu van mreže."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:173
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18808,42 +18841,42 @@ msgstr ""
 "poruke za rad van mreže. Tako ćete preuzeti sve poruke i moći da ih čitate i "
 "kada niste pri internetu."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "Ne mogu da otvorim fasciklu."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "Ne mogu da pronađem duplirane poruke."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "Ne mogu da dovučem poruke."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "Ne mogu da označim poruke pročitanim."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "Ne mogu da uklonim priloge iz poruka."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:180
 msgid "Failed to download messages for offline viewing."
 msgstr "Ne mogu da preuzmem poruke za pregledanje van mreže."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "Ne mogu da sačuvam poruke na disk."
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "Skrivena datoteka je priložena."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:183
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18851,47 +18884,47 @@ msgstr ""
 "Prilog pod nazivom {0} je skrivena datoteka i može da sadrži osetljive "
 "podatke. Pregledajte je pre nego li je pošaljete."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "Štampanje nije uspelo."
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:185
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Štampač je odgovorio „{0}“."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:186
 msgid "Could not perform this operation on {0}."
 msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr "Morate da budete na mreži da biste završili ovu radnju."
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:188
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Poruka sa „{0}“ naloga:"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:189
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Ne mogu da označim raspravu kao zanemarenu unutar fascikle „{0}“"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:190
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Ne mogu da označim raspravu kao nezanemarenu unutar fascikle „{0}“"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:191
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Ne mogu da označim podraspravu kao zanemarenu unutar fascikle „{0}“"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:192
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Ne mogu da označim podraspravu kao nezanemarenu unutar fascikle „{0}“"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:193
 msgid "Remote content download had been blocked for this message."
 msgstr "Preuzimanje udaljenog sadržaja je zabranjeno za ovu poruku."
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:194
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18900,31 +18933,31 @@ msgstr ""
 "preuzima sa ovog sajta ili od ovog pošiljaoca."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:190
+#: ../mail/mail.error.xml.h:196
 msgid "{0}, Completed on {1}"
 msgstr "{0}, završeno je {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:192
+#: ../mail/mail.error.xml.h:198
 msgid "{0} by {1}"
 msgstr "{0} do {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:194
+#: ../mail/mail.error.xml.h:200
 msgid "Overdue: {0} by {1}"
 msgstr "Završen: {0} do {1}"
 
-#: ../mail/mail.error.xml.h:196
+#: ../mail/mail.error.xml.h:202
 msgid "This message note has been changed, but has not been saved."
 msgstr "Ova beleška poruke je izmenjena, ali nije sačuvana."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:199
+#: ../mail/mail.error.xml.h:205
 msgid "Failed to delete message note in folder '{0}'"
 msgstr "Nisam uspeo da obrišem belešku poruke u fascikli „{0}“"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:201
+#: ../mail/mail.error.xml.h:207
 msgid "Failed to store message note in folder '{0}'"
 msgstr "Nisam uspeo da smestim belešku poruke u fasciklu „{0}“"
 
@@ -18932,38 +18965,38 @@ msgstr "Nisam uspeo da smestim belešku poruke u fasciklu „{0}“"
 msgid "Canceling..."
 msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1229
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Vršim proveru za novom poštom na „%s“"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "Brišem nepoželjno i izbacujem smeće iz „%s“"
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1458
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "Brišem đubre iz „%s“"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1460
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "Izbacujem smeće iz „%s“"
@@ -18980,86 +19013,86 @@ msgstr "Uredi fasciklu pretrage"
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6168
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:269
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
-#: ../mail/message-list.c:2069
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "Juče u %l:%M %p"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%a u %l:%M %p"
 
-#: ../mail/message-list.c:2089
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%d. %b u %l:%M %p"
 
-#: ../mail/message-list.c:2091
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2997
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:3699 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Poruke"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:5105
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "Sledi"
 
-#: ../mail/message-list.c:6107
+#: ../mail/message-list.c:6125
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -19071,7 +19104,7 @@ msgstr ""
 "pokrenite novu pretragu bilo čišćenjem iste pomoću stavke izbornika „Pretraga—"
 ">Očisti“ ili izmenivši gornji upit."
 
-#: ../mail/message-list.c:6115
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -19116,32 +19149,32 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2159
+#: ../modules/mail/e-mail-shell-view-actions.c:2239
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2152
+#: ../modules/mail/e-mail-shell-view-actions.c:2232
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2173
+#: ../modules/mail/e-mail-shell-view-actions.c:2253
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2166
+#: ../modules/mail/e-mail-shell-view-actions.c:2246
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2138
+#: ../modules/mail/e-mail-shell-view-actions.c:2218
 msgid "Body contains"
 msgstr "Telo sadrži"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2145
+#: ../modules/mail/e-mail-shell-view-actions.c:2225
 msgid "Free form expression"
 msgstr "Izraz u slobodnoj formi"
 
@@ -19167,22 +19200,22 @@ msgstr "Samodovršavanje"
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:100
 msgid "Multiple vCards"
 msgstr "Višestruke vKarte"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:108
 #, c-format
 msgid "vCard for %s"
 msgstr "vKarta za %s"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:119
+#: ../modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information"
 msgstr "Podaci za stupanje u vezu"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:148
 #, c-format
 msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
@@ -19300,7 +19333,7 @@ msgstr "Prikažite mapu sa svim kontaktima iz izabranih adresara"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1299
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
 #: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
@@ -19381,7 +19414,7 @@ msgstr "_Radnje"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1080
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Preview"
 msgstr "_Pregled"
 
@@ -19415,7 +19448,7 @@ msgstr "Prikažite mape u prozoru za pregled kontakata"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1166
 #: ../modules/calendar/e-memo-shell-view-actions.c:743
 #: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
@@ -19426,7 +19459,7 @@ msgstr "Prikažite pregled kontakta ispod kontakt liste"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2127
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
@@ -19445,7 +19478,7 @@ msgstr "Ne odgovara"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1657
 #: ../modules/calendar/e-memo-shell-view-actions.c:777
 #: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2131
+#: ../modules/mail/e-mail-shell-view-actions.c:2211
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
@@ -19757,8 +19790,8 @@ msgstr "Bogo-filter nepoželjnih poruka"
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
 #: ../modules/cal-config-google/e-cal-config-google.c:177
 #: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
 msgid "User name cannot be empty"
 msgstr "Korisničko ime ne može biti prazno"
 
@@ -19793,8 +19826,8 @@ msgid "Port:"
 msgstr "Port:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
 msgid "Port number is not valid"
 msgstr "Broj priključnika nije ispravan"
 
@@ -19807,8 +19840,8 @@ msgid "Encryption:"
 msgstr "Šifrovanje:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
@@ -19818,7 +19851,7 @@ msgstr "Anonimno"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
-msgstr "Koristi adresu el. pošte"
+msgstr "Koristi adresu e-pošte"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
@@ -19835,7 +19868,7 @@ msgid ""
 "LDAP server."
 msgstr ""
 "Ovo je način koji će Evolucija da koristi da vam potvrdi identitet.  Znajte "
-"da će ovo ako postavite na „Koristi adresu el. pošte“ zahtevati anonimni "
+"da će ovo ako postavite na „Koristi adresu e-pošte“ zahtevati anonimni "
 "pristup na vaš LDAP server."
 
 #. Page 2
@@ -19901,59 +19934,69 @@ msgid "Browse until limit is reached"
 msgstr "Razgledaj sve dok se ne dostigne ograničenje"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
 msgid "Server address cannot be empty"
 msgstr "Adresa servera može biti prazna"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+#| msgid "New Address Book"
+msgid "Choose an Address Book"
+msgstr "Izaberite adresar"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Adresa:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+#| msgid "Address Book"
+msgid "Find Address Books"
+msgstr "Nađite adresar"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "Adresa nije ispravna „http://“ ili „https://“ adresa"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
 #: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
 #: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Izaberite spisak beleški"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
 #: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Izaberite spisak sadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 msgid "Find Calendars"
 msgstr "Pronađite kalendare"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Memo Lists"
 msgstr "Pronađite spiskove beleški"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Task Lists"
 msgstr "Pronađite spiskove zadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
-msgstr "El. pošta:"
+msgstr "E-pošta:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "Server upravlja pozivima na sastanak"
 
@@ -20197,11 +20240,11 @@ msgstr "Oblik vremena:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
-msgstr "_12 - časovni (AM/PM)"
+msgstr "_12-časovni (PrP/PoP)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
-msgstr "_24 - časovni"
+msgstr "_24-časovni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 #: ../modules/calendar/e-cal-shell-view-actions.c:1609
@@ -20784,7 +20827,7 @@ msgid "New _Memo"
 msgstr "Nova _beleška"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-backend.c:81
 #: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Napravite jednu novu belešku"
@@ -20811,15 +20854,15 @@ msgstr "Otvori _Veb stranicu"
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "Tražim sledeći odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "Tražim prethodni odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -20828,7 +20871,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u sledeće %d godine"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u sledećih %d godina"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u sledećoj %d godini"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -20837,7 +20880,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u prethodne %d godini"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u prethodnih %d godini"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u prethodnoj %d godini"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 
@@ -20880,7 +20923,7 @@ msgid "New _Task"
 msgstr "Novi zad_atak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-backend.c:79
 #: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Napravite novi zadatak"
@@ -20900,26 +20943,26 @@ msgstr "Pregledajte izabrani zadatak"
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleška"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "Napravite novu deljenu belešku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
@@ -21028,26 +21071,26 @@ msgstr[3] "%d beleška"
 msgid "%d selected"
 msgstr "izabranih — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:61
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:68
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:70
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:78
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-backend.c:96
 #: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
@@ -21190,59 +21233,59 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:156
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:157
 msgid "Display part as an invitation"
 msgstr "Prikazuje delove kao pozivnicu"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:226
+#: ../modules/itip-formatter/itip-view.c:260
 msgid "Today %H:%M"
 msgstr "Danas u %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../modules/itip-formatter/itip-view.c:264
 msgid "Today %H:%M:%S"
 msgstr "Danas u %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:273
 msgid "Today %l:%M:%S %p"
 msgstr "Danas u %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:254
+#: ../modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow %H:%M"
 msgstr "Sutra u %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:258
+#: ../modules/itip-formatter/itip-view.c:292
 msgid "Tomorrow %H:%M:%S"
 msgstr "Sutra u %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:263
+#: ../modules/itip-formatter/itip-view.c:297
 msgid "Tomorrow %l:%M %p"
 msgstr "Sutra u %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:301
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra u %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:286
+#: ../modules/itip-formatter/itip-view.c:320
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -21252,71 +21295,71 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:291
+#: ../modules/itip-formatter/itip-view.c:325
 msgid "%A %H:%M"
-msgstr "%A %H:%M"
+msgstr "%A u %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:329
 msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
+msgstr "%A u %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:334
 msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
+msgstr "%A u %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
+msgstr "%A u %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:313
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:319
+#: ../modules/itip-formatter/itip-view.c:353
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
+msgstr "%A, %e. %B u %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:323
+#: ../modules/itip-formatter/itip-view.c:357
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
+msgstr "%A, %e. %B u %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:328
+#: ../modules/itip-formatter/itip-view.c:362
 msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
+msgstr "%A, %e. %B u %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:366
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e. %B u %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:338
+#: ../modules/itip-formatter/itip-view.c:372
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %e, %Y."
+msgstr "%A, %e. %B %Y."
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:343
+#: ../modules/itip-formatter/itip-view.c:377
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %e, %Y. %H:%M"
+msgstr "%A, %e. %B %Y. u %H:%M"
 
 # strptime format of a weekday, a date and a time,
 # in 24-hour format.
@@ -21324,167 +21367,169 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:381
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %B %e, %Y. %H:%M:%S"
+msgstr "%A, %e. %B %Y. u %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:386
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %B %e, %Y. %l:%M %p"
+msgstr "%A, %e. %B %Y. u %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:390
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %B %e, %Y. %l:%M:%S %p"
+msgstr "%A, %e. %B %Y. u %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:394
-#: ../modules/itip-formatter/itip-view.c:395
-#: ../modules/itip-formatter/itip-view.c:484
-#: ../modules/itip-formatter/itip-view.c:485
-#: ../modules/itip-formatter/itip-view.c:574
+#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:429
+#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:519
+#: ../modules/itip-formatter/itip-view.c:608
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Odgovorite u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Primljeno u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s preko %s objavljuje sledeći podatak o sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s objavljuje sledeći podatak o sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s vam delegira sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:416
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s preko %s zahteva vaše prisustvo na sledećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s zahteva vaše prisustvo na sledećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:424
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s preko %s želi da doda postojećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:460
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s želi da doda postojećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s preko %s želi da primi najnovije informacije za sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s želi da primi najnoviji podatak za sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:436
+#: ../modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s preko %s šalje sledeći odgovor za sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:472
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s šalje sledeći odgovor za sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../modules/itip-formatter/itip-view.c:476
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s preko %s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:478
 #, c-format
-msgid "%s has canceled the following meeting:"
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:448
+#: ../modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s preko %s predlaže sledeće promene sastanka."
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s predlaže sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:454
+#: ../modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s preko %s odbija sledeće promene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s odbija sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s preko %s objavljuje sledeći zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s objavi sledeće zaduženje:"
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s zahteva da %s preuzme sledeći zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:506
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s preko %s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:514
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s preko %s želi da doda postojećem zadatku:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:550
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s želi da doda postojećem zadatku:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:554
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -21492,335 +21537,340 @@ msgid ""
 msgstr ""
 "%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:556
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:526
+#: ../modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s preko %s vraća sledeći odgovor na dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:562
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s šalje nazad sledeći odgovor na dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../modules/itip-formatter/itip-view.c:566
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#| msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s preko %s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:568
 #, c-format
-msgid "%s has canceled the following assigned task:"
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:538
+#: ../modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s preko %s predlaže sledeće promene u dodeli zadatka:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s predlaže sledeće promene u dodeli zadatka:"
 
-#: ../modules/itip-formatter/itip-view.c:544
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s preko %s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s preko %s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:621
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s preko %s želi da doda postojećoj belešci:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:628
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s želi da doda postojećoj belešci:"
 
-#: ../modules/itip-formatter/itip-view.c:598
+#: ../modules/itip-formatter/itip-view.c:632
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#| msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s preko %s otkazuje sledeću deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:634
 #, c-format
-msgid "%s has canceled the following shared memo:"
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s otkazuje sledeće deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:674
+#: ../modules/itip-formatter/itip-view.c:893
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:899
 msgid "Start day:"
 msgstr "Početak dana:"
 
-#: ../modules/itip-formatter/itip-view.c:680
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:899
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Start time:"
 msgstr "Vreme početka:"
 
-#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:908
 msgid "End day:"
 msgstr "Kraj dana:"
 
-#: ../modules/itip-formatter/itip-view.c:689
-#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:908
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "End time:"
 msgstr "Vreme završetka:"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1255
 msgid "Ope_n Calendar"
 msgstr "O_tvori kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1258
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1261
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1264
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1267
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1270
 msgid "Acce_pt all"
 msgstr "P_rihvati sve"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1273
 msgid "Acce_pt"
 msgstr "Prih_vaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:1060
+#: ../modules/itip-formatter/itip-view.c:1276
 msgid "Send _Information"
 msgstr "Pošalji _podatke"
 
-#: ../modules/itip-formatter/itip-view.c:1063
+#: ../modules/itip-formatter/itip-view.c:1279
 msgid "_Update Attendee Status"
 msgstr "Ažuriraj stanje učesni_ka"
 
-#: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../modules/itip-formatter/itip-view.c:1282
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../modules/itip-formatter/itip-view.c:1518
-#: ../modules/itip-formatter/itip-view.c:1566
-#: ../modules/itip-formatter/itip-view.c:1637
+#: ../modules/itip-formatter/itip-view.c:1728
+#: ../modules/itip-formatter/itip-view.c:1776
+#: ../modules/itip-formatter/itip-view.c:1847
 msgid "Comment:"
 msgstr "Napomena:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1764
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljaocu"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1779
 msgid "Send _updates to attendees"
 msgstr "Pošalji _ažurirane podatke učesnicima"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1572
+#: ../modules/itip-formatter/itip-view.c:1782
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../modules/itip-formatter/itip-view.c:1573
+#: ../modules/itip-formatter/itip-view.c:1783
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1784
 msgid "_Preserve my reminder"
 msgstr "_Očuvaj moj podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1785
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1908
+#: ../modules/itip-formatter/itip-view.c:2102
 msgid "_Tasks:"
 msgstr "_Zadaci:"
 
-#: ../modules/itip-formatter/itip-view.c:1911
+#: ../modules/itip-formatter/itip-view.c:2105
 msgid "_Memos:"
 msgstr "_Beleške:"
 
-#: ../modules/itip-formatter/itip-view.c:3217
+#: ../modules/itip-formatter/itip-view.c:3059
 msgid "Sa_ve"
 msgstr "Sa_čuvaj"
 
-#: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:3499
+#: ../modules/itip-formatter/itip-view.c:4955
 msgid "Attendee status updated"
 msgstr "Status učesnika je ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:3859
+#: ../modules/itip-formatter/itip-view.c:3664
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Jedno zakazivanje u kalendaru „%s“ je u isto vreme kad i ovaj sastanak"
 
-#: ../modules/itip-formatter/itip-view.c:3889
+#: ../modules/itip-formatter/itip-view.c:3694
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:4024
+#: ../modules/itip-formatter/itip-view.c:3828
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:4032
+#: ../modules/itip-formatter/itip-view.c:3836
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ne mogu da pronađem ovaj sastanak ni u jednom kalendaru"
 
-#: ../modules/itip-formatter/itip-view.c:4037
+#: ../modules/itip-formatter/itip-view.c:3841
 msgid "Unable to find this task in any task list"
 msgstr "Ne mogu da pronađem ovaj zadatak ni u jednom spisku zadataka"
 
-#: ../modules/itip-formatter/itip-view.c:4042
+#: ../modules/itip-formatter/itip-view.c:3846
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
 
-#: ../modules/itip-formatter/itip-view.c:4387
+#: ../modules/itip-formatter/itip-view.c:4190
 msgid "Opening the calendar. Please wait..."
 msgstr "Otvaram kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4392
+#: ../modules/itip-formatter/itip-view.c:4195
 msgid "Searching for an existing version of this appointment"
 msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4594
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4609
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4614
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru „%s“ kao pokušaj"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4620
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
-#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:4626
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar '%s' as cancelled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4646
+#: ../modules/itip-formatter/itip-view.c:5092
+#: ../modules/itip-formatter/itip-view.c:5195
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4687
 msgid "Unable to parse item"
 msgstr "Ne mogu da obradim stavku"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:4879
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:4896
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:4900
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ne mogu delegatu da pošaljem obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:4947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da ažuriram učesnika. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:4982
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Sastanak nije ispravan i ne može biti ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5057
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Status učesnika nije ažuriran zbog neispravnog stanja"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5128
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status učesnika nije osvežen jer stavka više ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5227
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5232
 msgid "Task information sent"
 msgstr "Podatak o zadatku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5237
 msgid "Memo information sent"
 msgstr "Podatak o belešci je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5248
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ne mogu da pošaljem podatak o sastanku, sastanak ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5253
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ne mogu da pošaljem podatak o zadatku, zaduženje ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5258
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ne mogu da pošaljem podatak o belešci, beleška ne postoji"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5323
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5328
 msgid "Save Calendar"
 msgstr "Sačuvaj kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5376
+#: ../modules/itip-formatter/itip-view.c:5389
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5377
+#: ../modules/itip-formatter/itip-view.c:5390
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -21828,15 +21878,15 @@ msgstr ""
 "Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
 "iKalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5432
+#: ../modules/itip-formatter/itip-view.c:5462
+#: ../modules/itip-formatter/itip-view.c:5565
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5433
+#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5566
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -21844,11 +21894,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
 "slobodno/zauzeto."
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5478
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5479
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -21860,24 +21910,24 @@ msgstr ""
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:5974
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:5990
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6150
 msgid "This meeting recurs"
 msgstr "Ovaj sastanak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6153
 msgid "This task recurs"
 msgstr "Ovaj zadatak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6156
 msgid "This memo recurs"
 msgstr "Ova beleška se ponavlja"
 
@@ -21894,19 +21944,19 @@ msgstr "Ovaj sastanak je delegiran"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0}“ delegira sastanak. Želite li da dodate delegata „{1}“?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Gugl mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 msgid "Add Google Ca_lendar to this account"
 msgstr "Dodaj ka_lendar Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Add Google Con_tacts to this account"
 msgstr "Dodaj ko_ntakte Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "Možda ćete morati da omogućite IMAP pristup"
 
@@ -21967,42 +22017,48 @@ msgstr "Izaberite direktorijum mboks pripreme"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Direktorijum pripreme Msandučeta ne može biti prazan"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "_Port:"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+#| msgid "Enter password"
+msgid "_Forget password"
+msgstr "_Zaboravi lozinku"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
 msgid "Encryption _method:"
 msgstr "Način _šifrovanja:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS nakon povezivanja"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "TLS on a dedicated port"
 msgstr "TLS na dodeljenom priključniku"
 
@@ -22041,23 +22097,23 @@ msgid "Custom binary cannot be empty"
 msgstr "Proizvoljni izvršni ne može biti prazan"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži potvrđivanje identiteta"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "_Vrsta:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Jahu! mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Dodaj Jahu! _kalendar i zadatke ovom nalogu"
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:673
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -22066,46 +22122,86 @@ msgstr[1] "%d priložene poruke"
 msgstr[2] "%d priloženih poruka"
 msgstr[3] "Jedna priložena poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:353
+#: ../modules/mail/e-mail-shell-backend.c:377
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:355
+#: ../modules/mail/e-mail-shell-backend.c:379
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:363
+#: ../modules/mail/e-mail-shell-backend.c:387
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:389
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:370
+#: ../modules/mail/e-mail-shell-backend.c:394
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:372
+#: ../modules/mail/e-mail-shell-backend.c:396
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:687
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:711
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr "osnovno"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:714
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr "mrežna veza"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:717
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "upravnik veze"
+
+#: ../modules/mail/e-mail-shell-backend.c:749
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr "Način za otkrivanje stanja na mreži:"
+
+#. Always as the first
+#: ../modules/mail/e-mail-shell-backend.c:758
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "Osnovno"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:772
+#| msgid "_Always move"
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "Uvek na mreži"
+
+#: ../modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:696
+#: ../modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:705
+#: ../modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../modules/mail/e-mail-shell-backend.c:715
+#: ../modules/mail/e-mail-shell-backend.c:859
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -22116,148 +22212,148 @@ msgstr "Postavke mreže"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1007
+#: ../modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:713
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Marking messages as read..."
 msgstr "Označavam poruke pročitanim..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
 msgid "Go to Folder"
 msgstr "Idi u fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Select"
 msgstr "_Izaberi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno uklonite sve obrisane poruke iz svih fascikli"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Refresh list of folders of this account"
 msgstr "Osvežite spisak fascikli za ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Preuzmite poruke za naloge i fascikle koje su označene za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Copy the selected folder into another folder"
 msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno uklonite sve obrisane poruke iz ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 msgid "Mark all messages in the folder as read"
 msgstr "Označite sve poruke u fascikli kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1711
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Create a new folder for storing mail"
 msgstr "Napravite novu fasciklu za smeštaj pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Označite sve poruke iste rasprave kao izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Select all replies to the currently selected message"
 msgstr "Izaberite sve odgovore na trenutno izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno uklonite sve obrisane poruke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Go to _Folder"
 msgstr "Idi u _fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1767
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Otvara prozorče iz koga možete izabrati da odete u određenu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1844
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -22266,205 +22362,218 @@ msgstr "_Nova oznaka"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1781
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1797
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavite se ili se odjavite sa fascikli na mrežnim serverima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1809
-#: ../modules/mail/e-mail-shell-view-actions.c:1830
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1811
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "Send queued items and retrieve new items"
 msgstr "Pošaljite pripremljene i dovucite nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1816
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1818
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1825
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1853
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1858
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1860
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1865
+#: ../modules/mail/e-mail-shell-view-actions.c:1937
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1872
+#: ../modules/mail/e-mail-shell-view-actions.c:1944
 msgid "_Message Filters"
 msgstr "_Propusnici poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1874
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravite ili uredite pravila za izdvajanje nove pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1951
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1888
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi _fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1919
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1921
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1996
+#: ../modules/mail/e-mail-shell-view-actions.c:2068
+#| msgid "Show Attachment _Bar"
+msgid "Show _Attachment Bar"
+msgstr "Prikaži traku _priloga"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr ""
+"Prikažite traku priloga ispod okna pregleda poruke kada poruka ima priloge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Show _Junk Messages"
 msgstr "Prikaži _nepoželjne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Show junk messages with a red line through them"
 msgstr "Prikažite nepoželjne poruke precrtane crvenom linijom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2020
+#: ../modules/mail/e-mail-shell-view-actions.c:2100
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2042
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2078
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Messages with Notes"
 msgstr "Poruke sa beleškama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2099
+#: ../modules/mail/e-mail-shell-view-actions.c:2179
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2106
+#: ../modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2113
+#: ../modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#: ../modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Message Thread"
 msgstr "Tema poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2180
+#: ../modules/mail/e-mail-shell-view-actions.c:2260
 msgid "Subject or Addresses contain"
 msgstr "Naslov ili adrese sadrže"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2190
+#: ../modules/mail/e-mail-shell-view-actions.c:2270
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2197
+#: ../modules/mail/e-mail-shell-view-actions.c:2277
 msgid "Current Account"
 msgstr "tekućem nalogu"
 
 # #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2204
+#: ../modules/mail/e-mail-shell-view-actions.c:2284
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
@@ -22476,7 +22585,7 @@ msgstr "Pretraga svih naloga"
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view-private.c:957
+#: ../modules/mail/e-mail-shell-view-private.c:958
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -22485,8 +22594,8 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
-#: ../modules/mail/e-mail-shell-view-private.c:983
+#: ../modules/mail/e-mail-shell-view-private.c:967
+#: ../modules/mail/e-mail-shell-view-private.c:984
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -22495,8 +22604,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:992
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:999
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -22505,7 +22614,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1005
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -22514,7 +22623,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -22523,7 +22632,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -22532,7 +22641,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -22541,35 +22650,35 @@ msgstr[1] "%d nepročitane"
 msgstr[2] "%d nepročitanih"
 msgstr[3] "%d nepročitana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1552
+#: ../modules/mail/e-mail-shell-view-private.c:1553
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:414
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Izaberite fasciklu za dodavanje"
 
-#: ../modules/mail/em-composer-prefs.c:884
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Fascikla"
 
-#: ../modules/mail/em-composer-prefs.c:920
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Primalac"
 
-#: ../modules/mail/em-composer-prefs.c:1205
+#: ../modules/mail/em-composer-prefs.c:1204
 msgid "Keep in Outbox"
 msgstr "Zadrži u „Za slanje“"
 
-#: ../modules/mail/em-composer-prefs.c:1206
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Send immediately"
 msgstr "Odmah pošalji"
 
-#: ../modules/mail/em-composer-prefs.c:1207
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send after 5 minutes"
 msgstr "Pošalji nakon 5 minuta"
 
-#: ../modules/mail/em-composer-prefs.c:1286
+#: ../modules/mail/em-composer-prefs.c:1285
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
@@ -22617,7 +22726,7 @@ msgstr "Prikaži _originalnu vrednost zaglavlja"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
-msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom el. pošte?"
+msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom e-pošte?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
@@ -22632,13 +22741,13 @@ msgstr "Vaša poruka za %s na temu „%s“ na %s je pročitana."
 msgid "Delivery Notification for \"%s\""
 msgstr "Obaveštenje o prijemu za „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Pošalji povratnicu čitanja za „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "Obavesti _pošiljaoca"
 
@@ -22827,11 +22936,11 @@ msgstr "Ubica spama"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
-msgstr "Filter nepoželjne poruke pomoću SpamAssassin"
+msgstr "Filter nepoželjne poruke pomoću Ubice spama"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
@@ -22854,17 +22963,17 @@ msgstr ""
 "Dobrodošli u Evoluciju. \n"
 "\n"
 "Nekoliko narednih ekrana će omogućiti Evoluciji da se poveže na vaše naloge "
-"el. pošte i da uveze datoteke iz drugih programa."
+"e-pošte i da uveze datoteke iz drugih programa."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Učitavam naloge..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
 msgid "_Format as..."
 msgstr "Oblikuj _kao..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
 msgid "_Other languages"
 msgstr "_Drugi jezici"
 
@@ -23087,24 +23196,24 @@ msgid "_VHDL"
 msgstr "_VHDL"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../modules/vcard-inline/e-mail-part-vcard.c:187
 msgid "Show F_ull vCard"
 msgstr "Prikaži _punu vKartu"
 
 #: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../modules/vcard-inline/e-mail-part-vcard.c:192
 msgid "Show Com_pact vCard"
 msgstr "Prikaži _sažetu vKartu"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:165
 msgid "Save _To Addressbook"
 msgstr "Sačuvaj _u adresar"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 msgid "There is one other contact."
 msgstr "Postoji još jedan kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:194
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -23113,24 +23222,20 @@ msgstr[1] "Postoje još %d kontakta."
 msgstr[2] "Postoji još %d kontakta."
 msgstr[3] "Postoji još %d kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:220
 msgid "Addressbook Contact"
 msgstr "Kontakt adresara"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:221
 msgid "Display the part as an addressbook contact"
 msgstr "Prikažite delove kao kontakt adresara"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-msgid "Evolution Web Inspector"
-msgstr "Nadzornik veba Evolucije"
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:478
+#: ../plugins/templates/templates.c:490
 msgid "Keywords"
 msgstr "Ključne reči"
 
@@ -23208,7 +23313,7 @@ msgid ""
 msgstr ""
 "Oslobađa vas teškog rada u upravljanju adresarom.\n"
 "\n"
-"Automatski popunjava adresar imenima i adresama el. pošte kada odgovarate na "
+"Automatski popunjava adresar imenima i adresama e-pošte kada odgovarate na "
 "poruke.  Takođe popunjava podatke za kontakt brzim glasnikom iz spiska "
 "drugara."
 
@@ -23294,7 +23399,7 @@ msgid "Key"
 msgstr "Ključ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:499
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -23309,7 +23414,7 @@ msgstr "Dodajte prilagođena zaglavlja odlaznim porukama."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
-msgstr "Prilagođeno zaglavlje el. pošte"
+msgstr "Prilagođeno zaglavlje e-pošte"
 
 #: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
@@ -23327,8 +23432,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Sam pokreni kada je nova poruka izmenjena"
 
-#: ../plugins/external-editor/external-editor.c:530
-#: ../plugins/external-editor/external-editor.c:532
+#: ../plugins/external-editor/external-editor.c:437
+#: ../plugins/external-editor/external-editor.c:439
 msgid "Compose in External Editor"
 msgstr "Sastavlja u spoljnom uređivaču"
 
@@ -23445,63 +23550,63 @@ msgstr "Nije slika"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "Izabrana datoteka ne izgleda kao ispravna PNG slika. Greška: {0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Get an archive of the list this message belongs to"
 msgstr "Pribavlja arhivu liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "Copy _Message Archive URL"
 msgstr "Umnoži adresu arhive _poruke"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Umnožite neposrednu adresu za izabranu poruku u njenoj arhivi"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _korišćenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Pribavlja podatke o korišćenju liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:438
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Javite se vlasniku dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "_Post Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:445
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Sastavite poruku za dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:452
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Prijavite se na dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:459
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Odjavite se sa dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:466
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -23576,7 +23681,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
-msgstr "Nema radnje za el. poštu"
+msgstr "Nema radnje za e-poštu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
@@ -23820,35 +23925,35 @@ msgstr ""
 "Izabrani spisak beleški je samo za čitanje, stoga ne možete napraviti "
 "belešku. Izaberite drugi spisak beleški."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1235
+#: ../plugins/mail-to-task/mail-to-task.c:1231
 msgid "Create an _Appointment"
 msgstr "Napravi _zakazivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 msgid "Create a new event from the selected message"
 msgstr "Pravi novi događaj od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1242
+#: ../plugins/mail-to-task/mail-to-task.c:1238
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1240
 msgid "Create a new memo from the selected message"
 msgstr "Pravi novu belešku od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1249
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1251
+#: ../plugins/mail-to-task/mail-to-task.c:1247
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1259
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -24025,7 +24130,7 @@ msgid "_Username:"
 msgstr "_Korisničko ime:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "_Lozinka:"
 
@@ -24175,6 +24280,10 @@ msgstr "Sačuvaj izabranu belešku na disk"
 msgid "Save the selected task list to disk"
 msgstr "Sačuvaj izabrani spisak zadataka na disk"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "Bez zvanja"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -24183,53 +24292,54 @@ msgid ""
 msgstr ""
 "Priključak za obrazac nacrta. Možete da koristite promenljive kao što su "
 "$ORIG[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti "
-"zamenjene vrednostima iz el. pošte na koju odgovarate."
+"zamenjene vrednostima iz e-pošte na koju odgovarate."
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "Bez zvanja"
+#: ../plugins/templates/templates.c:1286
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "Čuvam šablon poruke"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1307
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1309
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
-#: ../shell/e-shell.c:380
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "Pripremam se za rad van mreže..."
 
-#: ../shell/e-shell.c:409
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "Pripremam se za rad na mreži..."
 
-#: ../shell/e-shell.c:520
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "Pripremam se da izađem"
 
-#: ../shell/e-shell.c:526
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
-#: ../shell/e-shell.c:1043
+#: ../shell/e-shell.c:1044
 msgid "Credentials are required to connect to the destination host."
 msgstr "Potrebna su ovlašćenja za pristupanje ciljnom, udaljenom računaru."
 
-#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Novi _prozor"
 
-#: ../shell/e-shell.c:1222
+#: ../shell/e-shell.c:1223
 msgid "Quick _Reference"
 msgstr "Kratak _podsetnik"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_O programu"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Izađi"
 
@@ -24666,7 +24776,7 @@ msgstr ""
 
 #: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
-msgstr "— Evolucija rukovodilac ličnim podatacima i klijent el. pošte"
+msgstr "— Evolucija rukovodilac ličnim podatacima i klijent e-pošte"
 
 #: ../shell/main.c:536
 #, c-format
@@ -24891,9 +25001,9 @@ msgstr "MD5 Otisak"
 #: ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
-msgstr "Adresa el. pošte"
+msgstr "Adresa e-pošte"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:665
 msgid "Select a file to backup your key and certificate..."
 msgstr "Izaberite datoteku za rezervnu kopiju ključeva i uverenja..."
 
@@ -24902,49 +25012,49 @@ msgstr "Izaberite datoteku za rezervnu kopiju ključeva i uverenja..."
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:677
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-rezervna-kopija.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:743
 msgid "Backup Certificate"
 msgstr "Rezervna kopija uverenja"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:757
 msgid "_File name:"
 msgstr "_Naziv datoteke:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:762
 msgid "Please select a file..."
 msgstr "Izaberite datoteku..."
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Include certificate chain in the backup"
-msgstr "_Uključi lanac uverenja u rezervnu kopiju"
+msgstr "_Uključi lanac uverenja u rezervu"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:782
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 "Lozinka za rezervnu kopiju uverenja koju ovde postavite služi da je zaštiti.\n"
-"Morate da postavite lozinku kako bi nastavili sa pravljenjem rezervne kopije."
+"Morate da postavite lozinku kako bi nastavili sa pravljenjem rezerve."
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:801
 msgid "_Repeat Password:"
 msgstr "Ponovite _lozinku:"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:820
 msgid "Passwords do not match"
 msgstr "Lozinke koje ste uneli nisu iste"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:828
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -24952,96 +25062,96 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 "Važno:\n"
-"Ukoliko zaboravite lozinku rezervne kopije uverenja, više nećete moći da "
-"povratite rezervnu kopiju.\n"
+"Ukoliko zaboravite lozinku rezerve uverenja, više nećete moći da povratite "
+"rezervnu kopiju.\n"
 "Zapišite je negde na sigurno mesto."
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:873
 msgid "No file name provided"
 msgstr "Nije dat naziv datoteke"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:877
 msgid "Failed to backup key and certificate"
 msgstr "Ne mogu da napravim rezervnu kopiju ključa i uverenja"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "Izaberite uverenje za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "Ne mogu da uvezem uverenje"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Pitaj prilikom upotrebe"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nikada"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Ponekad"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Uvek"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimativno"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1142
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Privremeno"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1348
 msgid "Change certificate trust"
 msgstr "Izmena poverenja za uverenje"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1360
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "Izmena poverenja za udaljeni računar „%s“:"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "P_itaj prilikom korišćenja"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Nikada ne veruj ovom uverenju"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "P_rivremeno poverenje (samo tokom sesije)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Delimično poverenje"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1388
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Potpuno poverenje"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1389
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Neograničeno poverenje"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1393
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -25049,43 +25159,43 @@ msgstr ""
 "Pre verovanja ovom sajtu pregledajte njegovo uverenje, politiku i procedure "
 "(ako su dostupni)."
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1408
 msgid "_Display certificate"
 msgstr "Prikaži _uverenje"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1613
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Posedujete uverenja u datoteci koja određuju ove servere e-pošte:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1644
 msgid "Host name"
 msgstr "Ime udaljenog računara"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1646
 msgid "Issuer"
 msgstr "Izdavač"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1647
 msgid "Fingerprint"
 msgstr "Otisak prsta"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1648
 msgid "Trust"
 msgstr "Poverenje"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1669
 msgid "_Edit Trust"
 msgstr "_Uredi poverenje"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2123
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2140
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2157
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA uverenja"
 
@@ -25198,7 +25308,7 @@ msgstr "U_verenje:"
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
-msgstr "Podešavanja poverenja u uverenja el. pošte"
+msgstr "Podešavanja poverenja u uverenja e-pošte"
 
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
@@ -25338,6 +25448,76 @@ msgstr "Sa _rokom"
 msgid "With _Status"
 msgstr "Sa _stanjem"
 
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "IZLAZNA-DATOTEKA"
+
+#~ msgid "List local address book folders"
+#~ msgstr "Navodi fascikle lokalnog adresara"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "Prikazuje karte kao vkartu ili csv datoteku"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "Greška u argumentima naredbe, koristite opciju „--help“ da vidite kako se "
+#~ "koristi."
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "Podržava samo csv ili vkard oblik."
+
+#~ msgid "Unhandled error"
+#~ msgstr "Nepoznata greška"
+
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "Ne mogu da otvorim „%s“: %s"
+
+#~ msgid "Canceled"
+#~ msgstr "Otkazano"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "Otkazano"
+
+#~ msgid "Enable developer mode"
+#~ msgstr "Uključi režim za programere"
+
+#~ msgid ""
+#~ "Enables some hidden actions and tools aimed for development and debugging."
+#~ msgstr ""
+#~ "Uključuje neke skrivene radnje i alate koji su namenjeni programerima i "
+#~ "ispravljanju grešaka u programu."
+
+#~ msgid "Signature exists, but need public key"
+#~ msgstr "Potpis postoji, ali traži javni ključ"
+
+#~ msgid "Open Inspector"
+#~ msgstr "Otvoreni inspektor"
+
+#~ msgid "_Blockquote"
+#~ msgstr "_Citiranje odeljka"
+
+#~ msgid "Changed property"
+#~ msgstr "Izmenjena osobina"
+
+#~ msgid "Whether editor changed"
+#~ msgstr "Da li je uređivač promenio"
+
+#~ msgid "_Unsort"
+#~ msgstr "_Ne razvrstavaj"
+
+#~ msgid "Canceled."
+#~ msgstr "Otkazano."
+
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Nadzornik veba Evolucije"
+
 #~ msgid "Edit Reminder"
 #~ msgstr "Uredi podsetnik"
 


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